diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-01 07:49:43 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-01 07:49:43 -0800 |
| commit | 8fec397630043de04f3f963a48b9b9c931617bd8 (patch) | |
| tree | 7036bafa557e930be2c81f3d8cddbf4f1c9a854c | |
| parent | bbf8105892d0e8fea832a0c71d2acd471b1ade0f (diff) | |
| parent | e73e717b8be1ba834161914af4debc61c1feb8be (diff) | |
| download | android_packages_apps_Snap-8fec397630043de04f3f963a48b9b9c931617bd8.tar.gz android_packages_apps_Snap-8fec397630043de04f3f963a48b9b9c931617bd8.tar.bz2 android_packages_apps_Snap-8fec397630043de04f3f963a48b9b9c931617bd8.zip | |
Merge "SnapdragonCamera: Forbid volume key can take picture"
| -rw-r--r-- | res/values/bool.xml | 1 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/res/values/bool.xml b/res/values/bool.xml index 4488d70bb..2bb520bf6 100644 --- a/res/values/bool.xml +++ b/res/values/bool.xml @@ -16,4 +16,5 @@ <resources> <bool name="show_action_bar_title">false</bool> <bool name="force_count_down_sound">false</bool> + <bool name="volume_key_shutter_disable">false</bool> </resources> diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index e60f4c419..c45d02703 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2445,6 +2445,9 @@ public class PhotoModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: + if (CameraUtil.volumeKeyShutterDisable(mActivity)) { + return false; + } case KeyEvent.KEYCODE_FOCUS: if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized) { if (event.getRepeatCount() == 0) { @@ -2520,7 +2523,8 @@ public class PhotoModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: - if (/*mActivity.isInCameraApp() && */ mFirstTimeInitialized) { + if (/*mActivity.isInCameraApp() && */ mFirstTimeInitialized + && !CameraUtil.volumeKeyShutterDisable(mActivity)) { onShutterButtonClick(); return true; } diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 4cfc211bc..a80db9f09 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -1057,4 +1057,8 @@ public class CameraUtil { } return ret; } + + public static boolean volumeKeyShutterDisable(Context context) { + return context.getResources().getBoolean(R.bool.volume_key_shutter_disable); + } } |