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

Commit 6322ecea authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'themes-2.3.1_r1' of... 

Merge branch 'themes-2.3.1_r1' of https://github.com/tmobile/themes-platform-frameworks-base into HEAD
parents 12b44003 be0f217f

core/java/android/content/pm/PackageParser.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -1124,7 +1124,6 @@ public class PackageParser { 
            } else if (tagName.equals("theme")) {

            } else if (tagName.equals("theme")) {

                // this is a theme apk.

                // this is a theme apk.

                pkg.mIsThemeApk = true;

                pkg.mIsThemeApk = true;

                pkg.applicationInfo.isThemeable = false;

                pkg.mThemeInfos.add(new ThemeInfo(parser, res, attrs));

                pkg.mThemeInfos.add(new ThemeInfo(parser, res, attrs));

            } else if (RIGID_PARSER) {

            } else if (RIGID_PARSER) {

                outError[0] = "Bad element under <manifest>: "

                outError[0] = "Bad element under <manifest>: "
@@ -1198,6 +1197,9 @@ public class PackageParser { 
                        >= android.os.Build.VERSION_CODES.DONUT)) {

                        >= android.os.Build.VERSION_CODES.DONUT)) {

            pkg.applicationInfo.flags |= ApplicationInfo.FLAG_SUPPORTS_SCREEN_DENSITIES;

            pkg.applicationInfo.flags |= ApplicationInfo.FLAG_SUPPORTS_SCREEN_DENSITIES;

        }

        }

        if (pkg.mIsThemeApk) {

            pkg.applicationInfo.isThemeable = false;

        }





        return pkg;

        return pkg;

    }

    }