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

Commit f1cbfa73 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Automerger Merge Worker
Browse files

Merge "Minor JavaDoc grammar fix" am: 86e1a45b am: fa264ae2 

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

Change-Id: I5a287935671d76449f6f754272cf9243378bc2ab
parents 57ce3e22 fa264ae2

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -4347,7 +4347,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * pixel" units.  This size is adjusted based on the current density and

     * user font size preference.

     *

     * <p>Note: if this TextView has the auto-size feature enabled than this function is no-op.

     * <p>Note: if this TextView has the auto-size feature enabled, then this function is no-op.

     *

     * @param size The scaled pixel size.

     *
@@ -4362,7 +4362,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * Set the default text size to a given unit and value. See {@link

     * TypedValue} for the possible dimension units.

     *

     * <p>Note: if this TextView has the auto-size feature enabled than this function is no-op.

     * <p>Note: if this TextView has the auto-size feature enabled, then this function is no-op.

     *

     * @param unit The desired dimension unit.

     * @param size The desired size in the given units.