diff options
| author | Joshua Baxter <jbax@google.com> | 2019-11-08 15:26:57 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-08 15:26:57 -0800 |
| commit | 311218304a4c7ce8f695d84a7a5a56f81782c687 (patch) | |
| tree | 06d95f84c10d6fc1657caa419117404652b04414 | |
| parent | f7f67adcbae3e73e00a2230523050825c6c9cdc3 (diff) | |
| parent | b2a8b29d10e669402db2979b27acfddb8bd5602a (diff) | |
| download | base-311218304a4c7ce8f695d84a7a5a56f81782c687.tar.gz | |
Merge "docs: remove incorrect (default) identifiers" into qt-dev am: 2c7d94c7ed
am: b2a8b29d10
Change-Id: Ie1d730b2777f85cd2a2d601576aeedd5e3728620
| -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 eed8201d2418..ce3f403c230d 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -26391,7 +26391,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}. * @@ -26408,7 +26408,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}. * |