From b9ead4a91599ca63e947f74f83b67a58bda64a82 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 14 Jan 2015 10:43:31 -0800
Subject: 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
---
 core/java/android/view/ContextThemeWrapper.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'core/java/android/view/ContextThemeWrapper.java')

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);
     }
 
-- 
cgit v1.2.3