diff options
| author | 2022-01-31 16:56:12 +0000 | |
|---|---|---|
| committer | 2022-01-31 16:56:12 +0000 | |
| commit | 9a191546d16431fef850e852f95b68ac85590c21 (patch) | |
| tree | 77469902eb693a271e02c8800e12fa2f02257b47 | |
| parent | 98d1aae6e025c1c8c2f8ef28c1824e689281b1f9 (diff) | |
| parent | f1cbfa73ab7e7f34fa314ab6fd911fcace1a3430 (diff) | |
Merge "Minor JavaDoc grammar fix" am: 86e1a45b56 am: fa264ae28b am: f1cbfa73ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964582
Change-Id: Ic147bc3d061f0906be7a74705414fe60c9aca0b9
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index f5c1bcf2de42..452dad3b79db 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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. |