Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: remove incorrect (default) identifiers" into qt-dev

Browse Source
This commit is contained in:
Joshua Baxter
2019-11-08 22:55:18 +00:00
committed by Android (Google) Code Review
parent 13be3108cb 5411869170
commit 2c7d94c7ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -25857,7 +25857,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/** /**
* Returns the over-scroll mode for this view. The result will be * 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), * (allow over-scrolling only if the view content is larger than the container),
* or {@link #OVER_SCROLL_NEVER}. * or {@link #OVER_SCROLL_NEVER}.
* *
@@ -25874,7 +25874,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/** /**
* Set the over-scroll mode for this view. Valid over-scroll modes are * 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), * (allow over-scrolling only if the view content is larger than the container),
* or {@link #OVER_SCROLL_NEVER}. * or {@link #OVER_SCROLL_NEVER}.
* *