Makes rotate and mirror direct operations

Change-Id: I10128c211ec6e269603e3b3f3cbafadbeabdaac5

1 files changed, 14 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 2912f6891..5ef5724c3 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -80,7 +80,9 @@ import com.android.gallery3d.filtershow.editors.EditorRotate;
 import com.android.gallery3d.filtershow.editors.EditorStraighten;
 import com.android.gallery3d.filtershow.editors.EditorTinyPlanet;
 import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
+import com.android.gallery3d.filtershow.filters.FilterMirrorRepresentation;
 import com.android.gallery3d.filtershow.filters.FilterRepresentation;
+import com.android.gallery3d.filtershow.filters.FilterRotateRepresentation;
 import com.android.gallery3d.filtershow.filters.FilterUserPresetRepresentation;
 import com.android.gallery3d.filtershow.filters.FiltersManager;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
@@ -570,7 +572,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         if (filterRepresentation == null) {
             return;
         }
-        if (MasterImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) {
+        if (!(filterRepresentation instanceof FilterRotateRepresentation)
+            && !(filterRepresentation instanceof FilterMirrorRepresentation)
+            && MasterImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) {
             return;
         }
         ImagePreset oldPreset = MasterImage.getImage().getPreset();
@@ -579,6 +583,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         if (representation == null) {
             copy.addFilter(filterRepresentation);
         } else if (filterRepresentation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) {
+            representation.useParametersFrom(filterRepresentation);
             filterRepresentation = representation;
         } else {
             if (filterRepresentation.allowsSingleInstanceOnly()) {
@@ -598,6 +603,14 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
             return;
         }
 
+        if (representation instanceof FilterRotateRepresentation) {
+            FilterRotateRepresentation r = (FilterRotateRepresentation) representation;
+            r.rotateCW();
+        }
+        if (representation instanceof FilterMirrorRepresentation) {
+            FilterMirrorRepresentation r = (FilterMirrorRepresentation) representation;
+            r.cycle();
+        }
         useFilterRepresentation(representation);
 
         // show representation