Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cc78bd9..88dce90 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7001,4 +7001,9 @@
<!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
<string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
+ <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+ <string name="camera_double_tap_power_gesture_title">Press power button twice for camera</string>
+
+ <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+ <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
</resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b5157e4..7150150 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -63,6 +63,12 @@
android:summary="@string/camera_gesture_desc"
android:persistent="false" />
+ <SwitchPreference
+ android:key="camera_double_tap_power_gesture"
+ android:title="@string/camera_double_tap_power_gesture_title"
+ android:summary="@string/camera_double_tap_power_gesture_desc"
+ android:persistent="false" />
+
<PreferenceScreen
android:key="screensaver"
android:title="@string/screensaver_settings_title"
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index d2daac8..de15d4c 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -22,6 +22,7 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE;
import static android.provider.Settings.Secure.DOZE_ENABLED;
@@ -76,6 +77,8 @@
private static final String KEY_AUTO_ROTATE = "auto_rotate";
private static final String KEY_NIGHT_MODE = "night_mode";
private static final String KEY_CAMERA_GESTURE = "camera_gesture";
+ private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
+ = "camera_double_tap_power_gesture";
private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
@@ -91,6 +94,7 @@
private SwitchPreference mTapToWakePreference;
private SwitchPreference mAutoBrightnessPreference;
private SwitchPreference mCameraGesturePreference;
+ private SwitchPreference mCameraDoubleTapPowerGesturePreference;
@Override
protected int getMetricsCategory() {
@@ -159,6 +163,14 @@
removePreference(KEY_CAMERA_GESTURE);
}
+ if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
+ mCameraDoubleTapPowerGesturePreference
+ = (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+ mCameraDoubleTapPowerGesturePreference.setOnPreferenceChangeListener(this);
+ } else {
+ removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+ }
+
if (RotationPolicy.isRotationLockToggleVisible(activity)) {
DropDownPreference rotatePreference =
(DropDownPreference) findPreference(KEY_AUTO_ROTATE);
@@ -241,6 +253,11 @@
!SystemProperties.getBoolean("gesture.disable_camera_launch", false);
}
+ private static boolean isCameraDoubleTapPowerGestureAvailable(Resources res) {
+ return res.getBoolean(
+ com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+ }
+
private void updateTimeoutPreferenceDescription(long currentTimeout) {
ListPreference preference = mScreenTimeoutPreference;
String summary;
@@ -388,11 +405,18 @@
mTapToWakePreference.setChecked(value != 0);
}
- // Update camera gesture if it is available.
+ // Update camera gesture #1 if it is available.
if (mCameraGesturePreference != null) {
int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
mCameraGesturePreference.setChecked(value == 0);
}
+
+ // Update camera gesture #2 if it is available.
+ if (mCameraDoubleTapPowerGesturePreference != null) {
+ int value = Settings.Secure.getInt(
+ getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+ mCameraDoubleTapPowerGesturePreference.setChecked(value == 0);
+ }
}
private void updateScreenSaverSummary() {
@@ -453,6 +477,11 @@
Settings.Secure.putInt(getContentResolver(), CAMERA_GESTURE_DISABLED,
value ? 0 : 1 /* Backwards because setting is for disabling */);
}
+ if (preference == mCameraDoubleTapPowerGesturePreference) {
+ boolean value = (Boolean) objValue;
+ Settings.Secure.putInt(getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+ value ? 0 : 1 /* Backwards because setting is for disabling */);
+ }
if (preference == mNightModePreference) {
try {
final int value = Integer.parseInt((String) objValue);
@@ -524,6 +553,9 @@
if (!isCameraGestureAvailable(context.getResources())) {
result.add(KEY_CAMERA_GESTURE);
}
+ if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
+ result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
+ }
return result;
}
};