diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-26 19:44:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-26 19:44:56 +0000 |
| commit | f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2 (patch) | |
| tree | ba2fbd68f3259270859bfba8f0eaa4727760c39b /src | |
| parent | 2ba03263340639635120be467f8cabec2889aa08 (diff) | |
| parent | f2c14330a49abb55f75bfae6b3bae67a0dad115b (diff) | |
| download | android_packages_apps_Snap-f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2.tar.gz android_packages_apps_Snap-f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2.tar.bz2 android_packages_apps_Snap-f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2.zip | |
Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -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 5cf6bd6ae..83314f061 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(); |