diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-22 11:25:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-22 11:25:46 -0700 |
commit | 1dace572562075e755823bbb7b02d09bb6ca1259 (patch) | |
tree | 933e2362bb8d4fc8b0dcf3102dddfec56ec55d41 | |
parent | 0a32b7afc5286a5c7aa334b9338591d61a49731f (diff) | |
parent | 48129f36b96928b34e657cdc976c1ac19f7b5ad2 (diff) | |
download | android_packages_apps_Gallery2-1dace572562075e755823bbb7b02d09bb6ca1259.tar.gz android_packages_apps_Gallery2-1dace572562075e755823bbb7b02d09bb6ca1259.tar.bz2 android_packages_apps_Gallery2-1dace572562075e755823bbb7b02d09bb6ca1259.zip |
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index bfe1d16de..d6c8ef481 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -664,6 +664,11 @@ public class PhotoPage extends ActivityState implements .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); } + private void overrideTransitionToEditor() { + ((Activity) mActivity).overridePendingTransition(android.R.anim.slide_in_left, + android.R.anim.fade_out); + } + private void launchTinyPlanet() { // Deep link into tiny planet MediaItem current = mModel.getMediaItem(0); @@ -673,6 +678,7 @@ public class PhotoPage extends ActivityState implements .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); mRecenterCameraOnResume = false; mActivity.startActivityForResult(intent, REQUEST_EDIT); + overrideTransitionToEditor(); } private void launchPhotoEditor() { @@ -693,6 +699,7 @@ public class PhotoPage extends ActivityState implements mRecenterCameraOnResume = false; ((Activity) mActivity).startActivityForResult(Intent.createChooser(intent, null), REQUEST_EDIT); + overrideTransitionToEditor(); } private void requestDeferredUpdate() { |