Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a8b29d authored by Joshua Baxter's avatar Joshua Baxter Committed by android-build-merger
Browse files

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

am: 2c7d94c7

Change-Id: I3b86d60b47443b7b3d50deccc81048b78c0e1dc7
parents fead6f70 2c7d94c7

core/java/android/view/View.java

+2 −2
Original line number Diff line number Diff line
@@ -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}.















     *