summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui/PositionController.java
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-08-24 23:59:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-26 22:36:49 -0700
commit785e19f5dea93fcd78b4ccf4c98f8c16568f8f48 (patch)
treefc999339261c7ea08321a9feafbf2a156a09c35f /src/com/android/gallery3d/ui/PositionController.java
parent75da47f8d384e58367c5458c366978918c0b6696 (diff)
downloadandroid_packages_apps_Snap-785e19f5dea93fcd78b4ccf4c98f8c16568f8f48.tar.gz
android_packages_apps_Snap-785e19f5dea93fcd78b4ccf4c98f8c16568f8f48.tar.bz2
android_packages_apps_Snap-785e19f5dea93fcd78b4ccf4c98f8c16568f8f48.zip
Make transition from album page to photo page even smoother
Bug: 6979922 Bug: 7050303 Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
Diffstat (limited to 'src/com/android/gallery3d/ui/PositionController.java')
-rw-r--r--src/com/android/gallery3d/ui/PositionController.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java
index b1b3c37ab..16e9f7ba1 100644
--- a/src/com/android/gallery3d/ui/PositionController.java
+++ b/src/com/android/gallery3d/ui/PositionController.java
@@ -1417,12 +1417,10 @@ class PositionController {
case ANIM_KIND_CAPTURE:
progress = 1 - f; // linear
break;
+ case ANIM_KIND_OPENING:
case ANIM_KIND_SCALE:
progress = 1 - f * f; // quadratic
break;
- case ANIM_KIND_OPENING:
- progress = 1 - f * f * f; // x^3
- break;
case ANIM_KIND_SNAPBACK:
case ANIM_KIND_ZOOM:
case ANIM_KIND_SLIDE: