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

Commit 1c6377e7 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Add a configurable timeout to global actions dialog" into main

parents 3f000498 36ab2a84

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -19845,6 +19845,14 @@ public final class Settings { 
        public static final String REDACT_OTP_NOTIFICATIONS_FROM_UNTRUSTED_LISTENERS =

                "redact_otp_notifications_from_untrusted_listeners";













        /**













         * Timeout used to dismiss the Global Actions Dialog to avoid the possibility of













         * OLED burn-in from the dialog.













         * @hide













         */













        public static final String GLOBAL_ACTIONS_TIMEOUT_MILLIS =













                "global_actions_timeout_ms";



























        /**















         * Settings migrated from Wear OS settings provider.















         * @hide

























core/res/res/values/config.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -7398,6 +7398,10 @@













         OEM/Partner can explicitly opt to disable the screen. -->















    <bool name="config_enableGaiaEducationInPrivateSpace">true</bool>





























    <!-- Default dismiss timeout (in milliseconds) for the power menu (Global Actions) dialog to













         avoid possible screen burn in issues. Set to '0' to disable timeout -->













    <integer name="config_globalActionsDialogTimeout">0</integer>





























    <!-- Whether to enable usb state update via udc sysfs. -->















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

















































core/res/res/values/symbols.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -5899,6 +5899,8 @@













  <java-symbol type="string" name="keyboard_shortcut_group_applications_sms" />















  <java-symbol type="string" name="keyboard_shortcut_group_applications" />





























  <java-symbol type="integer" name="config_globalActionsDialogTimeout" />





























  <!-- Fingerprint loe notification string -->















  <java-symbol type="string" name="fingerprint_loe_notification_msg" />

















































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -127,5 +127,6 @@ public class GlobalSettings {













        Settings.Global.ADD_USERS_WHEN_LOCKED,















        Settings.Global.REMOVE_GUEST_ON_EXIT,















        Settings.Global.USER_SWITCHER_ENABLED,













        Settings.Global.GLOBAL_ACTIONS_TIMEOUT_MILLIS,















    };















}
























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -476,5 +476,6 @@ public class GlobalSettingsValidators {













                        }));















        VALIDATORS.put(Global.Wearable.GESTURE_PRIMARY_ACTION_USER_PREFERENCE, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.GESTURE_DISMISS_ACTION_USER_PREFERENCE, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.GLOBAL_ACTIONS_TIMEOUT_MILLIS, NON_NEGATIVE_INTEGER_VALIDATOR);















    }















}