summaryrefslogtreecommitdiff
path: root/core/java/android/view/ContextThemeWrapper.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-01-14 10:43:31 -0800
committerAlan Viverette <alanv@google.com>2015-01-14 10:43:31 -0800
commitb9ead4a91599ca63e947f74f83b67a58bda64a82 (patch)
treee402c3db4afcf539fce6c379782732aeed19069f /core/java/android/view/ContextThemeWrapper.java
parentdbf22ccd92dc95e7c93c0485be4bcfb5c966578a (diff)
Add popup theme for Spinner, use for actionBarPopupTheme default
Also adds methods for setting the context used to inflate drop-down views in several adapters. Bug: 17625714 Change-Id: Id267afa4901c1d46ceb3bc3b10fc642cea1799fe
Diffstat (limited to 'core/java/android/view/ContextThemeWrapper.java')
-rw-r--r--core/java/android/view/ContextThemeWrapper.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/core/java/android/view/ContextThemeWrapper.java b/core/java/android/view/ContextThemeWrapper.java
index 0afbde9ee14f..d9f60541f2d2 100644
--- a/core/java/android/view/ContextThemeWrapper.java
+++ b/core/java/android/view/ContextThemeWrapper.java
@@ -35,13 +35,19 @@ public class ContextThemeWrapper extends ContextWrapper {
public ContextThemeWrapper() {
super(null);
}
-
- public ContextThemeWrapper(Context base, int themeres) {
+
+ public ContextThemeWrapper(Context base, int themeResId) {
+ super(base);
+ mThemeResource = themeResId;
+ }
+
+ public ContextThemeWrapper(Context base, Resources.Theme theme) {
super(base);
- mThemeResource = themeres;
+ mTheme = theme;
}
- @Override protected void attachBaseContext(Context newBase) {
+ @Override
+ protected void attachBaseContext(Context newBase) {
super.attachBaseContext(newBase);
}