diff options
| author | Joshua Baxter <jbax@google.com> | 2019-11-08 15:18:53 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-08 15:18:53 -0800 |
| commit | b2a8b29d10e669402db2979b27acfddb8bd5602a (patch) | |
| tree | b6d6d26dc2e767e793f7d9330ca09bd7a50c6320 | |
| parent | fead6f705d5590989c6ae215cf4011d157af142e (diff) | |
| parent | 2c7d94c7edf41f49b433d023a9d2efa6d71f54d7 (diff) | |
| download | base-b2a8b29d10e669402db2979b27acfddb8bd5602a.tar.gz | |
Merge "docs: remove incorrect (default) identifiers" into qt-dev
am: 2c7d94c7ed
Change-Id: I3b86d60b47443b7b3d50deccc81048b78c0e1dc7
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 711da00baf34..ee76633998cb 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -26380,7 +26380,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Returns the over-scroll mode for this view. The result will be - * one of {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} + * one of {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} * (allow over-scrolling only if the view content is larger than the container), * or {@link #OVER_SCROLL_NEVER}. * @@ -26397,7 +26397,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Set the over-scroll mode for this view. Valid over-scroll modes are - * {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} + * {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} * (allow over-scrolling only if the view content is larger than the container), * or {@link #OVER_SCROLL_NEVER}. * |