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

Commit 74d615f1 authored by Michael Kwan's avatar Michael Kwan Committed by android-build-merger
Browse files

Merge "Modify time only mode flag into set of values instead of just one." into pi-dev 

am: c5d0ed9f

Change-Id: I4721197b1329a14aa51f1b49a05bdade1fb71ef8
parents 0f319308 c5d0ed9f

core/java/android/provider/Settings.java

+13 −5
Original line number Diff line number Diff line
@@ -10676,13 +10676,21 @@ public final class Settings { 
                = "wifi_on_when_proxy_disconnected";



        /**

         * Whether or not to enable Time Only Mode for watch type devices.

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

         * Default: 0

         * Time Only Mode specific settings.

         * This is encoded as a key=value list, separated by commas. Ex: "foo=1,bar=true"

         *

         * The following keys are supported:

         *

         * <pre>

         * enabled                  (boolean)

         * disable_tilt_to_wake     (boolean)

         * disable_touch_to_wake    (boolean)

         * </pre>

         * Type: string

         * @hide

         */

        public static final String TIME_ONLY_MODE_ENABLED

                = "time_only_mode_enabled";

        public static final String TIME_ONLY_MODE_CONSTANTS

                = "time_only_mode_constants";



        /**

         * Whether or not Network Watchlist feature is enabled.

core/proto/android/providers/settings.proto

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ message GlobalSettingsProto { 
    optional SettingProto off_body_radios_off_for_small_battery_enabled = 271 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto off_body_radios_off_delay_ms = 272 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto wifi_on_when_proxy_disconnected = 273 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto time_only_mode_enabled = 274 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto time_only_mode_constants = 274 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto network_watchlist_enabled = 275 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto keep_profile_in_background = 276 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto window_animation_scale = 277 [ (android.privacy).dest = DEST_AUTOMATIC ];

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

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ public class SettingsBackupTest { 
                    Settings.Global.TETHER_SUPPORTED,

                    Settings.Global.TEXT_CLASSIFIER_CONSTANTS,

                    Settings.Global.THEATER_MODE_ON,

                    Settings.Global.TIME_ONLY_MODE_ENABLED,

                    Settings.Global.TIME_ONLY_MODE_CONSTANTS,

                    Settings.Global.TRANSITION_ANIMATION_SCALE,

                    Settings.Global.TRUSTED_SOUND,

                    Settings.Global.TZINFO_UPDATE_CONTENT_URL,

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

+2 −2
Original line number Diff line number Diff line
@@ -914,8 +914,8 @@ class SettingsProtoDumpUtil { 
                Settings.Global.WIFI_ON_WHEN_PROXY_DISCONNECTED,

                GlobalSettingsProto.WIFI_ON_WHEN_PROXY_DISCONNECTED);

        dumpSetting(s, p,

                Settings.Global.TIME_ONLY_MODE_ENABLED,

                GlobalSettingsProto.TIME_ONLY_MODE_ENABLED);

                Settings.Global.TIME_ONLY_MODE_CONSTANTS,

                GlobalSettingsProto.TIME_ONLY_MODE_CONSTANTS);

        dumpSetting(s, p,

                Settings.Global.NETWORK_WATCHLIST_ENABLED,

                GlobalSettingsProto.NETWORK_WATCHLIST_ENABLED);