Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No longer needed."

Browse Source
This commit is contained in:
Dianne Hackborn
2011-01-04 22:45:44 -08:00
committed by Android (Google) Code Review
parent 842e55726a b35cd54b88
commit a01ac783c2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/pm/PackageParser.java
View File

@@ -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);

6
core/java/android/view/ContextThemeWrapper.java
View File

@@ -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();