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

2 files changed, 18 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 81c171758..b65943279 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -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() {
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 6b20fe180..f29765a35 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -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);