Merge "[DO NOT MERGE] Add setting for power menu in lock screen privacy" into rvc-dev (eab14fca) · Commits · e / os / android_frameworks_base

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3087,6 +3087,7 @@ package android.provider {
		field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
		field public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";
		field public static final String NOTIFICATION_BADGING = "notification_badging";
		field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content";
		field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";
		field public static final String USER_SETUP_COMPLETE = "user_setup_complete";
		field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

+10 −0

Original line number	Diff line number	Diff line
		@@ -8606,6 +8606,16 @@ public final class Settings {
		*/
		public static final String CONTROLS_ENABLED = "controls_enabled";

		/**
		* Whether power menu content (cards, passes, controls) will be shown when device is locked.
		*
		* 0 indicates hide and 1 indicates show. A non existent value will be treated as hide.
		* @hide
		*/
		@TestApi
		public static final String POWER_MENU_LOCKED_SHOW_CONTENT =
		"power_menu_locked_show_content";

		/**
		* Specifies whether the web action API is enabled.
		*

+8 −1

Original line number	Diff line number	Diff line
		@@ -397,6 +397,13 @@ message SecureSettingsProto {
		}
		optional ParentalControl parental_control = 43;

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

		optional SettingProto show = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional PowerMenuPrivacy power_menu_privacy = 81;

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

		@@ -588,5 +595,5 @@ message SecureSettingsProto {

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ public class SecureSettings {
		Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED,
		Settings.Secure.QS_TILES,
		Settings.Secure.CONTROLS_ENABLED,
		Settings.Secure.POWER_MENU_LOCKED_SHOW_CONTENT,
		Settings.Secure.DOZE_ENABLED,
		Settings.Secure.DOZE_ALWAYS_ON,
		Settings.Secure.DOZE_PICK_UP_GESTURE,

+1 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.QS_TILES, TILE_LIST_VALIDATOR);
		VALIDATORS.put(Secure.CONTROLS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.POWER_MENU_LOCKED_SHOW_CONTENT, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.DOZE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.DOZE_ALWAYS_ON, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.DOZE_PICK_UP_GESTURE, BOOLEAN_VALIDATOR);