diff options
| author | Ray Chen <raychen@google.com> | 2012-05-17 12:15:08 +0800 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2012-05-21 14:16:52 +0800 |
| commit | 2789bb0256e62b29c04f608510ae11df2d35dca9 (patch) | |
| tree | e172cbdd2cd061a12737c7b00969b8bd6bfe9313 /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | 9c89d80b702defe324e90050037e91edb83bbeea (diff) | |
| download | android_packages_apps_Snap-2789bb0256e62b29c04f608510ae11df2d35dca9.tar.gz android_packages_apps_Snap-2789bb0256e62b29c04f608510ae11df2d35dca9.tar.bz2 android_packages_apps_Snap-2789bb0256e62b29c04f608510ae11df2d35dca9.zip | |
Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
Change-Id: Id0c43872386cc0272bc76d37a9c866d5ffae700f
b: 6385004
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index eee719754..ea3badc79 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -695,8 +695,9 @@ public class PhotoPage extends ActivityState implements public static void playVideo(Activity activity, Uri uri, String title) { try { Intent intent = new Intent(Intent.ACTION_VIEW) - .setDataAndType(uri, "video/*"); - intent.putExtra(Intent.EXTRA_TITLE, title); + .setDataAndType(uri, "video/*") + .putExtra(Intent.EXTRA_TITLE, title) + .putExtra(MovieActivity.KEY_TREAT_UP_AS_BACK, true); activity.startActivityForResult(intent, REQUEST_PLAY_VIDEO); } catch (ActivityNotFoundException e) { Toast.makeText(activity, activity.getString(R.string.video_err), |