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

Commit caf93858 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 SUGGESTED_THEME_FEATURE_ENABLED" into main

parents 63f0d31b 4d087b5f
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -8737,6 +8737,19 @@ public final class Settings {
        public static final String PACK_THEME_FEATURE_ENABLED =
                "pack_theme_feature_enabled";
        /**
         * Setting to indicate that suggested themes feature should be enabled in related app.
         *
         * <ul>
         *   <li>0 = Off
         *   <li>1 = Enable suggested themes
         * </ul>
         *
         * @hide
         */
        public static final String SUGGESTED_THEME_FEATURE_ENABLED =
                "suggested_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
@@ -480,5 +480,6 @@ public class SecureSettingsValidators {
        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);
        VALIDATORS.put(Secure.SUGGESTED_THEME_FEATURE_ENABLED, BOOLEAN_VALIDATOR);
    }
}
+1 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ public class SettingsBackupTest {
                 Settings.Secure.V_TO_U_RESTORE_ALLOWLIST,
                 Settings.Secure.V_TO_U_RESTORE_DENYLIST,
                 Settings.Secure.PACK_THEME_FEATURE_ENABLED,
                 Settings.Secure.SUGGESTED_THEME_FEATURE_ENABLED,
                 Settings.Secure.REDACT_OTP_NOTIFICATION_WHILE_CONNECTED_TO_WIFI,
                 Settings.Secure.OTP_NOTIFICATION_REDACTION_LOCK_TIME);