Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5b61bea7: Merge change 24581 into eclair

Browse Source 
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp

* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
  Dialog titles would sometimes use a font too large.
This commit is contained in:
Romain Guy
2009-09-10 14:30:48 -07:00
committed by Android Git Automerger
parent 62e5480a70 5b61bea7ab
commit e1d85dca89
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/DialogTitle.java
View File

@@ -58,14 +58,15 @@ public class DialogTitle extends TextView {
android.R.style.TextAppearance_Medium, android.R.style.TextAppearance_Medium,
android.R.styleable.TextAppearance); android.R.styleable.TextAppearance);
final int textSize = a.getDimensionPixelSize( 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); setMaxLines(2);
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
} }
} }
} }
}
}