diff options
| author | Siyamed Sinir <siyamed@google.com> | 2022-01-31 16:40:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-31 16:40:25 +0000 |
| commit | f1cbfa73ab7e7f34fa314ab6fd911fcace1a3430 (patch) | |
| tree | e593f8fe93b71ec68ba8259d29d6e3df39458917 /core/java/android/widget/TextView.java | |
| parent | 57ce3e2203c5169a09c90d7b32ba4f63a15e5def (diff) | |
| parent | fa264ae28b706b72d00d46f3a7e2db39e0eba5ad (diff) | |
Merge "Minor JavaDoc grammar fix" am: 86e1a45b56 am: fa264ae28b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964582
Change-Id: I5a287935671d76449f6f754272cf9243378bc2ab
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -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. |