Merge "Add Sensors Off QS tile and display status bar icon when active" (c640422a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −32

Original line number	Diff line number	Diff line
		@@ -8586,38 +8586,6 @@ public final class Settings {
		public static final String PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE =
		"packages_to_clear_data_before_full_restore";

		/**
		* Indicates the location state should be maintained after sensor privacy is disabled.
		* @hide
		*/
		public static final String MAINTAIN_LOCATION_AFTER_SP_DISABLED = "0";

		/**
		* Indicates location should be reenabled after sensor privacy is disabled.
		* @hide
		*/
		public static final String REENABLE_LOCATION_AFTER_SP_DISABLED = "1";

		/**
		* Indicates the state of airplane mode should be maintained after sensor privacy is
		* disabled.
		* @hide
		*/
		public static final String MAINTAIN_AIRPLANE_MODE_AFTER_SP_DISABLED = "0";

		/**
		* Indicates airplane mode should be disabled after sensor privacy is disabled.
		* @hide
		*/
		public static final String DISABLE_AIRPLANE_MODE_AFTER_SP_DISABLED = "1";

		/**
		* The state of all sensors managed by SensorPrivacyService when sensor privacy is enabled.
		* @hide
		*/
		public static final String SENSOR_PRIVACY_SENSOR_STATE =
		"sensor_privacy_sensor_state";

		/**
		* Setting to determine whether to use the new notification priority handling features.
		* @hide

core/proto/android/app/settings_enums.proto

+7 −0

Original line number	Diff line number	Diff line
		@@ -590,6 +590,13 @@ enum Action {
		// OS: P
		DIALOG_SWITCH_HFP_DEVICES = 1416;

		// OPEN: QS Sensor Privacy Mode tile shown
		// ACTION: QS Sensor Privacy Mode tile tapped
		// SUBTYPE: 0 is off, 1 is on
		// CATEGORY: QUICK_SETTINGS
		// OS: Q
		QS_SENSOR_PRIVACY = 1598;

		// ACTION: Tap & Pay -> Default Application Setting -> Use Forground
		ACTION_NFC_PAYMENT_FOREGROUND_SETTING = 1622;

core/res/res/values/config.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		<item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_airplane</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_battery</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_sensors_off</xliff:g></item>
		</string-array>

		<string translatable="false" name="status_bar_rotate">rotate</string>
		@@ -92,6 +93,7 @@
		<string translatable="false" name="status_bar_microphone">microphone</string>
		<string translatable="false" name="status_bar_camera">camera</string>
		<string translatable="false" name="status_bar_airplane">airplane</string>
		<string translatable="false" name="status_bar_sensors_off">sensors_off</string>

		<!-- Flag indicating whether the surface flinger has limited
		alpha compositing functionality in hardware. If set, the window

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2924,6 +2924,7 @@
		<java-symbol type="string" name="status_bar_vpn" />
		<java-symbol type="string" name="status_bar_microphone" />
		<java-symbol type="string" name="status_bar_camera" />
		<java-symbol type="string" name="status_bar_sensors_off" />

		<!-- Locale picker -->
		<java-symbol type="id" name="locale_search_menu" />

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -623,7 +623,6 @@ public class SettingsBackupTest {
		Settings.Secure.DEFAULT_INPUT_METHOD,
		Settings.Secure.DEVICE_PAIRED,
		Settings.Secure.DIALER_DEFAULT_APPLICATION,
		Settings.Secure.DISABLE_AIRPLANE_MODE_AFTER_SP_DISABLED,
		Settings.Secure.DISABLED_PRINT_SERVICES,
		Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS,
		Settings.Secure.DISPLAY_DENSITY_FORCED,
		@@ -647,8 +646,6 @@ public class SettingsBackupTest {
		Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, // Candidate?
		Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,
		Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
		Settings.Secure.MAINTAIN_AIRPLANE_MODE_AFTER_SP_DISABLED,
		Settings.Secure.MAINTAIN_LOCATION_AFTER_SP_DISABLED,
		Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,
		Settings.Secure.MULTI_PRESS_TIMEOUT,
		Settings.Secure.NFC_PAYMENT_FOREGROUND,
		@@ -662,7 +659,6 @@ public class SettingsBackupTest {
		Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,
		Settings.Secure.PAYMENT_SERVICE_SEARCH_URI,
		Settings.Secure.PRINT_SERVICE_SEARCH_URI,
		Settings.Secure.REENABLE_LOCATION_AFTER_SP_DISABLED,
		Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT, // Candidate?
		Settings.Secure.SEARCH_GLOBAL_SEARCH_ACTIVITY,
		Settings.Secure.SEARCH_MAX_RESULTS_PER_SOURCE,
		@@ -686,7 +682,6 @@ public class SettingsBackupTest {
		Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE,
		Settings.Secure.SELECTED_SPELL_CHECKER, // Intentionally removed in Q
		Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE, // Intentionally removed in Q
		Settings.Secure.SENSOR_PRIVACY_SENSOR_STATE,
		Settings.Secure.SETTINGS_CLASSNAME,
		Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, // candidate?
		Settings.Secure.SHOW_ROTATION_SUGGESTIONS,