summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/panorama
diff options
context:
space:
mode:
authorMark Wagner <mxw@google.com>2011-10-04 14:24:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-04 14:24:56 -0700
commitb4d98e8e64d606beea6e131efbdee4f3cb8416a3 (patch)
tree0499879bb6d7797003ca55c6fb1559a539399d9b /src/com/android/camera/panorama
parent07abd8b392209c5136462807c055c2abd448dd0b (diff)
parent8b084a607d0b207272d5c87fecbb5d33cbef1b4f (diff)
downloadLegacyCamera-b4d98e8e64d606beea6e131efbdee4f3cb8416a3.zip
LegacyCamera-b4d98e8e64d606beea6e131efbdee4f3cb8416a3.tar.gz
LegacyCamera-b4d98e8e64d606beea6e131efbdee4f3cb8416a3.tar.bz2
Merge "bugfix 5340803 Deleted panorama still shown."
Diffstat (limited to 'src/com/android/camera/panorama')
-rwxr-xr-xsrc/com/android/camera/panorama/PanoramaActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index c2a9ff6..09df1e0 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -880,6 +880,7 @@ public class PanoramaActivity extends ActivityBase implements
stopCapture(true);
reset();
}
+ if (mSharePopup != null) mSharePopup.dismiss();
releaseCamera();
mMosaicView.onPause();
clearMosaicFrameProcessorIfNeeded();