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

Commit 5f5a0bf0 authored by Michael Kwan's avatar Michael Kwan
Browse files

Modify time only mode flag into set of values instead of just one. 

The time only mode flag has not been used yet, so the change should
be low impact.

Bug: 38259902
Test: m -j32
Change-Id: Ie01870633dbaaf51989a148f105a995f58f0da4e
parent 3912a7f5

core/java/android/provider/Settings.java

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

                = "wifi_on_when_proxy_disconnected";





        /**

        /**

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

         * Time Only Mode specific settings.

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

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

         * Default: 0

         *

         * The following keys are supported:

         *

         * <pre>

         * enabled                  (boolean)

         * disable_tilt_to_wake     (boolean)

         * disable_touch_to_wake    (boolean)

         * </pre>

         * Type: string

         * @hide

         * @hide

         */

         */

        public static final String TIME_ONLY_MODE_ENABLED

        public static final String TIME_ONLY_MODE_CONSTANTS

                = "time_only_mode_enabled";

                = "time_only_mode_constants";





        /**

        /**

         * Whether or not Network Watchlist feature is enabled.

         * Whether or not Network Watchlist feature is enabled.

core/proto/android/providers/settings.proto

+1 −1
Original line number Original line 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_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 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 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 network_watchlist_enabled = 275 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto keep_profile_in_background = 276 [ (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 ];

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

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

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

                    Settings.Global.TETHER_SUPPORTED,

                    Settings.Global.TEXT_CLASSIFIER_CONSTANTS,

                    Settings.Global.TEXT_CLASSIFIER_CONSTANTS,

                    Settings.Global.THEATER_MODE_ON,

                    Settings.Global.THEATER_MODE_ON,

                    Settings.Global.TIME_ONLY_MODE_ENABLED,

                    Settings.Global.TIME_ONLY_MODE_CONSTANTS,

                    Settings.Global.TRANSITION_ANIMATION_SCALE,

                    Settings.Global.TRANSITION_ANIMATION_SCALE,

                    Settings.Global.TRUSTED_SOUND,

                    Settings.Global.TRUSTED_SOUND,

                    Settings.Global.TZINFO_UPDATE_CONTENT_URL,

                    Settings.Global.TZINFO_UPDATE_CONTENT_URL,

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

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

                Settings.Global.WIFI_ON_WHEN_PROXY_DISCONNECTED,

                GlobalSettingsProto.WIFI_ON_WHEN_PROXY_DISCONNECTED);

                GlobalSettingsProto.WIFI_ON_WHEN_PROXY_DISCONNECTED);

        dumpSetting(s, p,

        dumpSetting(s, p,

                Settings.Global.TIME_ONLY_MODE_ENABLED,

                Settings.Global.TIME_ONLY_MODE_CONSTANTS,

                GlobalSettingsProto.TIME_ONLY_MODE_ENABLED);

                GlobalSettingsProto.TIME_ONLY_MODE_CONSTANTS);

        dumpSetting(s, p,

        dumpSetting(s, p,

                Settings.Global.NETWORK_WATCHLIST_ENABLED,

                Settings.Global.NETWORK_WATCHLIST_ENABLED,

                GlobalSettingsProto.NETWORK_WATCHLIST_ENABLED);

                GlobalSettingsProto.NETWORK_WATCHLIST_ENABLED);