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

Commit 7f563260 authored by Clark Scheff's avatar Clark Scheff
Browse files

Remove DEFAULT_THEME_APPLIED_ON_FIRST_BOOT 

doApplyDefaultTheme should be able to apply the default theme, if
one exists, whenever applyDefaultTheme() is called.

Change-Id: Ia50b4089d122855a4ddde91a02eef33ed3f9eaf4
parent 02d36159

core/java/android/provider/Settings.java

+0 −7
Original line number Diff line number Diff line
@@ -5692,13 +5692,6 @@ public final class Settings { 
         */

        public static final String DEFAULT_THEME_COMPONENTS = "default_theme_components";



        /**

         * Whether the default theme was applied on the first boot.

         * @hide

         */

        public static final String DEFAULT_THEME_APPLIED_ON_FIRST_BOOT =

                "default_theme_applied_on_first_boot";



        /**

         * Performance profile

         * @see config_perf_profile_prop in frameworks/base/core/res/res/values/config.xml

services/java/com/android/server/ThemeService.java

+1 −6
Original line number Diff line number Diff line
@@ -233,10 +233,7 @@ public class ThemeService extends IThemeService.Stub { 
        final ContentResolver resolver = mContext.getContentResolver();

        final String defaultThemePkg = Settings.Secure.getString(resolver,

                Settings.Secure.DEFAULT_THEME_PACKAGE);

        final boolean shouldApply = !TextUtils.isEmpty(defaultThemePkg) &&

                Settings.Secure.getInt(resolver,

                        Settings.Secure.DEFAULT_THEME_APPLIED_ON_FIRST_BOOT, 0) == 0;

        if (shouldApply) {

        if (!TextUtils.isEmpty(defaultThemePkg)) {

            String defaultThemeComponents = Settings.Secure.getString(resolver,

                    Settings.Secure.DEFAULT_THEME_COMPONENTS);

            List<String> components;
@@ -257,8 +254,6 @@ public class ThemeService extends IThemeService.Stub { 
            }

            try {

                requestThemeChange(defaultThemePkg, components);

                Settings.Secure.putInt(resolver,

                        Settings.Secure.DEFAULT_THEME_APPLIED_ON_FIRST_BOOT, 1);

            } catch (RemoteException e) {

                Log.w(TAG, "Unable to set default theme", e);

            }