diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-17 16:01:32 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-04-17 16:14:39 -0700 |
| commit | 1c7d2bc293a1ff824db768756d0309dfbc7f08d8 (patch) | |
| tree | 46e9edb7657a04531f2a7f030b5d087a95b5ae05 /src/com/android/camera/PhotoMenu.java | |
| parent | 75408cd38e7efe0755addcf3170932c8b3190bc1 (diff) | |
| download | android_packages_apps_Gallery2-1c7d2bc293a1ff824db768756d0309dfbc7f08d8.tar.gz android_packages_apps_Gallery2-1c7d2bc293a1ff824db768756d0309dfbc7f08d8.tar.bz2 android_packages_apps_Gallery2-1c7d2bc293a1ff824db768756d0309dfbc7f08d8.zip | |
First part of asset drop
Bug: 8640131
Added new assets, updated front/back menu entry.
Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 12 |
1 files changed, 9 insertions, 3 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); } } |