diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-08-29 13:15:02 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
| commit | 461a8209d21a834ac5ba20dbca6fd90da144cffa (patch) | |
| tree | b1f4ea97c5d968e29c42fb936a4a683a41f8ab26 | |
| parent | 94edc409d9bfdd721f424a4d3b46adeaabfb165b (diff) | |
| download | android_packages_apps_Snap-461a8209d21a834ac5ba20dbca6fd90da144cffa.tar.gz android_packages_apps_Snap-461a8209d21a834ac5ba20dbca6fd90da144cffa.tar.bz2 android_packages_apps_Snap-461a8209d21a834ac5ba20dbca6fd90da144cffa.zip | |
Revert "SnapdragonCamera: Forbid volume key can take picture"
This reverts commit e73e717b8be1ba834161914af4debc61c1feb8be.
Change-Id: Iee719f34f6016f89ec0bb1c078bfa25c2f718436
| -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, 1 insertions, 10 deletions
diff --git a/res/values/bool.xml b/res/values/bool.xml index 2bb520bf6..4488d70bb 100644 --- a/res/values/bool.xml +++ b/res/values/bool.xml @@ -16,5 +16,4 @@ <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 0985272e3..d40f0d299 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2470,9 +2470,6 @@ 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) { @@ -2506,8 +2503,7 @@ public class PhotoModule switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: - if (/*mActivity.isInCameraApp() && */ mFirstTimeInitialized - && !CameraUtil.volumeKeyShutterDisable(mActivity)) { + if (/*mActivity.isInCameraApp() && */ mFirstTimeInitialized) { onShutterButtonClick(); return true; } diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 9239eda17..966caa6ad 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -1110,10 +1110,6 @@ public class CameraUtil { return ret; } - public static boolean volumeKeyShutterDisable(Context context) { - return context.getResources().getBoolean(R.bool.volume_key_shutter_disable); - } - public static int determineRatio(int width, int height) { if (height != 0) { return determineRatio(((float) width) / height); |