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

Commit df6bdb5b authored by Jay Aliomer's avatar Jay Aliomer
Browse files

Migrate dark theme settings 

When restoring settings from a different phone,
UiModeManager did not update the new settings.
Now, the settings are loaded from local storage and changes applied
when the SettingsHelper restores a value of interest

Bug: 138671559
Test: manual test: reset phone1, setup, used data transfer tool to restore from phone2, check dark mode is the same as phone 2
Change-Id: I861bec342b3284e0f398c8610fcc6881c27601a5
parent d3c7f0c2

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

+2 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ public class SecureSettings { 
        Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL,

        Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK,

        Settings.Secure.UI_NIGHT_MODE,

        Settings.Secure.DARK_THEME_CUSTOM_START_TIME,

        Settings.Secure.DARK_THEME_CUSTOM_END_TIME,

        Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST,

        Settings.Secure.SKIP_DIRECTION,

        Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,

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

+4 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.provider.settings.validators.SettingsValidators.LOCALE_VAL 
import static android.provider.settings.validators.SettingsValidators.NON_NEGATIVE_INTEGER_VALIDATOR;

import static android.provider.settings.validators.SettingsValidators.NULLABLE_COMPONENT_NAME_VALIDATOR;

import static android.provider.settings.validators.SettingsValidators.PACKAGE_NAME_VALIDATOR;

import static android.provider.settings.validators.SettingsValidators.NONE_NEGATIVE_LONG_VALIDATOR;

import static android.provider.settings.validators.SettingsValidators.TILE_LIST_VALIDATOR;

import static android.provider.settings.validators.SettingsValidators.TTS_LIST_VALIDATOR;
@@ -235,7 +236,9 @@ public class SecureSettingsValidators { 
        VALIDATORS.put(Secure.AWARE_TAP_PAUSE_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);

        VALIDATORS.put(Secure.ODI_CAPTIONS_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.UI_NIGHT_MODE, new InclusiveIntegerRangeValidator(0, 2));

        VALIDATORS.put(Secure.UI_NIGHT_MODE, NON_NEGATIVE_INTEGER_VALIDATOR);

        VALIDATORS.put(Secure.DARK_THEME_CUSTOM_START_TIME, NONE_NEGATIVE_LONG_VALIDATOR);

        VALIDATORS.put(Secure.DARK_THEME_CUSTOM_END_TIME, NONE_NEGATIVE_LONG_VALIDATOR);

        VALIDATORS.put(Secure.GLOBAL_ACTIONS_PANEL_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.AWARE_LOCK_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.DISPLAY_DENSITY_FORCED, NON_NEGATIVE_INTEGER_VALIDATOR);

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

+11 −0
Original line number Diff line number Diff line
@@ -207,4 +207,15 @@ public class SettingsValidators { 


    static final Validator ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR =

            new AccessibilityShortcutTargetListValidator();



    static final Validator NONE_NEGATIVE_LONG_VALIDATOR = new Validator() {

        @Override

        public boolean validate(String value) {

            try {

                return Long.parseLong(value) >= 0;

            } catch (NumberFormatException e) {

                return false;

            }

        }

    };

}

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

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ public class SettingsHelper { 
        sBroadcastOnRestore.add(Settings.Secure.ENABLED_VR_LISTENERS);

        sBroadcastOnRestore.add(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);

        sBroadcastOnRestore.add(Settings.Global.BLUETOOTH_ON);

        sBroadcastOnRestore.add(Settings.Secure.UI_NIGHT_MODE);

        sBroadcastOnRestore.add(Settings.Secure.DARK_THEME_CUSTOM_START_TIME);

        sBroadcastOnRestore.add(Settings.Secure.DARK_THEME_CUSTOM_END_TIME);

    }



    private interface SettingsLookup {

packages/SettingsProvider/test/src/android/provider/settings/validators/SettingsValidatorsTest.java

+21 −0
Original line number Diff line number Diff line
@@ -276,6 +276,27 @@ public class SettingsValidatorsTest { 
        assertFalse(SettingsValidators.TTS_LIST_VALIDATOR.validate(""));

    }



    @Test

    public void testPositiveLongValidator_zero() {

        assertTrue(SettingsValidators.NONE_NEGATIVE_LONG_VALIDATOR.validate("0"));

    }



    @Test

    public void testPositiveLongValidator_negative() {

        assertFalse(SettingsValidators.NONE_NEGATIVE_LONG_VALIDATOR.validate("-5"));

    }





    @Test

    public void testPositiveLongValidator_positive() {

        assertTrue(SettingsValidators.NONE_NEGATIVE_LONG_VALIDATOR.validate("5"));

    }



    @Test

    public void testPositiveLongValidator_floatFormat() {

        assertFalse(SettingsValidators.NONE_NEGATIVE_LONG_VALIDATOR.validate("4.4756"));

    }



    @Test

    public void testTTSListValidator_withNullInput_returnsFalse() {

        assertFalse(SettingsValidators.TTS_LIST_VALIDATOR.validate(null));