Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14b875b0 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 6de0ee41: am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in... 

am 6de0ee41: am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev

* commit '6de0ee41':
  Fix font scaling issues in FastScroller and SubtitleView
parents 43c0dd7f 6de0ee41

core/java/android/widget/FastScroller.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

core/java/com/android/internal/widget/SubtitleView.java

+9 −6
Original line number Diff line number Diff line
@@ -116,10 +116,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();
@@ -172,9 +172,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);