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

Commit b04193af authored by d34d's avatar d34d Committed by Clark Scheff
Browse files

Themes: Fix theme package name being set to target's 

The themePackageName was being set to the target's base package
name instead of the theme's package name.

Change-Id: I8875409d3ee302ae7940cab6d82cb4265eab54e3
parent 19f12984

core/java/android/app/ResourcesManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -559,7 +559,7 @@ public class ResourcesManager { 
            return false;

            return false;

        }

        }





        String themePackageName = basePackageName;

        String themePackageName = piTheme.packageName;

        String themePath = piTheme.applicationInfo.publicSourceDir;

        String themePath = piTheme.applicationInfo.publicSourceDir;

        if (!piTarget.isThemeApk && piTheme.mOverlayTargets.contains(basePackageName)) {

        if (!piTarget.isThemeApk && piTheme.mOverlayTargets.contains(basePackageName)) {

            String targetPackagePath = piTarget.applicationInfo.sourceDir;

            String targetPackagePath = piTarget.applicationInfo.sourceDir;
@@ -572,7 +572,7 @@ public class ResourcesManager { 
                    targetPackagePath, prefixPath);

                    targetPackagePath, prefixPath);





            if (cookie != 0) {

            if (cookie != 0) {

                assets.setThemePackageName(basePackageName);

                assets.setThemePackageName(themePackageName);

                assets.addThemeCookie(cookie);

                assets.addThemeCookie(cookie);

            }

            }

        }

        }