diff options
| author | George Mount <mount@google.com> | 2012-10-03 11:31:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 11:31:00 -0700 |
| commit | 221350917dbc60a59a0c14b413d89dbd7e3ade37 (patch) | |
| tree | d6bb077a88973bb75071fa80e923ad13277492b1 /src | |
| parent | 71d903876ee4c6c4c775ed9e42905685a53591db (diff) | |
| parent | 9d51864d4dfbe71c46531f472364b3483890464b (diff) | |
| download | Camera-221350917dbc60a59a0c14b413d89dbd7e3ade37.tar.gz | |
Merge "Change LightCycle assets." into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 8165de4a..acc90323 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -22,18 +22,14 @@ import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.provider.MediaStore; -import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.OrientationEventListener; import android.view.View; import android.view.View.OnClickListener; -import android.view.ViewConfiguration; import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; import android.widget.FrameLayout; -import android.widget.ImageView; import com.android.camera.ui.CameraSwitcher; import com.android.camera.ui.RotateImageView; @@ -71,7 +67,7 @@ public class CameraActivity extends ActivityBase R.drawable.ic_switch_video, R.drawable.ic_switch_camera, R.drawable.ic_switch_pan, - R.drawable.ic_switch_photo_pan_holo_light + com.android.gallery3d.R.drawable.ic_menu_photosphere }; public interface MenuListener { |