summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorJosh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>2009-03-17 15:35:44 -0700
committerJosh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>2009-07-29 19:43:03 -0700
commitb79229718c4d15f0181fec5ee8cb09eb9a2bab2f (patch)
tree37f11389d8d63a80662a5daf50cf63fe2bcdb8aa /core/java/android/app
parent47d87bdd88e54d619990d73342372614e0794647 (diff)
downloadframeworks_base-b79229718c4d15f0181fec5ee8cb09eb9a2bab2f.zip
frameworks_base-b79229718c4d15f0181fec5ee8cb09eb9a2bab2f.tar.gz
frameworks_base-b79229718c4d15f0181fec5ee8cb09eb9a2bab2f.tar.bz2
Allow a system theme to be supplied to setStyledTheme
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/ApplicationContext.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/app/ApplicationContext.java b/core/java/android/app/ApplicationContext.java
index 4ed52fa..59c63af 100644
--- a/core/java/android/app/ApplicationContext.java
+++ b/core/java/android/app/ApplicationContext.java
@@ -310,13 +310,17 @@ class ApplicationContext extends Context {
private void intializeStyledTheme(CustomTheme customTheme){
try {
if(customTheme != null) {
- int mStyledThemeResource = customTheme.getThemeId();
+ int themeResource = customTheme.getThemeId();
String packageName = customTheme.getThemePackageName();
+ Context context;
if(packageName != null){
- Context context = this.createPackageContext(packageName, 0);
- mStyledTheme = context.getTheme();
- mStyledTheme.applyStyle(mStyledThemeResource, true);
+ context = createPackageContext(packageName, 0);
+ } else {
+ context = this;
}
+
+ mStyledTheme = context.getTheme();
+ mStyledTheme.applyStyle(themeResource, true);
}
} catch (PackageManager.NameNotFoundException pne) {