summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-11-13 16:42:00 +0800
committerkaiyiz <kaiyiz@codeaurora.org>2014-11-13 16:42:00 +0800
commite73e717b8be1ba834161914af4debc61c1feb8be (patch)
tree04ed95b837a4ce5affd422abe7855fc1e3edc4cb
parent0231aab003276d2142fe745e50d6eb44e3f11c9c (diff)
downloadandroid_packages_apps_Snap-e73e717b8be1ba834161914af4debc61c1feb8be.tar.gz
android_packages_apps_Snap-e73e717b8be1ba834161914af4debc61c1feb8be.tar.bz2
android_packages_apps_Snap-e73e717b8be1ba834161914af4debc61c1feb8be.zip
SnapdragonCamera: Forbid volume key can take picture
In CMCC Mode, don't need take picture when press volume key. Add a boolean value for judge whether need to take picture when press volume key, and overlay it in Carrier package. CRs-Fixed: 685391 Change-Id: Ice83c93ea417c1e64cbc5c6751d5f7e38c07606a
-rw-r--r--res/values/bool.xml1
-rw-r--r--src/com/android/camera/PhotoModule.java6
-rw-r--r--src/com/android/camera/util/CameraUtil.java4
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 299540010..87a390cce 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2438,6 +2438,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) {
@@ -2513,7 +2516,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);
+ }
}