From 4bdf17c69712b28e82f15f81f39482ff096b7f67 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 10 Sep 2009 14:11:20 -0700 Subject: Dialog titles would sometimes use a font too large. This was due to code in DialogTitle.java which would multiply the textSize of the theme twice. Change-Id: Id44e39e729ebd43b08c967a67cde0d33dd8f2efb --- core/java/com/android/internal/widget/DialogTitle.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/java/com/android/internal/widget/DialogTitle.java') diff --git a/core/java/com/android/internal/widget/DialogTitle.java b/core/java/com/android/internal/widget/DialogTitle.java index 2eef0b6..125d2c5 100644 --- a/core/java/com/android/internal/widget/DialogTitle.java +++ b/core/java/com/android/internal/widget/DialogTitle.java @@ -58,14 +58,15 @@ public class DialogTitle extends TextView { android.R.style.TextAppearance_Medium, android.R.styleable.TextAppearance); final int textSize = a.getDimensionPixelSize( - android.R.styleable.TextAppearance_textSize, 20); + android.R.styleable.TextAppearance_textSize, + (int) (20 * getResources().getDisplayMetrics().density)); - setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize); + // textSize is already expressed in pixels + setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize); setMaxLines(2); super.onMeasure(widthMeasureSpec, heightMeasureSpec); } } } } - -} \ No newline at end of file +} -- cgit v1.1