commit a3871050845b4921379add2b126add3cfbab1109
author Ray Chen <raychen@google.com> Thu May 17 12:15:08 2012 +0800
committer Ray Chen <raychen@google.com> Mon May 21 14:16:52 2012 +0800
tree ddfec24f023c53de2e3c4d7c1cadc53afdbdaf50
parent c9f743a777cf5e5e91bad7810584be052db21eed

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

src/com/android/gallery3d/app/MovieActivity.java

diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java
index 629894a..8dd69e4 100644
--- a/src/com/android/gallery3d/app/MovieActivity.java
+++ b/src/com/android/gallery3d/app/MovieActivity.java
@@ -51,11 +51,13 @@
 public class MovieActivity extends Activity {
     @SuppressWarnings("unused")
     private static final String TAG = "MovieActivity";
-    private static final String KEY_LOGO_BITMAP = "logo-bitmap";
+    public static final String KEY_LOGO_BITMAP = "logo-bitmap";
+    public static final String KEY_TREAT_UP_AS_BACK = "treat-up-as-back";
 
     private MoviePlayer mPlayer;
     private boolean mFinishOnCompletion;
     private Uri mUri;
+    private boolean mTreatUpAsBack;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -71,6 +73,7 @@
         initializeActionBar(intent);
         mFinishOnCompletion = intent.getBooleanExtra(
                 MediaStore.EXTRA_FINISH_ON_COMPLETION, true);
+        mTreatUpAsBack = intent.getBooleanExtra(KEY_TREAT_UP_AS_BACK, false);
         mPlayer = new MoviePlayer(rootView, this, intent.getData(), savedInstanceState,
                 !mFinishOnCompletion) {
             @Override
@@ -159,7 +162,12 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            finish();
+            if (mTreatUpAsBack) {
+                finish();
+            } else {
+                startActivity(new Intent(this, Gallery.class));
+                finish();
+            }
             return true;
         }
         return false;