diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-04 22:03:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-04 22:04:00 +0000 |
| commit | b89e969cef91cc20499d955fd49286fde4a401e7 (patch) | |
| tree | 6c2d8b5e9646c993804f621746203c55bc838b07 | |
| parent | 5b491d630b6628a3558cb1135ac1bc242eab3381 (diff) | |
| parent | 7b63063625467baff1db048e84c5781408a5c86d (diff) | |
| download | frameworks_base-b89e969cef91cc20499d955fd49286fde4a401e7.zip frameworks_base-b89e969cef91cc20499d955fd49286fde4a401e7.tar.gz frameworks_base-b89e969cef91cc20499d955fd49286fde4a401e7.tar.bz2 | |
Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev
| -rw-r--r-- | core/java/android/widget/FastScroller.java | 5 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/SubtitleView.java | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index e2f6d7d..a70bcdb 100644 --- a/core/java/android/widget/FastScroller.java +++ b/core/java/android/widget/FastScroller.java @@ -33,6 +33,7 @@ import android.text.TextUtils.TruncateAt; import android.util.IntProperty; import android.util.MathUtils; import android.util.Property; +import android.util.TypedValue; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; @@ -471,11 +472,11 @@ class FastScroller { final Resources res = context.getResources(); final int minSize = res.getDimensionPixelSize(R.dimen.fastscroll_overlay_size); final ColorStateList textColor = ta.getColorStateList(TEXT_COLOR); - final float textSize = res.getDimension(R.dimen.fastscroll_overlay_text_size); + final float textSize = res.getDimensionPixelSize(R.dimen.fastscroll_overlay_text_size); final TextView textView = new TextView(context); textView.setLayoutParams(params); textView.setTextColor(textColor); - textView.setTextSize(textSize); + textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize); textView.setSingleLine(true); textView.setEllipsize(TruncateAt.MIDDLE); textView.setGravity(Gravity.CENTER); 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); |