diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-29 16:10:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-29 16:10:46 -0700 |
| commit | 84aaec86f5f0cc24a9bdd936597601eadf2247dd (patch) | |
| tree | ca96bf80f802e2c4c7447f9f365afe6833a9f4bb | |
| parent | 2308628a2059122f86168f5569274cbcca3ee93b (diff) | |
| parent | 170e548ac839b268beee208e95fc497b34fde1ba (diff) | |
| download | frameworks_base-84aaec86f5f0cc24a9bdd936597601eadf2247dd.zip frameworks_base-84aaec86f5f0cc24a9bdd936597601eadf2247dd.tar.gz frameworks_base-84aaec86f5f0cc24a9bdd936597601eadf2247dd.tar.bz2 | |
Merge "use the holo theme in more places for >= honeycomb apps"
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index a29acf1..5ce4cd6 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -265,7 +265,11 @@ class ContextImpl extends Context { public Resources.Theme getTheme() { if (mTheme == null) { if (mThemeResource == 0) { - mThemeResource = com.android.internal.R.style.Theme; + final Context outerContext = getOuterContext(); + mThemeResource = (outerContext.getApplicationInfo().targetSdkVersion + >= Build.VERSION_CODES.HONEYCOMB) + ? com.android.internal.R.style.Theme_Holo + : com.android.internal.R.style.Theme; } mTheme = mResources.newTheme(); mTheme.applyStyle(mThemeResource, true); |