Keep original DialogTitle color when resizing.

Change-Id: Id9d3bf565cc5660ab37037e74be63221cd638ba6

1 files changed, 10 insertions, 12 deletions

diff --git a/core/java/com/android/internal/widget/DialogTitle.java b/core/java/com/android/internal/widget/DialogTitle.java
index cd165dc..b86c438 100644
--- a/core/java/com/android/internal/widget/DialogTitle.java
+++ b/core/java/com/android/internal/widget/DialogTitle.java
@@ -53,21 +53,19 @@ public class DialogTitle extends TextView {
                 final int ellipsisCount = layout.getEllipsisCount(lineCount - 1);
                 if (ellipsisCount > 0) {
                     setSingleLine(false);
-                    
-                    TypedArray a = mContext.obtainStyledAttributes(null,
-                            android.R.styleable.TextAppearance,
-                            android.R.attr.textAppearanceMedium,
+                    setMaxLines(2);
+
+                    final TypedArray a = mContext.obtainStyledAttributes(null,
+                            android.R.styleable.TextAppearance, android.R.attr.textAppearanceMedium,
                             android.R.style.TextAppearance_Medium);
                     final int textSize = a.getDimensionPixelSize(
-                            android.R.styleable.TextAppearance_textSize,
-                            (int) (20 * getResources().getDisplayMetrics().density));
-                    final int textColor = a.getColor(
-                            android.R.styleable.TextAppearance_textColor, 0xffffffff);
+                            android.R.styleable.TextAppearance_textSize, 0);
+                    if (textSize != 0) {
+                        // textSize is already expressed in pixels
+                        setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+                    }
+                    a.recycle();
 
-                    // textSize is already expressed in pixels
-                    setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
-                    setTextColor(textColor);
-                    setMaxLines(2);
                     super.onMeasure(widthMeasureSpec, heightMeasureSpec);      
                 }
             }