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

Commit f6962c87 authored by Robin Bennett's avatar Robin Bennett Committed by android-build-merger
Browse files

Merge "Add setting/experiment to send keycode sleep for ungaze when Home is... 

Merge "Add setting/experiment to send keycode sleep for ungaze when Home is the foreground activity." into pi-dev am: 219e1396
am: b1b9aa2e

Change-Id: I46ed3f1d59513bba6342f0ee29ba94de8b7f5c2b
parents 045652b7 b1b9aa2e

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10808,6 +10808,15 @@ public final class Settings { 
        public static final String TIME_ONLY_MODE_CONSTANTS

                = "time_only_mode_constants";



        /**

         * Whether of not to send keycode sleep for ungaze when Home is the foreground activity on

         * watch type devices.

         * Type: int (0 for false, 1 for true)

         * Default: 0

         * @hide

         */

        public static final String UNGAZE_SLEEP_ENABLED = "ungaze_sleep_enabled";



        /**

         * Whether or not Network Watchlist feature is enabled.

         * Type: int (0 for false, 1 for true)

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ public class SettingsBackupTest { 
                    Settings.Global.UNINSTALLED_INSTANT_APP_MIN_CACHE_PERIOD,

                    Settings.Global.UNINSTALLED_INSTANT_APP_MAX_CACHE_PERIOD,

                    Settings.Global.UNUSED_STATIC_SHARED_LIB_MIN_CACHE_PERIOD,

                    Settings.Global.UNGAZE_SLEEP_ENABLED,

                    Settings.Global.UNLOCK_SOUND,

                    Settings.Global.USE_GOOGLE_MAIL,

                    Settings.Global.VT_IMS_ENABLED,