diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-26 11:24:37 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-09-26 12:24:34 -0700 |
| commit | f2c14330a49abb55f75bfae6b3bae67a0dad115b (patch) | |
| tree | 7919f53e38c3b29e839cff03fdafd911719cf821 /src/com/android/camera/CameraActivity.java | |
| parent | b998a491a5b24e710bc1711dbb00cbfa05273bf2 (diff) | |
| download | android_packages_apps_Snap-f2c14330a49abb55f75bfae6b3bae67a0dad115b.tar.gz android_packages_apps_Snap-f2c14330a49abb55f75bfae6b3bae67a0dad115b.tar.bz2 android_packages_apps_Snap-f2c14330a49abb55f75bfae6b3bae67a0dad115b.zip | |
Finalize deletion when app exits and for last photo
Bug: 10892925
Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 55b3dd7c5..dbba305bc 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -723,6 +723,7 @@ public class CameraActivity extends Activity } else { // If camera preview is the only view left in filmstrip, // no need to show undo bar. + mPendingDeletion = true; performDeletion(); } } @@ -1028,6 +1029,8 @@ public class CameraActivity extends Activity @Override public void onPause() { + // Delete photos that are pending deletion + performDeletion(); mOrientationListener.disable(); mCurrentModule.onPauseBeforeSuper(); super.onPause(); |