diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-08-24 23:59:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-26 22:36:49 -0700 |
| commit | 02ef48574ef7099ebaa0386bd6fd676bd2fd5489 (patch) | |
| tree | e4dc2f6c17c1b443d2fa666d958bafa1d54ffae7 | |
| parent | 5992daf6f4cb56742cbf33a014c5c2c142c6957e (diff) | |
| download | android_packages_apps_Gallery2-02ef48574ef7099ebaa0386bd6fd676bd2fd5489.tar.gz android_packages_apps_Gallery2-02ef48574ef7099ebaa0386bd6fd676bd2fd5489.tar.bz2 android_packages_apps_Gallery2-02ef48574ef7099ebaa0386bd6fd676bd2fd5489.zip | |
Make transition from album page to photo page even smoother
Bug: 6979922
Bug: 7050303
Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 5 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/PositionController.java | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 5328678ab..8e65bc0b9 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -269,10 +269,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } else { // Show pressed-up animation for the single-tap. mAlbumView.setPressedIndex(slotIndex); - mAlbumView.setPressedUp(); - mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_PICK_PHOTO, slotIndex, 0), - FadeTexture.DURATION); prepareFadeOutTexture(); + mAlbumView.setPressedIndex(-1); + pickPhoto(slotIndex); } } diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 2458b9a98..43867bbfe 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -133,7 +133,7 @@ public class PhotoPage extends ActivityState implements private RawTexture mFadeOutTexture; private Rect mOpenAnimationRect; - public static final int ANIM_TIME_OPENING = 300; + public static final int ANIM_TIME_OPENING = 400; // The item that is deleted (but it can still be undeleted before commiting) private Path mDeletePath; @@ -191,7 +191,7 @@ public class PhotoPage extends ActivityState implements view.setAlpha(fadeAlpha); } mFadeOutTexture.draw(view, 0, 0); - view.setAlpha(1f); + view.setAlpha(1f - fadeAlpha); return; } } 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: |