summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-22 11:13:34 -0700
committerBobby Georgescu <georgescu@google.com>2012-10-22 11:13:34 -0700
commitf5d3a0e494703f2ea749ff836c6b00a4fdb239bc (patch)
tree13fc3eb588994269ba3268d9d3bd9169d5ea1af1
parent82da3e8e16187b8c13c1382b487b4735b7f1d94a (diff)
downloadandroid_packages_apps_Snap-f5d3a0e494703f2ea749ff836c6b00a4fdb239bc.tar.gz
android_packages_apps_Snap-f5d3a0e494703f2ea749ff836c6b00a4fdb239bc.tar.bz2
android_packages_apps_Snap-f5d3a0e494703f2ea749ff836c6b00a4fdb239bc.zip
Better transition between Gallery and editor
Bug: 7346155 Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java7
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() {