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

core/java/android/view/View.java

+2 −2

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