Merge "Add secure settings for Global Actions Panel." into qt-dev (c8cb13a5) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -6498,6 +6498,21 @@ public final class Settings {
		private static final Validator TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES_VALIDATOR =
		new SettingsValidators.ComponentNameListValidator(":");

		/**
		* Whether the Global Actions Panel is enabled.
		* @hide
		*/
		public static final String GLOBAL_ACTIONS_PANEL_ENABLED = "global_actions_panel_enabled";

		private static final Validator GLOBAL_ACTIONS_PANEL_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Whether the Global Actions Panel can be toggled on or off in Settings.
		* @hide
		*/
		public static final String GLOBAL_ACTIONS_PANEL_AVAILABLE =
		"global_actions_panel_available";

		/**
		* Whether the hush gesture has ever been used
		* @hide
		@@ -8937,7 +8952,8 @@ public final class Settings {
		SILENCE_NOTIFICATION_GESTURE_COUNT,
		SILENCE_CALL_GESTURE_COUNT,
		SILENCE_TIMER_GESTURE_COUNT,
		DARK_MODE_DIALOG_SEEN
		DARK_MODE_DIALOG_SEEN,
		GLOBAL_ACTIONS_PANEL_ENABLED
		};

		/**
		@@ -9121,6 +9137,7 @@ public final class Settings {
		VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);
		VALIDATORS.put(DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);
		VALIDATORS.put(UI_NIGHT_MODE, UI_NIGHT_MODE_VALIDATOR);
		VALIDATORS.put(GLOBAL_ACTIONS_PANEL_ENABLED, GLOBAL_ACTIONS_PANEL_ENABLED_VALIDATOR);
		}

		/**

+5 −0

Original line number	Diff line number	Diff line
		@@ -2364,4 +2364,9 @@ enum PageId {

		// Settings > Apps and notifications > Notifications > Gentle notifications
		GENTLE_NOTIFICATIONS_SCREEN = 1715;

		// OPEN: Settings > System > Gestures > Global Actions Panel
		// CATEGORY: SETTINGS
		// OS: Q
		GLOBAL_ACTIONS_PANEL_SETTINGS = 1800;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -636,6 +636,7 @@ public class SettingsBackupTest {
		Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
		Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
		Settings.Secure.ENABLED_PRINT_SERVICES,
		Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE,
		Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,
		Settings.Secure.INCALL_BACK_BUTTON_BEHAVIOR,
		Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY,
		@@ -798,4 +799,3 @@ public class SettingsBackupTest {
		}

		}