summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-10-02 13:56:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-02 13:56:25 -0700
commit1ebac746eb319663f44fe9fbb7786cb9bb87489b (patch)
tree26dd93766380e921af2924ef6f32f602767c675b
parent47f251a757f3ce66374492f08e49843b3651de4e (diff)
parent2bc896eba093277e7e530b4dca35ec09ed523c0b (diff)
downloadandroid_packages_apps_Snap-1ebac746eb319663f44fe9fbb7786cb9bb87489b.tar.gz
android_packages_apps_Snap-1ebac746eb319663f44fe9fbb7786cb9bb87489b.tar.bz2
android_packages_apps_Snap-1ebac746eb319663f44fe9fbb7786cb9bb87489b.zip
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/app/TrimVideo.java3
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();
}
}
});