diff options
author | Michael Kolb <kolby@google.com> | 2013-04-15 13:17:27 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2013-04-15 13:17:27 -0700 |
commit | 0408c9aef21d1e4e9afb1862897afdc8e21906fd (patch) | |
tree | 36446d24213c62e9719c73643cc612d70ed9ff45 /src/com/android/camera | |
parent | 5b9375cebbe4bc357b734a022837d8ab85eb71d6 (diff) | |
download | android_packages_apps_Snap-0408c9aef21d1e4e9afb1862897afdc8e21906fd.tar.gz android_packages_apps_Snap-0408c9aef21d1e4e9afb1862897afdc8e21906fd.tar.bz2 android_packages_apps_Snap-0408c9aef21d1e4e9afb1862897afdc8e21906fd.zip |
Also, add labels to video menu
Bug: 8618169
Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index ea70ddcdd..431483fcb 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -72,8 +72,11 @@ 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.setPosition(POS_SWITCH, 5); + item.setLabel(lpref.getLabel()); + final PieItem fitem = item; item.setOnClickListener(new OnClickListener() { @Override @@ -87,6 +90,7 @@ public class VideoMenu extends PieController index = (index + 1) % values.length; int newCameraId = Integer.parseInt((String) values[index]); mListener.onCameraPickerClicked(newCameraId); + fitem.setLabel(pref.getLabel()); } } }); @@ -101,6 +105,7 @@ public class VideoMenu extends PieController }; item = makeItem(R.drawable.ic_settings_holo_light); item.setPosition(POS_SET, 5); + item.setLabel(mActivity.getResources().getString(R.string.camera_menu_settings_label)); item.setOnClickListener(new OnClickListener() { @Override public void onClick(PieItem item) { |