Merge "docs: remove incorrect (default) identifiers" into qt-dev (2c7d94c7) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -25857,7 +25857,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}.
		*
		@@ -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
		* {@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}.
		*