diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-10-02 13:56:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 13:56:25 -0700 |
| commit | 51915a622bbd32e90f0cd43b69a7851e13825737 (patch) | |
| tree | 20fcf499ecb5f30dcb7db324b3100889a844903f /src | |
| parent | 536ff1512fae7c8ad6ee276bf102269011fb6e50 (diff) | |
| parent | 2833355c86cff90163457779adb2bc78a6ca0faa (diff) | |
| download | android_packages_apps_Gallery2-51915a622bbd32e90f0cd43b69a7851e13825737.tar.gz android_packages_apps_Gallery2-51915a622bbd32e90f0cd43b69a7851e13825737.tar.bz2 android_packages_apps_Gallery2-51915a622bbd32e90f0cd43b69a7851e13825737.zip | |
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/TrimVideo.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java index cb5b1711f..09a2abdf0 100644 --- a/src/com/android/gallery3d/app/TrimVideo.java +++ b/src/com/android/gallery3d/app/TrimVideo.java @@ -29,6 +29,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.os.Handler; +import android.provider.MediaStore; import android.provider.MediaStore.Video; import android.provider.MediaStore.Video.VideoColumns; import android.view.View; @@ -316,7 +317,9 @@ public class TrimVideo extends Activity implements // Show the result only when the activity not stopped. Intent intent = new Intent(android.content.Intent.ACTION_VIEW); intent.setDataAndTypeAndNormalize(Uri.fromFile(mDstFile), "video/*"); + intent.putExtra(MediaStore.EXTRA_FINISH_ON_COMPLETION, false); startActivity(intent); + finish(); } } }); |