am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches

* commit '808dbe19752361ad171b58836df7f195deee8019':
  Add back button handling

3 files changed, 17 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index f2b817c17..e8770548d 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -712,6 +712,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         };
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mPanelController.onBackPressed()) {
+            finish();
+        }
+    }
     // //////////////////////////////////////////////////////////////////////////////
 
     public float getPixelsFromDip(float value) {
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);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
index 9d9c7e548..5e613ebce 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
@@ -18,7 +18,6 @@ public class ImageFilterWBalance extends ImageFilter {
     public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
         int w = bitmap.getWidth();
         int h = bitmap.getHeight();
-        Log.v(TAG,"White Balance Call");
         nativeApplyFilter(bitmap, w, h, -1,-1);
         return bitmap;
     }