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

Commit 8f9bb97f authored by Tyler Freeman's avatar Tyler Freeman Committed by Android (Google) Code Review
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
parents 40ab33b3 4c319d07

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()));

    }