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

Commit a4ff1776 authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Hide the category panel when editing" into gb-ub-photos-bryce

parents ddcb0880 efe8b712

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

+11 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 
    private FilterIconButton mNullBorderFilter;

    private int mIconSeedSize = 140;



    private View mImageCategoryPanel = null;



    @Override

    public void onCreate(Bundle savedInstanceState) {
@@ -219,6 +220,16 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, 


        setupHistoryPanel();

        setupStatePanel();



        mImageCategoryPanel = findViewById(R.id.imageCategoryPanel);

    }



    public void hideCategoryPanel() {

        mImageCategoryPanel.setVisibility(View.GONE);

    }



    public void showCategoryPanel() {

        mImageCategoryPanel.setVisibility(View.VISIBLE);

    }



    public void setupHistoryPanel() {

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

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.util.Log; 
import com.android.gallery3d.R;

import com.android.gallery3d.filtershow.editors.Editor;

import com.android.gallery3d.filtershow.editors.EditorTinyPlanet;

import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;

import com.android.gallery3d.filtershow.filters.FilterRepresentation;

import com.android.gallery3d.filtershow.filters.ImageFilter;

import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet;
@@ -369,6 +370,7 @@ public class PanelController implements OnClickListener { 
        HistoryAdapter adapter = MasterImage.getImage().getHistory();

        int position = adapter.undo();

        MasterImage.getImage().onHistoryItemClick(position);

        mActivity.showCategoryPanel();

        showPanel(mCurrentPanel);

        mCurrentImage.select();

        if (mCurrentEditor != null) {
@@ -586,6 +588,7 @@ public class PanelController implements OnClickListener { 
        }

        mUtilityPanel.hideAccessoryViews();

        mUtilityPanel.showMenu(false);



        if (view instanceof FilterIconButton) {

            mCurrentEditor = null;

            FilterIconButton component = (FilterIconButton) view;
@@ -595,6 +598,9 @@ public class PanelController implements OnClickListener { 
                mUtilityPanel.setShowParameter(representation.showParameterValue());



                if (representation.getEditorId() != 0) {

                    if (representation.getEditorId() != ImageOnlyEditor.ID) {

                        mActivity.hideCategoryPanel();

                    }

                    if (mEditorPlaceHolder.contains(representation.getEditorId())) {

                        mCurrentEditor = mEditorPlaceHolder.showEditor(

                                representation.getEditorId());
@@ -625,6 +631,7 @@ public class PanelController implements OnClickListener { 
            return;

        }



        mActivity.showCategoryPanel();

        int id = view.getId();

        if (id == EditorTinyPlanet.ID) {

            mCurrentImage = showImageView(R.id.imageTinyPlanet);