Return to filmstrip when video playback finishes.
Bug: 17091348
Change-Id: I9703d014029bf29431b099b129b1ed8bce0ffa03
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 3c2305e..37b7693 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -609,9 +609,8 @@
private void startPlayVideoActivity() {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(mCurrentVideoUri, convertOutputFormatToMimeType(mProfile.fileFormat));
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
- mActivity.startActivity(intent);
+ mActivity.launchActivityByIntent(intent);
} catch (ActivityNotFoundException ex) {
Log.e(TAG, "Couldn't view video " + mCurrentVideoUri, ex);
}
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 2c3fb3b..627b6bf 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -1029,13 +1029,13 @@
public static void playVideo(Activity activity, Uri uri, String title) {
try {
- boolean isSecureCamera = ((CameraActivity) activity).isSecureCamera();
+ CameraActivity cameraActivity = (CameraActivity)activity;
+ boolean isSecureCamera = cameraActivity.isSecureCamera();
if (!isSecureCamera) {
Intent intent = IntentHelper.getVideoPlayerIntent(uri)
.putExtra(Intent.EXTRA_TITLE, title)
.putExtra(KEY_TREAT_UP_AS_BACK, true);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- activity.startActivity(intent);
+ cameraActivity.launchActivityByIntent(intent);
} else {
// In order not to send out any intent to be intercepted and
// show the lock screen immediately, we just let the secure