Merge "Renaming setting to navigationbar_key_order" into main (26e412dc) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -12729,7 +12729,7 @@ public final class Settings {
		* 1 = right-to-left (recent, home, back)
		* @hide
		*/
		public static final String NAV_BAR_ORDER = "nav_bar_order";
		public static final String NAVIGATIONBAR_KEY_ORDER = "navigationbar_key_order";

		/**
		* Navigation bar mode.
		@@ -19021,6 +19021,17 @@ public final class Settings {
		public static final String HEARING_DEVICE_LOCAL_NOTIFICATION =
		"hearing_device_local_notification";

		/**
		* This defines the order in which the 3-button navigation bar's buttons are displayed.
		* 0 = left-to-right (back, home, recent)
		* 1 = right-to-left (recent, home, back)
		* @hide
		* @deprecated Use
		* {@link Secure#NAVIGATIONBAR_KEY_ORDER} instead.
		*/
		@Deprecated
		public static final String NAVIGATIONBAR_KEY_ORDER = "navigationbar_key_order";

		/**
		* Global settings that shouldn't be persisted.
		*
		@@ -19069,6 +19080,7 @@ public final class Settings {
		MOVED_TO_SECURE.add(Global.BUGREPORT_IN_POWER_MENU);
		MOVED_TO_SECURE.add(Global.CUSTOM_BUGREPORT_HANDLER_APP);
		MOVED_TO_SECURE.add(Global.CUSTOM_BUGREPORT_HANDLER_USER);
		MOVED_TO_SECURE.add(Global.NAVIGATIONBAR_KEY_ORDER);
		}

		// Certain settings have been moved from global to the per-user system namespace

+1 −1

Original line number	Diff line number	Diff line
		@@ -445,7 +445,7 @@ message SecureSettingsProto {
		// Indicates whether the device is in kids nav mode.
		optional SettingProto nav_bar_kids_mode = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Determines the order of the navbar's buttons
		optional SettingProto nav_bar_order = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto navigationbar_key_order = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional NavBar nav_bar = 92;
		reserved 91; // Formerly nav_bar_kids_mode

+2 −2

Original line number	Diff line number	Diff line
		@@ -301,8 +301,8 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES, JSON_OBJECT_VALIDATOR);
		VALIDATORS.put(Secure.NAV_BAR_FORCE_VISIBLE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.NAV_BAR_KIDS_MODE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.NAV_BAR_ORDER, new DiscreteValueValidator(new String[] {"0", "1"}));
		VALIDATORS.put(Secure.NAVIGATIONBAR_KEY_ORDER,
		new DiscreteValueValidator(new String[] {"0", "1"}));
		VALIDATORS.put(
		Secure.NAVIGATION_MODE, new DiscreteValueValidator(new String[] {"0", "1", "2"}));
		VALIDATORS.put(Secure.NAVIGATION_MODE_RESTORE,

+2 −2

Original line number	Diff line number	Diff line
		@@ -2398,8 +2398,8 @@ class SettingsProtoDumpUtil {
		Settings.Secure.NAV_BAR_KIDS_MODE,
		SecureSettingsProto.NavBar.NAV_BAR_KIDS_MODE);
		dumpSetting(s, p,
		Settings.Secure.NAV_BAR_ORDER,
		SecureSettingsProto.NavBar.NAV_BAR_ORDER);
		Settings.Secure.NAVIGATIONBAR_KEY_ORDER,
		SecureSettingsProto.NavBar.NAVIGATIONBAR_KEY_ORDER);
		p.end(navBar);

		dumpSetting(s, p,

+1 −1

Original line number	Diff line number	Diff line
		@@ -875,7 +875,7 @@ public class SettingsBackupTest {
		Settings.Secure.NAS_SETTINGS_UPDATED,
		Settings.Secure.NAV_BAR_FORCE_VISIBLE,
		Settings.Secure.NAV_BAR_KIDS_MODE,
		Settings.Secure.NAV_BAR_ORDER,
		Settings.Secure.NAVIGATIONBAR_KEY_ORDER,
		Settings.Secure.NEARBY_FAST_PAIR_SETTINGS_DEVICES_COMPONENT,
		Settings.Secure.NEARBY_SHARING_SLICE_URI,
		Settings.Secure.NOTIFIED_NON_ACCESSIBILITY_CATEGORY_SERVICES,