am f37368db: am ef5f9e39: am 48422b52: Merge "Add double-tap power button to... (99bbec73) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -7009,4 +7009,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>

res/xml/display_settings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -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"

src/com/android/settings/DisplaySettings.java

+33 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.settings.DropDownPreference.Callback;
		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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		private SwitchPreference mTapToWakePreference;
		private SwitchPreference mAutoBrightnessPreference;
		private SwitchPreference mCameraGesturePreference;
		private SwitchPreference mCameraDoubleTapPowerGesturePreference;

		@Override
		protected int getMetricsCategory() {
		@@ -159,6 +163,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		!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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		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 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		if (!isCameraGestureAvailable(context.getResources())) {
		result.add(KEY_CAMERA_GESTURE);
		}
		if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
		result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
		}
		return result;
		}
		};