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

Commit fa0dc1dd authored by Vania Desmonda's avatar Vania Desmonda Committed by Automerger Merge Worker
Browse files

Merge "Add UI_NIGHT_MODE_CUSTOM_TYPE to SecureSettings backup." into tm-dev am: b7f5e21e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988244

Change-Id: Ib7f02b334c802312bcaf084d022b4efa8d84ebef
parents 95aeb1a3 b7f5e21e

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

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ public class SecureSettings { 
        Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS,

        Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK,

        Settings.Secure.UI_NIGHT_MODE,

        Settings.Secure.UI_NIGHT_MODE_CUSTOM_TYPE,

        Settings.Secure.DARK_THEME_CUSTOM_START_TIME,

        Settings.Secure.DARK_THEME_CUSTOM_END_TIME,

        Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST,

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

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ public class SecureSettingsValidators { 
        VALIDATORS.put(Secure.ODI_CAPTIONS_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.UI_NIGHT_MODE, NON_NEGATIVE_INTEGER_VALIDATOR);

        VALIDATORS.put(Secure.UI_NIGHT_MODE_CUSTOM_TYPE, 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);