Always create a package-specific context in the PhoneWindowManager.

This is necessary to support dynamic theming.

1 files changed, 7 insertions, 9 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 43936a4..02eadc7 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -866,16 +866,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             boolean setTheme = false;
             //Log.i(TAG, "addStartingWindow " + packageName + ": nonLocalizedLabel="
             //        + nonLocalizedLabel + " theme=" + Integer.toHexString(theme));
-            if (theme != 0 || labelRes != 0) {
-                try {
-                    context = context.createPackageContext(packageName, 0);
-                    if (theme != 0) {
-                        context.setTheme(theme);
-                        setTheme = true;
-                    }
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Ignore
+            try {
+                context = context.createPackageContext(packageName, 0);
+                if (theme != 0) {
+                    context.setTheme(theme);
+                    setTheme = true;
                 }
+            } catch (PackageManager.NameNotFoundException e) {
+                // Ignore
             }
             if (!setTheme) {
                 context.setTheme(com.android.internal.R.style.Theme);