summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorLais Andrade <lsandrade@google.com>2020-08-05 13:05:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-05 13:05:19 +0000
commit0e81d7ec8eaacab4cdea7daa6d5029f6e41d8000 (patch)
treee2320cd42188f4335fbceef2a34e2b000330a957 /core/java
parentf502f83e24307992b94a70c1869ae5be2599c1a0 (diff)
parent388881b89a4696e521b5f5198822defb06b5758d (diff)
Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 am: 655eb212ec am: 388881b89a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078 Change-Id: Iad15300f86c480874afc71a291eb698a70c9fd52
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 6837b7adc86d..154c287049b8 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -23231,7 +23231,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* displaying, else return the result of calling through to the
* super class.
*
- * @return boolean If true than the Drawable is being displayed in the
+ * @return boolean If true then the Drawable is being displayed in the
* view; else false and it is not allowed to animate.
*
* @see #unscheduleDrawable(android.graphics.drawable.Drawable)