From 4c319d07749f8b71eeb2c0a94658a0e4a4512b10 Mon Sep 17 00:00:00 2001
From: Tyler Freeman <fuego@google.com>
Date: Thu, 30 Mar 2023 19:12:39 +0000
Subject: [PATCH] fix(non linear font scaling)!: add ComplexDimensionUnit
 annotation to setLineHeight()

Bug: 273326061
Test: n/a
Change-Id: I28e489d4814a60507d43affa3517cf5a15d28ec0
---
 core/java/android/widget/TextView.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index d56a06fbd1273..67c9f8ca00489 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -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()));
     }