summaryrefslogtreecommitdiffstats
path: root/carousel/java
diff options
context:
space:
mode:
authorBryan Mawhinney <bryanmawhinney@google.com>2010-12-06 12:05:02 +0000
committerBryan Mawhinney <bryanmawhinney@google.com>2010-12-06 12:05:02 +0000
commite26fadd96cff3251d7ed391e10ab9c372ce5e825 (patch)
tree66b6751d9f082793ed6917273f3e7188d8500b88 /carousel/java
parent8441b1025afe64748f9e3483baacee92171bbfa3 (diff)
downloadandroid_frameworks_ex-e26fadd96cff3251d7ed391e10ab9c372ce5e825.tar.gz
android_frameworks_ex-e26fadd96cff3251d7ed391e10ab9c372ce5e825.tar.bz2
android_frameworks_ex-e26fadd96cff3251d7ed391e10ab9c372ce5e825.zip
Exit overscroll mode when the user interacts with the carousel.
This ensure that when the user releases the carousel, we don't automatically revert to overscroll mode unless we're still in the overscroll area. Change-Id: I1cec3380452383e2ba70b1dfab540a53e8289838
Diffstat (limited to 'carousel/java')
-rw-r--r--carousel/java/com/android/ex/carousel/carousel.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs
index 0b92c82..5991644 100644
--- a/carousel/java/com/android/ex/carousel/carousel.rs
+++ b/carousel/java/com/android/ex/carousel/carousel.rs
@@ -1001,6 +1001,7 @@ void doStart(float x, float y, long eventTime)
touchTime = lastTime = eventTime;
touchBias = bias;
isDragging = true;
+ overscroll = false;
animatedSelection = doSelection(x, y); // used to provide visual feedback on touch
}