Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7c82c37c authored by wqi's avatar wqi Committed by Michael Bestas
Browse files

Gallery2: Remove some functions of crop model in editor interface. 

Remove some functions of crop only keep crop, straight, rotate
in editor interface according to UX specification document.

Change-Id: Ice9426f6ccaafe93a3a00bda7c0cd66f215a9209
CRs-Fixed: 988082 997293
parent 0d1dac14

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+0 −11
Original line number Diff line number Diff line
@@ -499,19 +499,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);

        }

    }

src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java

+3 −7
Original line number Diff line number Diff line
@@ -329,22 +329,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++) {
@@ -359,7 +356,6 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { 
        }



        //mTools.add(getRepresentation(ImageFilterRedEye.class));

        mTools.add(getRepresentation(ImageFilterDraw.class));

    }



    public void removeRepresentation(ArrayList<FilterRepresentation> list,