Merge "Minor JavaDoc grammar fix" am: 86e1a45b56 am: fa264ae28b

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

Change-Id: I5a287935671d76449f6f754272cf9243378bc2ab
This commit is contained in:
Siyamed Sinir
2022-01-31 16:40:25 +00:00
committed by Automerger Merge Worker

View File

@@ -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.