diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-04 11:44:51 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2013-10-04 11:44:51 -0700 |
| commit | 7b63063625467baff1db048e84c5781408a5c86d (patch) | |
| tree | 632f8ec53da82ca0d220ba5d7c8e338893f619fd /core/java/com | |
| parent | fb45a2e9cde403c4bb7ac62195795bcfad4b8da6 (diff) | |
| download | frameworks_base-7b63063625467baff1db048e84c5781408a5c86d.zip frameworks_base-7b63063625467baff1db048e84c5781408a5c86d.tar.gz frameworks_base-7b63063625467baff1db048e84c5781408a5c86d.tar.bz2 | |
Fix font scaling issues in FastScroller and SubtitleView
BUG: 11080227
Change-Id: I0aa84e9b56c6900ad47efd45a5a0f772ce43f810
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/SubtitleView.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/java/com/android/internal/widget/SubtitleView.java b/core/java/com/android/internal/widget/SubtitleView.java index e30c1ff..ccedf63 100644 --- a/core/java/com/android/internal/widget/SubtitleView.java +++ b/core/java/com/android/internal/widget/SubtitleView.java @@ -113,10 +113,10 @@ public class SubtitleView extends View { // TODO: Move these to a default style. final Resources res = getContext().getResources(); final DisplayMetrics m = res.getDisplayMetrics(); - mCornerRadius = res.getDimension(com.android.internal.R.dimen.subtitle_corner_radius); - mOutlineWidth = res.getDimension(com.android.internal.R.dimen.subtitle_outline_width); - mShadowRadius = res.getDimension(com.android.internal.R.dimen.subtitle_shadow_radius); - mShadowOffsetX = res.getDimension(com.android.internal.R.dimen.subtitle_shadow_offset); + mCornerRadius = res.getDimensionPixelSize(com.android.internal.R.dimen.subtitle_corner_radius); + mOutlineWidth = res.getDimensionPixelSize(com.android.internal.R.dimen.subtitle_outline_width); + mShadowRadius = res.getDimensionPixelSize(com.android.internal.R.dimen.subtitle_shadow_radius); + mShadowOffsetX = res.getDimensionPixelSize(com.android.internal.R.dimen.subtitle_shadow_offset); mShadowOffsetY = mShadowOffsetX; mTextPaint = new TextPaint(); @@ -169,9 +169,12 @@ public class SubtitleView extends View { invalidate(); } + /** + * Sets the text size in pixels. + * + * @param size the text size in pixels + */ public void setTextSize(float size) { - final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); - final float pixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, size, metrics); if (mTextPaint.getTextSize() != size) { mTextPaint.setTextSize(size); mInnerPaddingX = (int) (size * INNER_PADDING_RATIO + 0.5f); |