summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/util
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 /src/com/android/camera/util
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
Diffstat (limited to 'src/com/android/camera/util')
-rw-r--r--src/com/android/camera/util/CameraUtil.java4
1 files changed, 4 insertions, 0 deletions
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);
+ }
}