Holo fixes and refinements

* Fix Holo.Light dialog text color for system-created dialogs
* Use the correct text anchor assets for selection mode
* Temp fix for small holo light button metrics

Change-Id: I974528418b69354961ea43abf8249c8caada8e17

1 files changed, 2 insertions, 6 deletions

diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index 0a40a986f87c..dc87aeb6353f 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -277,7 +277,6 @@ public class AlertDialog extends Dialog implements DialogInterface {
     public static class Builder {
         private final AlertController.AlertParams P;
         private int mTheme;
-        private Context mWrappedContext;
         
         /**
          * Constructor using a context for this builder and the {@link AlertDialog} it creates.
@@ -291,7 +290,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
          * the {@link AlertDialog} it creates.
          */
         public Builder(Context context, int theme) {
-            P = new AlertController.AlertParams(context);
+            P = new AlertController.AlertParams(new ContextThemeWrapper(context, theme));
             mTheme = theme;
         }
         
@@ -304,10 +303,7 @@ public class AlertDialog extends Dialog implements DialogInterface {
          * @return A Context for built Dialogs.
          */
         public Context getContext() {
-            if (mWrappedContext == null) {
-                mWrappedContext = new ContextThemeWrapper(P.mContext, mTheme);
-            }
-            return mWrappedContext;
+            return P.mContext;
         }
 
         /**