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

Commit 5a23f277 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update the bouncer to be able to move to either side of a wide... 

Merge "Revert "Update the bouncer to be able to move to either side of a wide screen."" into sc-dev am: 5d3ce057

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13498470

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c9ce87225c4e2118c3ca298c148e1c04a721c5a
parents 8e96cc0e 5d3ce057

core/java/android/provider/Settings.java

+0 −22
Original line number Diff line number Diff line
@@ -13580,28 +13580,6 @@ public final class Settings { 
        public static final String POWER_BUTTON_VERY_LONG_PRESS =

                "power_button_very_long_press";

























        /**













         * Keyguard should be on the left hand side of the screen, for wide screen layouts.













         *













         * @hide













         */













        public static final int ONE_HANDED_KEYGUARD_SIDE_LEFT = 0;

























        /**













         * Keyguard should be on the right hand side of the screen, for wide screen layouts.













         *













         * @hide













         */













        public static final int ONE_HANDED_KEYGUARD_SIDE_RIGHT = 1;













        /**













         * In one handed mode, which side the keyguard should be on. Allowable values are one of













         * the ONE_HANDED_KEYGUARD_SIDE_* constants.













         *













         * @hide













         */













        public static final String ONE_HANDED_KEYGUARD_SIDE = "one_handed_keyguard_side";



























        /**















         * Keys we no longer back up under the current schema, but want to continue to















         * process when restoring historical backup datasets.

























core/res/res/values/config.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -4707,7 +4707,4 @@





























    <!-- Whether to select voice/data/sms preference without user confirmation -->















    <bool name="config_voice_data_sms_auto_fallback">false</bool>



























    <!-- Whether to enable the one-handed keyguard on the lock screen for wide-screen devices. -->













    <bool name="config_enableOneHandedKeyguard">false</bool>















</resources>
























core/res/res/values/symbols.xml



+0
−2




























Original line number
Diff line number
Diff line








@@ -4176,6 +4176,4 @@













  <java-symbol type="bool" name="config_telephony5gNonStandalone" />































  <java-symbol type="bool" name="config_voice_data_sms_auto_fallback" />



























  <java-symbol type="bool" name="config_enableOneHandedKeyguard" />















</resources>
























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



+0
−5




























Original line number
Diff line number
Diff line








@@ -147,10 +147,5 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.DEVELOPMENT_SETTINGS_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.NOTIFICATION_FEEDBACK_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.RESTRICTED_NETWORKING_MODE, BOOLEAN_VALIDATOR);













        VALIDATORS.put(













                Global.ONE_HANDED_KEYGUARD_SIDE,













                new InclusiveIntegerRangeValidator(













                        /* first= */Global.ONE_HANDED_KEYGUARD_SIDE_LEFT,













                        /* last= */Global.ONE_HANDED_KEYGUARD_SIDE_RIGHT));















    }















}
























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



+0
−1




























Original line number
Diff line number
Diff line








@@ -283,7 +283,6 @@ public class SettingsBackupTest {













                    Settings.Global.EUICC_REMOVING_INVISIBLE_PROFILES_TIMEOUT_MILLIS,















                    Settings.Global.EUICC_SWITCH_SLOT_TIMEOUT_MILLIS,















                    Settings.Global.FANCY_IME_ANIMATIONS,













                    Settings.Global.ONE_HANDED_KEYGUARD_SIDE,















                    Settings.Global.FORCE_ALLOW_ON_EXTERNAL,















                    Settings.Global.FORCED_APP_STANDBY_ENABLED,















                    Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED,