Merge "Add setting for Aware enable/disable" (07d4065a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -8435,6 +8435,13 @@ public final class Settings {
		private static final Validator THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR =
		new SettingsValidators.PackageNameListValidator(",");

		/**
		* Controls whether aware is enabled.
		* @hide
		*/
		public static final String AWARE_ENABLED = "aware_enabled";

		private static final Validator AWARE_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
		/**
		* This are the settings to be backed up.
		*
		@@ -8559,6 +8566,7 @@ public final class Settings {
		SKIP_GESTURE,
		SILENCE_GESTURE,
		THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
		AWARE_ENABLED,
		};

		/**
		@@ -8731,6 +8739,7 @@ public final class Settings {
		VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR);
		VALIDATORS.put(THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
		THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR);
		VALIDATORS.put(AWARE_ENABLED, AWARE_ENABLED_VALIDATOR);
		}

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -2183,4 +2183,10 @@ enum PageId {
		// OPEN: Settings > Display > Adaptive sleep
		// OS: Q
		SETTINGS_ADAPTIVE_SLEEP = 1628;

		// OPEN: Settings > System > Aware
		SETTINGS_AWARE = 1632;

		// OPEN: Settings > System > Aware > Disable > Dialog
		DIALOG_AWARE_DISABLE = 1633;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -530,7 +530,9 @@ message SecureSettingsProto {
		optional SettingProto silence_gesture_enabled = 75 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto theme_customization_overlay_packages = 76 [ (android.privacy).dest = DEST_AUTOMATIC ];

		optional SettingProto aware_enabled = 77 [ (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 = 77;
		// Next tag = 78;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -3762,4 +3762,7 @@

		<!-- Whether cbrs is supported on the device or not -->
		<bool translatable="false" name="config_cbrs_supported">false</bool>

		<!-- Whether or not aware is enabled by default -->
		<bool name="config_awareSettingAvailable">false</bool>
		</resources>

+2 −0

Original line number	Diff line number	Diff line
		@@ -3553,4 +3553,6 @@

		<!-- For CBRS -->
		<java-symbol type="bool" name="config_cbrs_supported" />

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