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

Commit af8cc724 authored by Bob Yang's avatar Bob Yang Committed by Android (Google) Code Review
Browse files

Merge "Add new settings secure keys to store the PACK_THEME_FEATURE_ENABLED" into main

parents 41673d37 e0429157
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -8685,6 +8685,19 @@ public final class Settings {
        public static final String SEARCH_CONTENT_FILTERS_ENABLED =
                "search_content_filters_enabled";
        /**
         * Setting to indicate that themes should be enabled in related app.
         *
         * <ul>
         *   <li>0 = Off
         *   <li>1 = Enable themes
         * </ul>
         *
         * @hide
         */
        public static final String PACK_THEME_FEATURE_ENABLED =
                "pack_theme_feature_enabled";
        /**
         * Set by the system to track if the user needs to see the call to action for
         * the lockscreen notification policy.
+1 −0
Original line number Diff line number Diff line
@@ -478,5 +478,6 @@ public class SecureSettingsValidators {
        VALIDATORS.put(Secure.SPELL_CHECKER_ENABLED, BOOLEAN_VALIDATOR);
        VALIDATORS.put(Secure.SELECTED_SPELL_CHECKER, NULLABLE_COMPONENT_NAME_VALIDATOR);
        VALIDATORS.put(Secure.SELECTED_SPELL_CHECKER_SUBTYPE, ANY_INTEGER_VALIDATOR);
        VALIDATORS.put(Secure.PACK_THEME_FEATURE_ENABLED, BOOLEAN_VALIDATOR);
    }
}
+1 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ public class SettingsBackupTest {
                 Settings.Secure.NAVIGATION_MODE_RESTORE,
                 Settings.Secure.V_TO_U_RESTORE_ALLOWLIST,
                 Settings.Secure.V_TO_U_RESTORE_DENYLIST,
                 Settings.Secure.PACK_THEME_FEATURE_ENABLED,
                 Settings.Secure.REDACT_OTP_NOTIFICATION_WHILE_CONNECTED_TO_WIFI,
                 Settings.Secure.OTP_NOTIFICATION_REDACTION_LOCK_TIME);