commit 8f9bb97f4b4a33f87d9a69e89fdaeddfe283e601
author Tyler Freeman <fuego@google.com> Fri Mar 31 04:23:04 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 04:23:04 2023 +0000
tree 0ede636ad51662d072df600c2648d91a5ac9f0c4
parent 40ab33b3779d67667086cc81c955482feae4e7a7
parent 4c319d07749f8b71eeb2c0a94658a0e4a4512b10

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

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