Merge changes I78c77add,Ia5d02504 into main (42ecf2a0) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -10998,6 +10998,25 @@ public final class Settings {
		public static final String EMERGENCY_GESTURE_UI_LAST_STARTED_MILLIS =
		"emergency_gesture_ui_last_started_millis";

		/**
		* Whether double tap the power button gesture is enabled.
		*
		* @hide
		*/
		@Readable
		public static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED =
		"double_tap_power_button_gesture_enabled";

		/**
		* Double tap power button gesture behavior.
		* 0 = Camera launch
		* 1 = Wallet launch
		* @hide
		*/
		@Readable
		public static final String DOUBLE_TAP_POWER_BUTTON_GESTURE =
		"double_tap_power_button_gesture";

		/**
		* Whether the camera launch gesture to double tap the power button when the screen is off
		* should be disabled.

+7 −1

Original line number	Diff line number	Diff line
		@@ -256,6 +256,12 @@ message SecureSettingsProto {
		}
		optional Display display = 100;

		message DoubleTapPowerButton {
		optional SettingProto gesture_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto gesture = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional DoubleTapPowerButton double_tap_power_button = 103;

		message Doze {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		@@ -737,5 +743,5 @@ message SecureSettingsProto {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ public class SecureSettings {
		Settings.Secure.DISPLAY_WHITE_BALANCE_ENABLED,
		Settings.Secure.SYNC_PARENT_SOUNDS,
		Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,
		Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
		Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
		Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
		Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED,
		// ACCESSIBILITY_QS_TARGETS needs to be restored after ENABLED_ACCESSIBILITY_SERVICES

+3 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,9 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.DISPLAY_WHITE_BALANCE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.SYNC_PARENT_SOUNDS, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
		new InclusiveIntegerRangeValidator(0, 1));
		VALIDATORS.put(Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.QS_TILES, TILE_LIST_VALIDATOR);

+9 −0

Original line number	Diff line number	Diff line
		@@ -2124,6 +2124,15 @@ class SettingsProtoDumpUtil {
		SecureSettingsProto.Display.SCREEN_RESOLUTION_MODE);
		p.end(displayToken);

		final long doubleTapPowerButtonToken = p.start(SecureSettingsProto.DOUBLE_TAP_POWER_BUTTON);
		dumpSetting(s, p,
		Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
		SecureSettingsProto.DoubleTapPowerButton.GESTURE_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
		SecureSettingsProto.DoubleTapPowerButton.GESTURE);
		p.end(doubleTapPowerButtonToken);

		final long dozeToken = p.start(SecureSettingsProto.DOZE);
		dumpSetting(s, p,
		Settings.Secure.DOZE_ENABLED,