1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 18a9585a6..5bda246da 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -375,18 +375,20 @@ public class PanelController implements OnClickListener {
         ImageShow image = null;
         mActivity.hideImageViews();
         for (View view : mImageViews) {
+            image = (ImageShow) view;
             if (view.getId() == id) {
                 view.setVisibility(View.VISIBLE);
-                image = (ImageShow) view;
+                image.select();
             } else {
                 view.setVisibility(View.GONE);
+                image.unselect();
             }
         }
         return image;
     }
 
     public void showDefaultImageView() {
-        showImageView(R.id.imageShow).setShowControls(false);
+        showImageView(R.id.imageShow);
         MasterImage.getImage().setCurrentFilter(null);
         MasterImage.getImage().setCurrentFilterRepresentation(null);
     }
@@ -498,7 +500,7 @@ public class PanelController implements OnClickListener {
         }
         mUtilityPanel.hideAccessoryViews();
 
-        if (view instanceof FilterIconButton) {
+        if (view instanceof FilterIconButton && view.getId() != R.id.applyEffect) {
             mCurrentEditor = null;
             FilterIconButton component = (FilterIconButton) view;
             FilterRepresentation representation = component.getFilterRepresentation();
@@ -515,7 +517,6 @@ public class PanelController implements OnClickListener {
                         mCurrentImage = showImageView(representation.getEditorId());
                     }
                 }
-                mCurrentImage.setShowControls(representation.showEditingControls());
                 mUtilityPanel.setShowParameter(representation.showParameterValue());
 
                 mCurrentImage.select();
@@ -533,7 +534,7 @@ public class PanelController implements OnClickListener {
 
         switch (view.getId()) {
             case R.id.tinyplanetButton: {
-                mCurrentImage = showImageView(R.id.imageTinyPlanet).setShowControls(true);
+                mCurrentImage = showImageView(R.id.imageTinyPlanet);
                 String ename = mCurrentImage.getContext().getString(R.string.tinyplanet);
                 mUtilityPanel.setEffectName(ename);
                 if (!mDisableFilterButtons) {
@@ -556,8 +557,8 @@ public class PanelController implements OnClickListener {
                 if (mCurrentImage instanceof ImageCrop && mUtilityPanel.firstTimeCropDisplayed) {
                     ((ImageCrop) mCurrentImage).clear();
                     mUtilityPanel.firstTimeCropDisplayed = false;
+                    ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect);
                 }
-                ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect);
                 break;
             }
             case R.id.rotateButton: {