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 | a3871050845b4921379add2b126add3cfbab1109 (patch) | |
| tree | ddfec24f023c53de2e3c4d7c1cadc53afdbdaf50 /src | |
| parent | c9f743a777cf5e5e91bad7810584be052db21eed (diff) | |
| download | android_packages_apps_Gallery2-a3871050845b4921379add2b126add3cfbab1109.tar.gz android_packages_apps_Gallery2-a3871050845b4921379add2b126add3cfbab1109.tar.bz2 android_packages_apps_Gallery2-a3871050845b4921379add2b126add3cfbab1109.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')
| -rw-r--r-- | src/com/android/gallery3d/app/MovieActivity.java | 12 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 5 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 629894abb..8dd69e42a 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -51,11 +51,13 @@ import com.android.gallery3d.common.Utils; 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 @@ public class MovieActivity extends Activity { 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 @@ public class MovieActivity extends Activity { @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; 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), |