summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lais Andrade <lsandrade@google.com> 2020-08-05 13:15:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-05 13:15:28 +0000
commit8fc8732db12e9d3fd76d783491730ca79b6de0e9 (patch)
tree37829e7272886a20f9845d77297b7b2b8a541197
parent5ab28aa810d8a19f029d28dcb867194a191af8ac (diff)
parent0e81d7ec8eaacab4cdea7daa6d5029f6e41d8000 (diff)
Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 am: 655eb212ec am: 388881b89a am: 0e81d7ec8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078 Change-Id: I3dc67195e436645fc62f875e8b9c3f03c565086b
-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 0818abeff923..89178217366f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -23358,7 +23358,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)