Fix ANR in image editor

bug:7275425
Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa

1 files changed, 7 insertions, 7 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
index fbc4666c0..c4f0456cb 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
@@ -89,12 +89,19 @@ public class ImageStraighten extends ImageShow {
 
     public void setActionUp() {
         mMode = MODES.UP;
+        updatePreset();
     }
 
     public void setNoAction() {
         mMode = MODES.NONE;
     }
 
+    private void updatePreset() {
+        ImagePreset copy = new ImagePreset(getImagePreset());
+        copy.setStraightenRotation(mImageRotation, mImageRotationZoomFactor);
+        setImagePreset(copy);
+    }
+
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getActionMasked()) {
             case (MotionEvent.ACTION_DOWN):
@@ -232,13 +239,6 @@ public class ImageStraighten extends ImageShow {
 
         mImageRotationZoomFactor = (float) (rw / boundsRect.width());
 
-        ImagePreset copy = new ImagePreset(getImagePreset());
-        Log.v(LOGTAG, "creating a new image preset with rotation " + mImageRotation
-                + " and zoom factor: " + mImageRotationZoomFactor);
-
-        copy.setStraightenRotation(mImageRotation, mImageRotationZoomFactor);
-        setImagePreset(copy);
-
         if (mMode == MODES.MOVE) {
             canvas.save();
             canvas.clipPath(path);