commit 87412bf98591aa08c7981f271932d469da8d3f86
author Angus Kong <shkong@google.com> Wed Oct 12 21:51:07 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 12 21:51:07 2011 -0700
tree a0ebd24e045b74fe9156cf22f91f89074d0f807b
parent def576c23bd7b1742896dad96c4fddb8f027d882
parent ef011a1e479f8e801318eba2dccb50fac1590d3c

am ef011a1e: Cancel the mosaic computation when paused.

* commit 'ef011a1e479f8e801318eba2dccb50fac1590d3c':
  Cancel the mosaic computation when paused.

src/com/android/camera/panorama/PanoramaActivity.java

diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 0442c09..83b1a1a 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -815,9 +815,7 @@
         }
     }
 
-    @OnClickAttr
-    public void onCancelButtonClicked(View v) {
-        if (mPausing || mSurfaceTexture == null) return;
+    private void cancelHighResComputation() {
         mCancelComputation = true;
         synchronized (mWaitObject) {
             mWaitObject.notify();
@@ -825,6 +823,12 @@
     }
 
     @OnClickAttr
+    public void onCancelButtonClicked(View v) {
+        if (mPausing || mSurfaceTexture == null) return;
+        cancelHighResComputation();
+    }
+
+    @OnClickAttr
     public void onThumbnailClicked(View v) {
         if (mPausing || mThreadRunning || mSurfaceTexture == null) return;
         showSharePopup();
@@ -897,6 +901,7 @@
         super.onPause();
 
         mPausing = true;
+        cancelHighResComputation();
         // Stop the capturing first.
         if (mCaptureState == CAPTURE_STATE_MOSAIC) {
             stopCapture(true);