diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-17 17:08:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 17:08:37 -0700 |
| commit | 34b332f8db3e91b0c49f2d1d3b5be9b52f39d651 (patch) | |
| tree | fb5f88a50ddad62593563874456ebcee693b7034 /src/com | |
| parent | 3b254c2012f4862994bbd2c2e8d012a8e28b9931 (diff) | |
| parent | 172d37e178a33fd1138d7e3a9b08f8c541959cc3 (diff) | |
| download | android_packages_apps_Snap-34b332f8db3e91b0c49f2d1d3b5be9b52f39d651.tar.gz android_packages_apps_Snap-34b332f8db3e91b0c49f2d1d3b5be9b52f39d651.tar.bz2 android_packages_apps_Snap-34b332f8db3e91b0c49f2d1d3b5be9b52f39d651.zip | |
am 1c7d2bc2: First part of asset drop
* commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8':
First part of asset drop
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 12 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 19 |
2 files changed, 22 insertions, 9 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 09c96b26a..77f2fc508 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -81,9 +81,13 @@ public class PhotoMenu extends PieController } // camera switcher if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) { - item = makeItem(R.drawable.ic_switch_photo_facing_holo_light); - ListPreference lpref = group.findPreference(CameraSettings.KEY_CAMERA_ID); - item.setPosition(POS_SWITCH, 5); + item = makeItem(R.drawable.ic_switch_back); + item.setPosition(POS_SWITCH, 5); + IconListPreference lpref = (IconListPreference) group.findPreference( + CameraSettings.KEY_CAMERA_ID); + item.setImageResource(mActivity, + ((IconListPreference) lpref).getIconIds() + [lpref.findIndexOfValue(lpref.getValue())]); item.setLabel(lpref.getLabel()); final PieItem fitem = item; item.setOnClickListener(new OnClickListener() { @@ -99,6 +103,8 @@ public class PhotoMenu extends PieController int newCameraId = Integer .parseInt((String) values[index]); fitem.setLabel(camPref.getLabel()); + fitem.setImageResource(mActivity, + ((IconListPreference) camPref).getIconIds()[index]); mListener.onCameraPickerClicked(newCameraId); } } diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 431483fcb..ca2549e2d 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -34,10 +34,10 @@ public class VideoMenu extends PieController TimeIntervalPopup.Listener { private static String TAG = "CAM_VideoMenu"; - private static final int POS_WB = 1; - private static final int POS_SET = 2; + private static final int POS_WB = 0; + private static final int POS_SET = 1; private static final int POS_FLASH = 3; - private static final int POS_SWITCH = 4; + private static final int POS_SWITCH = 2; private VideoUI mUI; private String[] mOtherKeys; @@ -72,10 +72,15 @@ public class VideoMenu extends PieController } // camera switcher if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) { - ListPreference lpref = group.findPreference(CameraSettings.KEY_CAMERA_ID); - item = makeItem(R.drawable.ic_switch_video_facing_holo_light); + item = makeItem(R.drawable.ic_switch_back); item.setPosition(POS_SWITCH, 5); + IconListPreference lpref = (IconListPreference) group.findPreference( + CameraSettings.KEY_CAMERA_ID); item.setLabel(lpref.getLabel()); + item.setImageResource(mActivity, + ((IconListPreference) lpref).getIconIds() + [lpref.findIndexOfValue(lpref.getValue())]); + final PieItem fitem = item; item.setOnClickListener(new OnClickListener() { @@ -89,8 +94,10 @@ public class VideoMenu extends PieController CharSequence[] values = pref.getEntryValues(); index = (index + 1) % values.length; int newCameraId = Integer.parseInt((String) values[index]); - mListener.onCameraPickerClicked(newCameraId); + fitem.setImageResource(mActivity, + ((IconListPreference) pref).getIconIds()[index]); fitem.setLabel(pref.getLabel()); + mListener.onCameraPickerClicked(newCameraId); } } }); |