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

Commit eb4eb29f authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut" into sc-dev am: 9df0e2bd 

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

Change-Id: I5b5a262b31691d3ed970562b17234c6947a52e73
parents beb47324 9df0e2bd

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -8514,6 +8514,12 @@ public final class Settings { 
        public static final String SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED =

                "swipe_bottom_to_notification_enabled";













        /**













         * Controls whether One-Handed mode is currently activated.













         * @hide













         */













        public static final String ONE_HANDED_MODE_ACTIVATED = "one_handed_mode_activated";



























        /**















         * For user preference if One-Handed Mode enabled.















         * @hide

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -430,6 +430,7 @@ message SecureSettingsProto {













        optional SettingProto one_handed_mode_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto one_handed_mode_timeout = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto taps_app_to_exit = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto one_handed_mode_activated = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional OneHanded onehanded = 80;

















































packages/SettingsProvider/res/values/defaults.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -260,4 +260,7 @@













    <!-- Default for Settings.Secure.ACCESSIBILITY_BUTTON_MODE -->















    <integer name="def_accessibility_button_mode">1</integer>





























    <!-- Default for Settings.Secure.ONE_HANDED_MODE_ACTIVATED -->













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





























</resources>
























packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -173,6 +173,7 @@ public class SecureSettings {













        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,















        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,













        Settings.Secure.ONE_HANDED_MODE_ACTIVATED,















        Settings.Secure.ONE_HANDED_MODE_ENABLED,















        Settings.Secure.ONE_HANDED_MODE_TIMEOUT,















        Settings.Secure.TAPS_APP_TO_EXIT,

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -262,6 +262,7 @@ public class SecureSettingsValidators {













        VALIDATORS.put(















                Secure.ACCESSIBILITY_BUTTON_TARGETS,















                ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);













        VALIDATORS.put(Secure.ONE_HANDED_MODE_ACTIVATED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ONE_HANDED_MODE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ONE_HANDED_MODE_TIMEOUT, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.TAPS_APP_TO_EXIT, BOOLEAN_VALIDATOR);