From 2cf7d5b78744e0d95951ddd631ca11904296ba7c Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 2 Mar 2011 20:03:25 -0800 Subject: Fix 3404464: Minor tweak to Carousel scale-up animation Change-Id: Ieb21634a68d8f5b9f1b411c547c18e32349c4d9e --- carousel/java/com/android/ex/carousel/carousel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs index 49ef785..003af79 100644 --- a/carousel/java/com/android/ex/carousel/carousel.rs +++ b/carousel/java/com/android/ex/carousel/carousel.rs @@ -150,7 +150,7 @@ static const int DRAG_MODEL_CYLINDER_OUTSIDE = 3; // Drag relative to point on o // Constants static const int ANIMATION_DELAY_TIME = 125; // hold off scale animation until this time static const int ANIMATION_SCALE_UP_TIME = 200; // Time it takes to animate selected card, in ms -static const int ANIMATION_SCALE_DOWN_TIME = 400; // Time it takes to animate selected card, in ms +static const int ANIMATION_SCALE_DOWN_TIME = 200; // Time it takes to animate selected card, in ms static const float3 SELECTED_SCALE_FACTOR = { 0.1f, 0.1f, 0.1f }; // increase by this % static const float OVERSCROLL_SLOTS = 1.0f; // amount of allowed overscroll (in slots) static const int VELOCITY_HISTORY_MAX = 10; // # recent velocity samples used to calculate average -- cgit v1.2.3