Merge "Gallery2: Remove some functions of crop model in editor interface." into android_ui.lnx.1.2-dev

2 files changed, 3 insertions, 18 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 32981f175..2db66e05b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -737,19 +737,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
             mCategoryGeometryAdapter.clear();
         }
         mCategoryGeometryAdapter = new CategoryAdapter(this);
-        boolean found = false;
         for (FilterRepresentation representation : filtersRepresentations) {
             mCategoryGeometryAdapter.add(new Action(this, representation));
-            if (representation instanceof FilterDrawRepresentation) {
-                found = true;
-            }
-        }
-        if (!found) {
-            FilterRepresentation representation =
-                    new FilterDrawRepresentation(getString(R.string.imageDraw));
-            Action action = new Action(this, representation);
-            action.setIsDoubleAction(true);
-            mCategoryGeometryAdapter.add(action);
         }
     }
 
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index 9d3bd4d76..efa351b04 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -368,22 +368,19 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
         int[] textId = {
                 R.string.crop,
                 R.string.straighten,
-                R.string.rotate,
-                R.string.mirror
+                R.string.rotate
         };
 
         int[] overlayId = {
                 R.drawable.filtershow_button_geometry_crop,
                 R.drawable.filtershow_button_geometry_straighten,
-                R.drawable.filtershow_button_geometry_rotate,
-                R.drawable.filtershow_button_geometry_flip
+                R.drawable.filtershow_button_geometry_rotate
         };
 
         FilterRepresentation[] geometryFilters = {
                 new FilterCropRepresentation(),
                 new FilterStraightenRepresentation(),
-                new FilterRotateRepresentation(),
-                new FilterMirrorRepresentation()
+                new FilterRotateRepresentation()
         };
 
         for (int i = 0; i < textId.length; i++) {
@@ -398,7 +395,6 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
         }
 
         //mTools.add(getRepresentation(ImageFilterRedEye.class));
-        mTools.add(getRepresentation(ImageFilterDraw.class));
     }
 
     public void addDualCam(Context context) {