diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-27 08:36:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 08:36:27 -0700 |
| commit | f1244801b6b24053b8a81f353229d63d6d801763 (patch) | |
| tree | 4046979a1c1d43ee5713dbaf0a2309bb7ddbaf81 /src/com | |
| parent | 1743de666ba52fd8a32babb36de01c7e3b56c2a7 (diff) | |
| parent | db288b8686e5bcecef620176b934b00eb0742597 (diff) | |
| download | LegacyCamera-f1244801b6b24053b8a81f353229d63d6d801763.zip LegacyCamera-f1244801b6b24053b8a81f353229d63d6d801763.tar.gz LegacyCamera-f1244801b6b24053b8a81f353229d63d6d801763.tar.bz2 | |
Merge "Clear the share popup when a new thumbnail is generated." into ics-factoryrom
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/Camera.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/panorama/PanoramaActivity.java | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 1a598f2..1e23374 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -763,6 +763,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener, if (mThumbnail != null) { mThumbnailView.setBitmap(mThumbnail.getBitmap()); } + // Share popup may still have the reference to the old thumbnail. Clear it. + mSharePopup = null; Util.broadcastNewPicture(this, uri); } } diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 10cfc85..71f3bd6 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -1537,6 +1537,8 @@ public class VideoCamera extends ActivityBase if (videoFrame != null) { mThumbnail = new Thumbnail(mCurrentVideoUri, videoFrame, 0); mThumbnailView.setBitmap(mThumbnail.getBitmap()); + // Share popup may still have the reference to the old thumbnail. Clear it. + mSharePopup = null; } } } @@ -2223,6 +2225,8 @@ public class VideoCamera extends ActivityBase if (mThumbnail != null) { mThumbnailView.setBitmap(mThumbnail.getBitmap()); } + // Share popup may still have the reference to the old thumbnail. Clear it. + mSharePopup = null; Util.broadcastNewPicture(this, uri); } } diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java index 8126a1b..af750f1 100644 --- a/src/com/android/camera/panorama/PanoramaActivity.java +++ b/src/com/android/camera/panorama/PanoramaActivity.java @@ -251,6 +251,8 @@ public class PanoramaActivity extends Activity implements if (mThumbnail != null) { mThumbnailView.setBitmap(mThumbnail.getBitmap()); } + // Share popup may still have the reference to the old thumbnail. Clear it. + mSharePopup = null; resetToPreview(); break; case MSG_GENERATE_FINAL_MOSAIC_ERROR: |