diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2013-10-19 04:38:16 +0300 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-10-25 02:28:07 -0700 |
| commit | d66e59ddeb9d45ca31ad71c662a4c4e62b196468 (patch) | |
| tree | f791494159521dc075edff24bb5517357fe6475b /src/com/android/camera/PhotoMenu.java | |
| parent | 148fd03e0aded0c5e5188c64a35d554a052eba7d (diff) | |
| download | android_packages_apps_Gallery2-d66e59ddeb9d45ca31ad71c662a4c4e62b196468.tar.gz android_packages_apps_Gallery2-d66e59ddeb9d45ca31ad71c662a4c4e62b196468.tar.bz2 android_packages_apps_Gallery2-d66e59ddeb9d45ca31ad71c662a4c4e62b196468.zip | |
Camera: Powerkey shutter (2/2)
Ported from cm-10.1
Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 68f65a0c1..88f5a0347 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -211,7 +211,8 @@ public class PhotoMenu extends PieController } // extra settings popup mOtherKeys = new String[] { - CameraSettings.KEY_FOCUS_MODE + CameraSettings.KEY_FOCUS_MODE, + CameraSettings.KEY_POWER_SHUTTER }; item = makeItem(R.drawable.ic_settings_holo_light); item.setLabel(res.getString(R.string.camera_menu_more_label).toUpperCase(locale)); |