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

Commit 130cc520 authored by Tyler Freeman's avatar Tyler Freeman Committed by Automerger Merge Worker
Browse files

Merge "fix(non linear font scaling)!: add ComplexDimensionUnit annotation to... 

Merge "fix(non linear font scaling)!: add ComplexDimensionUnit annotation to setLineHeight()" into udc-dev am: 8f9bb97f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22362223



Change-Id: If9ecf34ae99957dc0e312500459711e8e1c31f13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ee0b63d 8f9bb97f

core/java/android/widget/TextView.java

+4 −1
Original line number Diff line number Diff line
@@ -6232,7 +6232,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * @attr ref android.R.styleable#TextView_lineHeight

     */

    @android.view.RemotableViewMethod

    public void setLineHeight(int unit, @FloatRange(from = 0) float lineHeight) {

    public void setLineHeight(

            @TypedValue.ComplexDimensionUnit int unit,

            @FloatRange(from = 0) float lineHeight

    ) {

        setLineHeightPx(

                TypedValue.applyDimension(unit, lineHeight, getDisplayMetricsOrSystem()));

    }