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

Commit 839286c5 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

ResourcesManager: Fix theme insertion at boot 

This was lost during the 4.4 ActivityThread reshuffle, put it back

Change-Id: I96eadf691973e9a2daa099b55816fc103d129be7
parent fb4a9a36

core/java/android/app/ResourcesManager.java

+13 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ public class ResourcesManager { 
        //}



        AssetManager assets = new AssetManager();

        assets.setThemeSupport(compatInfo.isThemeable);

        if (assets.addAssetPath(resDir) == 0) {

            return null;

        }
@@ -209,6 +210,18 @@ public class ResourcesManager { 
        } else {

            config = getConfiguration();

        }



        /* Attach theme information to the resulting AssetManager when appropriate. */

        if (compatInfo.isThemeable && config != null) {

            if (config.customTheme == null) {

                config.customTheme = CustomTheme.getBootTheme();

            }



            if (!TextUtils.isEmpty(config.customTheme.getThemePackageName())) {

                attachThemeAssets(assets, config.customTheme);

            }

        }



        r = new Resources(assets, dm, config, compatInfo, token);

        if (false) {

            Slog.i(TAG, "Created app resources " + resDir + " " + r + ": "