Merge "Add skip and silence gestures" (d526cb90) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -7406,6 +7406,22 @@ public final class Settings {

		private static final Validator DOZE_WAKE_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that skips media.
		* @hide
		*/
		public static final String SKIP_GESTURE = "skip_gesture";

		private static final Validator SKIP_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Gesture that silences sound (alarms, notification, calls).
		* @hide
		*/
		public static final String SILENCE_GESTURE = "silence_gesture";

		private static final Validator SILENCE_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* The current night mode that has been selected by the user. Owned
		* and controlled by UiModeManagerService. Constants are as per
		@@ -8483,6 +8499,8 @@ public final class Settings {
		NOTIFICATION_NEW_INTERRUPTION_MODEL,
		TRUST_AGENTS_EXTEND_UNLOCK,
		LOCK_SCREEN_WHEN_TRUST_LOST,
		SKIP_GESTURE,
		SILENCE_GESTURE,
		};

		/**
		@@ -8650,6 +8668,8 @@ public final class Settings {
		VALIDATORS.put(TRUST_AGENTS_EXTEND_UNLOCK, TRUST_AGENTS_EXTEND_UNLOCK_VALIDATOR);
		VALIDATORS.put(LOCK_SCREEN_CUSTOM_CLOCK_FACE, LOCK_SCREEN_CUSTOM_CLOCK_FACE_VALIDATOR);
		VALIDATORS.put(LOCK_SCREEN_WHEN_TRUST_LOST, LOCK_SCREEN_WHEN_TRUST_LOST_VALIDATOR);
		VALIDATORS.put(SKIP_GESTURE, SKIP_GESTURE_VALIDATOR);
		VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR);
		}

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -91,4 +91,10 @@ enum PageId {

		// OPEN: Settings > Apps & Notifications -> Special app access -> Financial Apps Sms Access
		SETTINGS_FINANCIAL_APPS_SMS_ACCESS = 1597;

		// OPEN: Settings > System > Input & Gesture > Skip songs
		SETTINGS_GESTURE_SKIP = 1624;

		// OPEN: Settings > System > Input & Gesture > Silence alerts
		SETTINGS_GESTURE_SILENCE = 1625;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -525,7 +525,10 @@ message SecureSettingsProto {
		}
		optional Zen zen = 71;

		optional SettingProto skip_gesture_enabled = 74 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto silence_gesture_enabled = 75 [ (android.privacy).dest = DEST_AUTOMATIC ];

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 74;
		// Next tag = 76;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -3708,4 +3708,10 @@
		<!-- If device supports corner radius on windows.
		This should be turned off on low-end devices to improve animation performance. -->
		<bool name="config_supportsRoundedCornersOnWindows">true</bool>

		<!-- If the sensor that skips media is available or not. -->
		<bool name="config_skipSensorAvailable">false</bool>

		<!-- If the sensor that silences alerts is available or not. -->
		<bool name="config_silenceSensorAvailable">false</bool>
		</resources>

+3 −0

Original line number	Diff line number	Diff line
		@@ -3536,4 +3536,7 @@
		<java-symbol type="string" name="dynamic_mode_notification_title" />
		<java-symbol type="string" name="dynamic_mode_notification_summary" />
		<java-symbol type="drawable" name="ic_battery" />

		<java-symbol type="bool" name="config_skipSensorAvailable" />
		<java-symbol type="bool" name="config_silenceSensorAvailable" />
		</resources>