Updates to allow cancellation of mosaic computation from a UI trigger.

1) reportProgress now takes a new boolean parameter that can be used to break out of the mosaic computation loop at the library level.
2) Added a cancel button to the progressDialog and a new Handler message to handle the button click so that the user can be taken back to the capture stage.
3) Updates to address the code review.

Change-Id: I0768da55dd6ccd9b1464d456ab41973779734c65

1 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/camera/panorama/MosaicFrameProcessor.java b/src/com/android/camera/panorama/MosaicFrameProcessor.java
index c67508f..dde4a22 100644
--- a/src/com/android/camera/panorama/MosaicFrameProcessor.java
+++ b/src/com/android/camera/panorama/MosaicFrameProcessor.java
@@ -78,8 +78,8 @@ public class MosaicFrameProcessor {
         mProgressListener = listener;
     }
 
-    public int reportProgress(boolean hires) {
-        return mMosaicer.reportProgress(hires);
+    public int reportProgress(boolean hires, boolean cancel) {
+        return mMosaicer.reportProgress(hires, cancel);
     }
 
     public void initialize() {
@@ -126,8 +126,8 @@ public class MosaicFrameProcessor {
         mMosaicer.reset();
     }
 
-    public void createMosaic(boolean highRes) {
-        mMosaicer.createMosaic(highRes);
+    public int createMosaic(boolean highRes) {
+        return mMosaicer.createMosaic(highRes);
     }
 
     public byte[] getFinalMosaicNV21() {