Fix 3099806: Prevent glitch when scrolling to end of Carousel.
This fixes a bug where some activities were seeing a
"bounce" at the end of the Carousel list. The issue would
happen because the velocity wasn't reset before the
overscroll animation completed, which meant any call causing
the screen to refresh would run doPhysics() which would cause
the overscroll animation to run.
Change-Id: I2e19603cca3e0ca3374010a762429b8d79804b9e
diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs
index 227921e..27fd522 100644
--- a/carousel/java/com/android/ex/carousel/carousel.rs
+++ b/carousel/java/com/android/ex/carousel/carousel.rs
@@ -1177,6 +1177,9 @@
} else {
stillAnimating = doPhysics(dt);
overscroll = bias > firstBias || bias < lastBias;
+ if (overscroll) {
+ velocity = 0.0f; // prevent bouncing due to v > 0 after overscroll animation.
+ }
}
float newbias = clamp(bias, lastBias - wedgeAngle(OVERSCROLL_SLOTS),
firstBias + wedgeAngle(OVERSCROLL_SLOTS));