Merge "Add a secure setting for double twist gesture for camera flip." into nyc-mr1-dev (3e869587) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+17 −7

Original line number	Diff line number	Diff line
		@@ -6146,6 +6146,15 @@ public final class Settings {
		public static final String CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED =
		"camera_double_tap_power_gesture_disabled";

		/**
		* Whether the camera double twist gesture to flip between front and back mode should be
		* enabled.
		*
		* @hide
		*/
		public static final String CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED =
		"camera_double_twist_to_flip_enabled";

		/**
		* Control whether Night display is currently activated.
		* @hide
		@@ -6300,6 +6309,14 @@ public final class Settings {
		"automatic_storage_manager_last_run";


		/**
		* Whether SystemUI navigation keys is enabled.
		* @hide
		*/
		public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
		"system_navigation_keys_enabled";


		/**
		* This are the settings to be backed up.
		*
		@@ -9113,13 +9130,6 @@ public final class Settings {
		*/
		public static final String MAX_NOTIFICATION_ENQUEUE_RATE = "max_notification_enqueue_rate";

		/**
		* Whether SystemUI navigation keys is enabled.
		* @hide
		*/
		public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
		"system_navigation_keys_enabled";

		/**
		* Whether cell is enabled/disabled
		* @hide

+2 −2

Original line number	Diff line number	Diff line
		@@ -7280,8 +7280,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		private boolean areSystemNavigationKeysEnabled() {
		return Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.SYSTEM_NAVIGATION_KEYS_ENABLED, 1) == 1;
		return Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 1) == 1;
		}

		@Override