summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-12-07 14:55:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 14:55:23 -0800
commite8a43b236754038b61a85eb294fdb03c18e82a00 (patch)
treee2e58b6d79b8ae05de1041a1f4732a955bc0f496
parent13169d855cfa4fb4b2e7bc7328e206fbf4836419 (diff)
parente300deaf2fd2842240ea90fd00296a6e2ceba9d8 (diff)
downloadframeworks_base-e8a43b236754038b61a85eb294fdb03c18e82a00.zip
frameworks_base-e8a43b236754038b61a85eb294fdb03c18e82a00.tar.gz
frameworks_base-e8a43b236754038b61a85eb294fdb03c18e82a00.tar.bz2
am e300deaf: am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8' * commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8': Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
-rw-r--r--core/java/android/widget/AbsListView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index e353501..92ff315 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2109,6 +2109,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
}
reportScrollStateChange(OnScrollListener.SCROLL_STATE_FLING);
mFlingRunnable.start(-initialVelocity);
+ } else {
+ mTouchMode = TOUCH_MODE_REST;
+ reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
}
}
} else {