commit 4c319d07749f8b71eeb2c0a94658a0e4a4512b10
author Tyler Freeman <fuego@google.com> Thu Mar 30 19:12:39 2023 +0000
committer Tyler Freeman <fuego@google.com> Thu Mar 30 22:16:58 2023 +0000
tree 411e0a081c7b56734d0f6896729b60d7e0502e59
parent d154307db942e024c8457a4f5e0a433bcb6d223e

fix(non linear font scaling)!: add ComplexDimensionUnit annotation to setLineHeight()

Bug: 273326061
Test: n/a
Change-Id: I28e489d4814a60507d43affa3517cf5a15d28ec0

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index d56a06f..67c9f8c 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6232,7 +6232,10 @@
      * @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()));
     }