1 files changed, 29 insertions, 13 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index f13cdd497..a21bb4fe1 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -131,12 +131,12 @@ public class PanelController implements OnClickListener {
 
         public void setEffectName(String effectName) {
             mEffectName = effectName;
-            showParameter(true);
-            updateText();
+            setShowParameter(true);
         }
 
-        public void showParameter(boolean s) {
+        public void setShowParameter(boolean s) {
             mShowParameterValue = s;
+            updateText();
         }
 
         public void updateText() {
@@ -229,12 +229,26 @@ public class PanelController implements OnClickListener {
         imageShow.setPanelController(this);
     }
 
+    public void resetParameters() {
+        mCurrentImage.resetParameter();
+        showPanel(mCurrentPanel);
+        mCurrentImage.select();
+    }
+
+    public boolean onBackPressed() {
+        if (mUtilityPanel == null || !mUtilityPanel.selected()) {
+            return true;
+        }
+        resetParameters();
+        return false;
+    }
+
     public void onNewValue(int value) {
         mUtilityPanel.onNewValue(value);
     }
 
     public void showParameter(boolean s) {
-        mUtilityPanel.showParameter(s);
+        mUtilityPanel.setShowParameter(s);
     }
 
     public void setCurrentPanel(View panel) {
@@ -379,6 +393,12 @@ public class PanelController implements OnClickListener {
             }
         }
 
+        if (view.getId() == R.id.pickCurvesChannel) {
+            ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);
+            curves.nextChannel();
+            return;
+        }
+
         if (mCurrentImage != null) {
             mCurrentImage.unselect();
         }
@@ -390,16 +410,13 @@ public class PanelController implements OnClickListener {
                 mUtilityPanel.setEffectName(ename);
                 break;
             }
-            /*
-            // TODO: implement crop
             case R.id.cropButton: {
                 mCurrentImage = showImageView(R.id.imageCrop);
                 String ename = mCurrentImage.getContext().getString(R.string.crop);
                 mUtilityPanel.setEffectName(ename);
-                mUtilityPanel.showParameter(false);
+                mUtilityPanel.setShowParameter(false);
                 break;
             }
-            */
             case R.id.rotateButton: {
                 mCurrentImage = showImageView(R.id.imageRotate);
                 String ename = mCurrentImage.getContext().getString(R.string.rotate);
@@ -410,7 +427,7 @@ public class PanelController implements OnClickListener {
                 mCurrentImage = showImageView(R.id.imageFlip);
                 String ename = mCurrentImage.getContext().getString(R.string.flip);
                 mUtilityPanel.setEffectName(ename);
-                mUtilityPanel.showParameter(false);
+                mUtilityPanel.setShowParameter(false);
                 break;
             }
             case R.id.vignetteButton: {
@@ -422,11 +439,9 @@ public class PanelController implements OnClickListener {
             }
             case R.id.curvesButtonRGB: {
                 ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);
-                String ename = mCurrentImage.getContext().getString(R.string.curvesRGB);
+                String ename = curves.getContext().getString(R.string.curvesRGB);
                 mUtilityPanel.setEffectName(ename);
-                curves.setUseRed(true);
-                curves.setUseGreen(true);
-                curves.setUseBlue(true);
+                mUtilityPanel.setShowParameter(false);
                 curves.reloadCurve();
                 mCurrentImage = curves;
                 break;
@@ -456,6 +471,7 @@ public class PanelController implements OnClickListener {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(false);
                 String ename = mCurrentImage.getContext().getString(R.string.wbalance);
                 mUtilityPanel.setEffectName(ename);
+                mUtilityPanel.setShowParameter(false);
                 ensureFilter("WBalance");
                 break;
             }