Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 779b389e authored May 29, 2025 by Riley Jones

Defines NAVIGATION_BAR_ORDER setting

Bug: 401601652
Flag: EXEMPT standalone definition
Test: atest SettingsBackupTest
Change-Id: I0209537d8d40e6ed6f6f68bde6b71d26f3225c55

parent 4809a0c0

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -12654,6 +12654,14 @@ public final class Settings {
		*/
		public static final String NAV_BAR_KIDS_MODE = "nav_bar_kids_mode";

		/**
		* 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
		*/
		public static final String NAV_BAR_ORDER = "nav_bar_order";

		/**
		* Navigation bar mode.
		* 0 = 3 button

core/proto/android/providers/settings/secure.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -444,6 +444,8 @@ message SecureSettingsProto {
		optional SettingProto nav_bar_force_visible = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// 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 NavBar nav_bar = 92;
		reserved 91; // Formerly nav_bar_kids_mode

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +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.NAVIGATION_MODE, new DiscreteValueValidator(new String[] {"0", "1", "2"}));
		VALIDATORS.put(Secure.NAVIGATION_MODE_RESTORE,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2397,6 +2397,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		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);
		p.end(navBar);

		dumpSetting(s, p,

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -874,6 +874,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.NEARBY_FAST_PAIR_SETTINGS_DEVICES_COMPONENT,
		Settings.Secure.NEARBY_SHARING_SLICE_URI,
		Settings.Secure.NOTIFIED_NON_ACCESSIBILITY_CATEGORY_SERVICES,