summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorquddusc <quddusc@google.com>2013-12-26 15:33:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-26 15:33:47 -0800
commitb889885e9b5a605329ff8d7a35c373c88abf8c35 (patch)
treef801dc0c7db06349d0239f565440474b466aa8a5 /core
parent5938b9a00e0133ca093755568c9a8a2e202f7daf (diff)
parent34dbf7c32327dc61a106b9a2f50e22cdb6cf6242 (diff)
downloadframeworks_base-b889885e9b5a605329ff8d7a35c373c88abf8c35.zip
frameworks_base-b889885e9b5a605329ff8d7a35c373c88abf8c35.tar.gz
frameworks_base-b889885e9b5a605329ff8d7a35c373c88abf8c35.tar.bz2
am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242': docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/AbsListView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 092f474..1899a1d 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -723,7 +723,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
*
* @param view The view whose scroll state is being reported
*
- * @param scrollState The current scroll state. One of {@link #SCROLL_STATE_IDLE},
+ * @param scrollState The current scroll state. One of
* {@link #SCROLL_STATE_TOUCH_SCROLL} or {@link #SCROLL_STATE_IDLE}.
*/
public void onScrollStateChanged(AbsListView view, int scrollState);