summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-09-10 00:25:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-10 00:25:59 +0000
commit5d0e02b64e5b860e989268d1e7fd882e5fd47919 (patch)
tree7e1e72437fad667673c5ef942836629b62ba5ef4 /core/res
parent2ebbf4c899b39e080be1ec9cd5d1178f30c0cd89 (diff)
parent5941c98c641e64a26bf68816faf967d25cc8f256 (diff)
downloadframeworks_base-5d0e02b64e5b860e989268d1e7fd882e5fd47919.zip
frameworks_base-5d0e02b64e5b860e989268d1e7fd882e5fd47919.tar.gz
frameworks_base-5d0e02b64e5b860e989268d1e7fd882e5fd47919.tar.bz2
Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev
Diffstat (limited to 'core/res')
-rwxr-xr-xcore/res/res/values/config.xml4
-rwxr-xr-xcore/res/res/values/symbols.xml1
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index d7658d1..f711c80 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2290,4 +2290,8 @@
<!-- The OEM specified sensor string type for the gesture to launch camera app, this value
must match the value of config_cameraLaunchGestureSensorType in OEM's HAL -->
<string translatable="false" name="config_cameraLaunchGestureSensorStringType"></string>
+
+ <!-- Allow the gesture to double tap the power button twice to start the camera while the device
+ is non-interactive. -->
+ <bool name="config_cameraDoubleTapPowerGestureEnabled">true</bool>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 4c8e55e..0e85f43 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2323,6 +2323,7 @@
<!-- Gesture -->
<java-symbol type="integer" name="config_cameraLaunchGestureSensorType" />
<java-symbol type="string" name="config_cameraLaunchGestureSensorStringType" />
+ <java-symbol type="bool" name="config_cameraDoubleTapPowerGestureEnabled" />
<java-symbol type="drawable" name="platlogo_m" />
</resources>