From fb6edb42e7e0b132844d4e87c2a76c758f48b684 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 10 Oct 2012 18:28:12 -0700
Subject: Remove compare and reset from apply bar and fix text.

Bug: 7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
---
 res/layout/filtershow_activity.xml                 | 16 ---------
 .../gallery3d/filtershow/FilterShowActivity.java   | 22 ------------
 .../gallery3d/filtershow/PanelController.java      | 39 +++-------------------
 3 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 1920b64d6..0c9ceb8a5 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -181,14 +181,6 @@
                 android:orientation="horizontal"
                 android:visibility="gone" >
 
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/compareWithOriginalImage"
-                    style="@style/FilterShowBottomButton"
-                    android:layout_gravity="left"
-                    android:layout_weight="0"
-                    android:src="@drawable/filtershow_button_geometry_straighten"
-                    android:text="@string/compare_original" />
-
                 <Button
                     android:id="@+id/applyEffect"
                     android:layout_height="94dip"
@@ -198,14 +190,6 @@
                     android:gravity="center"
                     android:text="@string/apply_effect"
                     android:textSize="24dip" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/resetEffect"
-                    style="@style/FilterShowBottomButton"
-                    android:layout_gravity="right"
-                    android:layout_weight="0"
-                    android:src="@drawable/filtershow_button_geometry_straighten"
-                    android:text="@string/reset_effect" />
             </LinearLayout>
 
             <HorizontalScrollView
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index f204e4020..07b78a383 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -211,12 +211,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mPanelController.addComponent(mColorsButton, findViewById(R.id.exposureButton));
         mPanelController.addComponent(mColorsButton, findViewById(R.id.shadowRecoveryButton));
 
-        mPanelController.addView(findViewById(R.id.resetEffect));
         mPanelController.addView(findViewById(R.id.applyEffect));
 
-        findViewById(R.id.compareWithOriginalImage).setOnTouchListener(
-                createOnTouchShowOriginalButton());
-
         findViewById(R.id.resetOperationsButton).setOnClickListener(
                 createOnClickResetOperationsButton());
 
@@ -236,7 +232,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mImageZoom.setSeekBar(seekBar);
         mPanelController.setRowPanel(findViewById(R.id.secondRowPanel));
         mPanelController.setUtilityPanel(this, findViewById(R.id.filterButtonsList),
-                findViewById(R.id.compareWithOriginalImage),
                 findViewById(R.id.applyEffect));
         mPanelController.setMasterImage(mImageShow);
         mPanelController.setCurrentPanel(mFxButton);
@@ -526,23 +521,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         }
     }
 
-    // //////////////////////////////////////////////////////////////////////////////
-    // Click handlers for the top row buttons
-
-    private OnTouchListener createOnTouchShowOriginalButton() {
-        return new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                boolean show = false;
-                if ((event.getActionMasked() != MotionEvent.ACTION_UP)
-                        || (event.getActionMasked() == MotionEvent.ACTION_CANCEL)) {
-                    show = true;
-                }
-                showOriginalViews(show);
-                return true;
-            }
-        };
-    }
 
     // //////////////////////////////////////////////////////////////////////////////
     // imageState panel...
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 8da762559..804c6b236 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -108,17 +108,15 @@ public class PanelController implements OnClickListener {
     class UtilityPanel {
         private final Context mContext;
         private final View mView;
-        private final View mCompareView;
         private final TextView mTextView;
         private boolean mSelected = false;
         private String mEffectName = null;
         private int mParameterValue = 0;
         private boolean mShowParameterValue = false;
 
-        public UtilityPanel(Context context, View view, View compareView, View textView) {
+        public UtilityPanel(Context context, View view, View textView) {
             mContext = context;
             mView = view;
-            mCompareView = compareView;
             mTextView = (TextView) textView;
         }
 
@@ -131,14 +129,6 @@ public class PanelController implements OnClickListener {
             updateText();
         }
 
-        public void setGeometryEffect(boolean isGeometryEffect) {
-            if (isGeometryEffect) {
-                mCompareView.setVisibility(View.INVISIBLE);
-            } else {
-                mCompareView.setVisibility(View.VISIBLE);
-            }
-        }
-
         public void setEffectName(String effectName) {
             mEffectName = effectName;
             showParameter(true);
@@ -152,10 +142,10 @@ public class PanelController implements OnClickListener {
         public void updateText() {
             String apply = mContext.getString(R.string.apply_effect);
             if (mShowParameterValue) {
-                mTextView.setText(Html.fromHtml(apply + "<br/><small>" + mEffectName + "<br/>"
+                mTextView.setText(Html.fromHtml(apply + ": <small>" + mEffectName + " "
                         + mParameterValue + "</small>"));
             } else {
-                mTextView.setText(Html.fromHtml(apply + "<br/><small>" + mEffectName + "</small>"));
+                mTextView.setText(Html.fromHtml(apply + ": <small>" + mEffectName + "</small>"));
             }
         }
 
@@ -255,8 +245,8 @@ public class PanelController implements OnClickListener {
         mRowPanel = rowPanel;
     }
 
-    public void setUtilityPanel(Context context, View utilityPanel, View compareView, View textView) {
-        mUtilityPanel = new UtilityPanel(context, utilityPanel, compareView, textView);
+    public void setUtilityPanel(Context context, View utilityPanel, View textView) {
+        mUtilityPanel = new UtilityPanel(context, utilityPanel, textView);
     }
 
     public void setMasterImage(ImageShow imageShow) {
@@ -398,40 +388,34 @@ public class PanelController implements OnClickListener {
             case R.id.straightenButton: {
                 mCurrentImage = showImageView(R.id.imageStraighten);
                 mUtilityPanel.setEffectName("Straighten");
-                mUtilityPanel.setGeometryEffect(true);
                 break;
             }
             case R.id.cropButton: {
                 mCurrentImage = showImageView(R.id.imageCrop);
                 mUtilityPanel.setEffectName("Crop");
                 mUtilityPanel.showParameter(false);
-                mUtilityPanel.setGeometryEffect(true);
                 break;
             }
             case R.id.rotateButton: {
                 mCurrentImage = showImageView(R.id.imageRotate);
                 mUtilityPanel.setEffectName("Rotate");
-                mUtilityPanel.setGeometryEffect(true);
                 break;
             }
             case R.id.flipButton: {
                 mCurrentImage = showImageView(R.id.imageFlip);
                 mUtilityPanel.setEffectName("Flip");
                 mUtilityPanel.showParameter(false);
-                mUtilityPanel.setGeometryEffect(true);
                 break;
             }
             case R.id.vignetteButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Vignette");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Vignette");
                 break;
             }
             case R.id.curvesButtonRGB: {
                 ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);
                 mUtilityPanel.setEffectName("Curves");
-                mUtilityPanel.setGeometryEffect(true);
                 curves.setUseRed(true);
                 curves.setUseGreen(true);
                 curves.setUseBlue(true);
@@ -442,70 +426,57 @@ public class PanelController implements OnClickListener {
             case R.id.sharpenButton: {
                 mCurrentImage = showImageView(R.id.imageZoom).setShowControls(true);
                 mUtilityPanel.setEffectName("Sharpen");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Sharpen");
                 break;
             }
             case R.id.contrastButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Contrast");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Contrast");
                 break;
             }
             case R.id.saturationButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Saturated");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Saturated");
                 break;
             }
             case R.id.wbalanceButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(false);
                 mUtilityPanel.setEffectName("White Balance");
-                mUtilityPanel.setGeometryEffect(true);
                 ensureFilter("WBalance");
                 break;
             }
             case R.id.hueButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Hue");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Hue");
                 break;
             }
             case R.id.exposureButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Exposure");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Exposure");
                 break;
             }
             case R.id.vibranceButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Vibrance");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Vibrance");
                 break;
             }
             case R.id.shadowRecoveryButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Shadows");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Shadows");
                 break;
             }
             case R.id.redEyeButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
                 mUtilityPanel.setEffectName("Redeye");
-                mUtilityPanel.setGeometryEffect(false);
                 ensureFilter("Redeye");
                 break;
             }
-            case R.id.resetEffect: {
-                mCurrentImage.resetParameter();
-                break;
-            }
             case R.id.applyEffect: {
                 showPanel(mCurrentPanel);
                 break;
-- 
cgit v1.2.3