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

Commit 729a9f62 authored by Riley Jones's avatar Riley Jones
Browse files

Renaming setting to navigationbar_key_order 

This aligns the naming with an existing third party definition,
which will allow for effective migration between devices in the future.
As an additional measure, adds a pre-deprecated global definition for the setting.
It should be configured to automatically transfer any values to Secure.

Test: adb shell settings put secure navigationbar_key_order {0 or 1}
Test: run the command with the above values. The bar order should update.
Flag: android.view.accessibility.navbar_flip_order_option
Bug: 424829220
Change-Id: I79c2bc794a635ba69317d5d92c747001e720ed5f
parent d61187a4

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.










@@ -19018,6 +19018,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.















         *










@@ -19066,6 +19077,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

























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



+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

































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



+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,

































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



+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,

































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



+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,