From 785e19f5dea93fcd78b4ccf4c98f8c16568f8f48 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Fri, 24 Aug 2012 23:59:28 -0700
Subject: Make transition from album page to photo page even smoother

Bug: 6979922
Bug: 7050303
Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
---
 src/com/android/gallery3d/ui/PositionController.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/com/android/gallery3d/ui/PositionController.java')

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:
-- 
cgit v1.2.3