summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joshua Baxter <jbax@google.com> 2019-11-08 22:55:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-11-08 22:55:18 +0000
commit2c7d94c7edf41f49b433d023a9d2efa6d71f54d7 (patch)
tree2df1c789b56a5893545ab85641bef329f23d3572
parent13be3108cbb4cf8fb5aa70364eea50f4a6a2afdd (diff)
parent5411869170638e6809d6d85dbb6d15145da2edd6 (diff)
Merge "docs: remove incorrect (default) identifiers" into qt-dev
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 3742fb5bacae..d85a58476cf9 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -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}.
*