diff options
| author | Siyamed Sinir <siyamed@google.com> | 2022-01-31 17:14:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-31 17:14:27 +0000 |
| commit | 6cac243d33d221c88b448e500667fb6ef21187fc (patch) | |
| tree | 11ffcad07508b712d317f63cc0978097de0f1319 /core/java/android/widget/TextView.java | |
| parent | a0280632840e2ae9acefd17fe2e35b7d344b3082 (diff) | |
| parent | 9a191546d16431fef850e852f95b68ac85590c21 (diff) | |
Merge "Minor JavaDoc grammar fix" am: 86e1a45b56 am: fa264ae28b am: f1cbfa73ab am: 9a191546d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964582
Change-Id: If44741849325764b37143eaa1016e201aab8a51f
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 41c540116928..7c939aca09cf 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4461,7 +4461,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. * @@ -4476,7 +4476,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. |