Add back button handling

bug:7332980

- fix crash as well.

Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4

1 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 918eb5b9c..a937452b3 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -229,6 +229,16 @@ public class PanelController implements OnClickListener {
         imageShow.setPanelController(this);
     }
 
+    public boolean onBackPressed() {
+        if (mUtilityPanel == null || !mUtilityPanel.selected()) {
+            return true;
+        }
+        mCurrentImage.resetParameter();
+        showPanel(mCurrentPanel);
+        mCurrentImage.select();
+        return false;
+    }
+
     public void onNewValue(int value) {
         mUtilityPanel.onNewValue(value);
     }
@@ -422,7 +432,7 @@ 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);
                 mUtilityPanel.setShowParameter(false);
                 curves.setUseRed(true);