diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-01 14:42:56 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-05-01 14:42:56 -0700 |
| commit | 0810b63739c9981f993063749f804b54faed0ba5 (patch) | |
| tree | d623d1ff5d1562dd0095f250877b047fdcf40175 /core/java/android/view/ContextThemeWrapper.java | |
| parent | 61bc9f37cc0e0921d2e205dccdd45df36c353a9c (diff) | |
Load device default theme mapping from resources
Also adds a few missing styles and reorganizes some XML files. Makes
stackViewStyle public since it's defined in DeviceDefault.
Change-Id: I8f6a0f93410948b38619594474d60dc40ece5917
Diffstat (limited to 'core/java/android/view/ContextThemeWrapper.java')
| -rw-r--r-- | core/java/android/view/ContextThemeWrapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ContextThemeWrapper.java b/core/java/android/view/ContextThemeWrapper.java index 0afbde9ee14f..ba1c4b663269 100644 --- a/core/java/android/view/ContextThemeWrapper.java +++ b/core/java/android/view/ContextThemeWrapper.java @@ -96,7 +96,7 @@ public class ContextThemeWrapper extends ContextWrapper { return mTheme; } - mThemeResource = Resources.selectDefaultTheme(mThemeResource, + mThemeResource = getResources().selectDefaultTheme(mThemeResource, getApplicationInfo().targetSdkVersion); initializeTheme(); |