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

Commit a01ac783 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "No longer needed."

parents 842e5572 b35cd54b

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

+1 −7
Original line number Diff line number Diff line
@@ -1508,18 +1508,12 @@ public class PackageParser { 
            ai.nonLocalizedLabel = v.coerceToString();

        }



        int defaultTheme = 0;

        if (owner.applicationInfo.targetSdkVersion >= android.os.Build.VERSION_CODES.HONEYCOMB) {

            // As of honeycomb, the default application theme is holographic.

            defaultTheme = android.R.style.Theme_Holo;

        }



        ai.icon = sa.getResourceId(

                com.android.internal.R.styleable.AndroidManifestApplication_icon, 0);

        ai.logo = sa.getResourceId(

                com.android.internal.R.styleable.AndroidManifestApplication_logo, 0);

        ai.theme = sa.getResourceId(

                com.android.internal.R.styleable.AndroidManifestApplication_theme, defaultTheme);

                com.android.internal.R.styleable.AndroidManifestApplication_theme, 0);

        ai.descriptionRes = sa.getResourceId(

                com.android.internal.R.styleable.AndroidManifestApplication_description, 0);

core/java/android/view/ContextThemeWrapper.java

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view; 
import android.content.Context;

import android.content.ContextWrapper;

import android.content.res.Resources;

import android.os.Build;



/**

 * A ContextWrapper that allows you to modify the theme from what is in the
@@ -56,7 +57,10 @@ public class ContextThemeWrapper extends ContextWrapper { 
        }



        if (mThemeResource == 0) {

            mThemeResource = com.android.internal.R.style.Theme;

            mThemeResource = (getApplicationInfo().targetSdkVersion

                    >= Build.VERSION_CODES.HONEYCOMB)

                            ? com.android.internal.R.style.Theme_Holo

                            : com.android.internal.R.style.Theme;

        }

        initializeTheme();