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

Commit b25e9c75 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Add Setting.Secure for theme customization.

Change-Id: I71e6fb7182d2f743452ca9f230c1794fac09f61a
Fixes: 122302585
Test: make
parent cc7aacc4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5636,6 +5636,7 @@ package android.provider {
    field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";
    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
    field public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count";
    field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages";
    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";
    field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa
    field public static final int USER_SETUP_PERSONALIZATION_NOT_STARTED = 0; // 0x0
+17 −0
Original line number Diff line number Diff line
@@ -8421,6 +8421,20 @@ public final class Settings {
        public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS =
                "location_access_check_delay_millis";
        /**
         * Comma separated list of enabled overlay packages for all android.theme.customization.*
         * categories. If there is no corresponding package included for a category, then all
         * overlay packages in that category must be disabled.
         * @hide
         */
        @SystemApi
        public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES =
                "theme_customization_overlay_packages";
        private static final Validator THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR =
                new SettingsValidators.PackageNameListValidator(",");
        /**
         * This are the settings to be backed up.
         *
@@ -8544,6 +8558,7 @@ public final class Settings {
            LOCK_SCREEN_WHEN_TRUST_LOST,
            SKIP_GESTURE,
            SILENCE_GESTURE,
            THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
        };
        /**
@@ -8714,6 +8729,8 @@ public final class Settings {
            VALIDATORS.put(LOCK_SCREEN_WHEN_TRUST_LOST, LOCK_SCREEN_WHEN_TRUST_LOST_VALIDATOR);
            VALIDATORS.put(SKIP_GESTURE, SKIP_GESTURE_VALIDATOR);
            VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR);
            VALIDATORS.put(THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
                    THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR);
        }
        /**
+2 −1
Original line number Diff line number Diff line
@@ -528,8 +528,9 @@ message SecureSettingsProto {

    optional SettingProto skip_gesture_enabled = 74 [ (android.privacy).dest = DEST_AUTOMATIC ];
    optional SettingProto silence_gesture_enabled = 75 [ (android.privacy).dest = DEST_AUTOMATIC ];
    optional SettingProto theme_customization_overlay_packages = 76 [ (android.privacy).dest = DEST_AUTOMATIC ];

    // Please insert fields in alphabetical order and group them into messages
    // if possible (to avoid reaching the method limit).
    // Next tag = 76;
    // Next tag = 77;
}
+4 −0
Original line number Diff line number Diff line
@@ -2377,6 +2377,10 @@ class SettingsProtoDumpUtil {
                Settings.Secure.SILENCE_GESTURE,
                SecureSettingsProto.SILENCE_GESTURE_ENABLED);

        dumpSetting(s, p,
                Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
                SecureSettingsProto.THEME_CUSTOMIZATION_OVERLAY_PACKAGES);

        // Please insert new settings using the same order as in SecureSettingsProto.
        p.end(token);