Remove the individual Curves channel filters

Reorder the filters

bug:7234317
Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 24529ab..06583d8 100644 (file)
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -68,9 +68,9 @@
         android:orientation="vertical" >
 
         <FrameLayout
-            android:layout_weight="1"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
 
             <com.android.gallery3d.filtershow.imageshow.ImageShow
                 android:id="@+id/imageShow"
@@ -97,12 +97,11 @@
 
             <ImageButton
                 android:id="@+id/showOriginalButton"
-                android:layout_height="64dip"
                 android:layout_width="64dip"
-                android:scaleType="centerInside"
+                android:layout_height="64dip"
                 android:layout_gravity="bottom"
+                android:scaleType="centerInside"
                 android:src="@drawable/filtershow_button_show_original" />
-            
         </FrameLayout>
 
         <HorizontalScrollView
@@ -191,40 +190,10 @@
                     android:text="@string/vignette" />
 
                 <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/curvesButtonRGB"
-                    style="@style/FilterShowBottomButton"
-                    android:src="@drawable/filtershow_button_colors_curve"
-                    android:text="@string/curvesRGB" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/curvesButtonRed"
-                    style="@style/FilterShowBottomButton"
-                    android:src="@drawable/filtershow_button_colors_curve"
-                    android:text="@string/curvesRed" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/curvesButtonGreen"
-                    style="@style/FilterShowBottomButton"
-                    android:src="@drawable/filtershow_button_colors_curve"
-                    android:text="@string/curvesGreen" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/curvesButtonBlue"
-                    style="@style/FilterShowBottomButton"
-                    android:src="@drawable/filtershow_button_colors_curve"
-                    android:text="@string/curvesBlue" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/sharpenButton"
-                    style="@style/FilterShowBottomButton"
-                    android:src="@drawable/filtershow_button_colors_sharpen"
-                    android:text="@string/sharpen" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/vibranceButton"
+                    android:id="@+id/exposureButton"
                     style="@style/FilterShowBottomButton"
                     android:src="@drawable/filtershow_button_colors_contrast"
-                    android:text="@string/vibrance" />
+                    android:text="@string/exposure" />
 
                 <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                     android:id="@+id/contrastButton"
@@ -245,16 +214,29 @@
                     android:text="@string/tint" />
 
                 <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/exposureButton"
+                    android:id="@+id/curvesButtonRGB"
+                    style="@style/FilterShowBottomButton"
+                    android:src="@drawable/filtershow_button_colors_curve"
+                    android:text="@string/curvesRGB" />
+
+                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+                    android:id="@+id/vibranceButton"
                     style="@style/FilterShowBottomButton"
                     android:src="@drawable/filtershow_button_colors_contrast"
-                    android:text="@string/exposure" />
+                    android:text="@string/vibrance" />
+
+                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+                    android:id="@+id/sharpenButton"
+                    style="@style/FilterShowBottomButton"
+                    android:src="@drawable/filtershow_button_colors_sharpen"
+                    android:text="@string/sharpen" />
 
                 <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                     android:id="@+id/shadowRecoveryButton"
                     style="@style/FilterShowBottomButton"
                     android:src="@drawable/filtershow_button_colors_contrast"
                     android:text="@string/shadow_recovery" />
+
             </LinearLayout>
         </HorizontalScrollView>
 

diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 9f81164..0a3e93d 100644 (file)
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -32,7 +32,7 @@
     <string name="rotate">Rotate</string>
     <string name="flip">Flip</string>
     <string name="vignette">Vignette</string>
-    <string name="curvesRGB">Curves (RGB)</string>
+    <string name="curvesRGB">Curves</string>
     <string name="curvesRed">Curves (Red)</string>
     <string name="curvesGreen">Curves (Green)</string>
     <string name="curvesBlue">Curves (Blue)</string>

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 589d573..e807e35 100644 (file)
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -61,9 +61,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
 
     private ImageButton mVignetteButton = null;
     private ImageButton mCurvesButtonRGB = null;
-    private ImageButton mCurvesButtonRed = null;
-    private ImageButton mCurvesButtonGreen = null;
-    private ImageButton mCurvesButtonBlue = null;
     private ImageButton mSharpenButton = null;
 
     private ImageButton mContrastButton = null;
@@ -135,9 +132,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
 
         mVignetteButton = (ImageButton) findViewById(R.id.vignetteButton);
         mCurvesButtonRGB = (ImageButton) findViewById(R.id.curvesButtonRGB);
-        mCurvesButtonRed = (ImageButton) findViewById(R.id.curvesButtonRed);
-        mCurvesButtonGreen = (ImageButton) findViewById(R.id.curvesButtonGreen);
-        mCurvesButtonBlue = (ImageButton) findViewById(R.id.curvesButtonBlue);
         mSharpenButton = (ImageButton) findViewById(R.id.sharpenButton);
         mVibranceButton = (ImageButton) findViewById(R.id.vibranceButton);
         mContrastButton = (ImageButton) findViewById(R.id.contrastButton);
@@ -148,9 +142,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
 
         mColorsPanelButtons.add(mVignetteButton);
         mColorsPanelButtons.add(mCurvesButtonRGB);
-        mColorsPanelButtons.add(mCurvesButtonRed);
-        mColorsPanelButtons.add(mCurvesButtonGreen);
-        mColorsPanelButtons.add(mCurvesButtonBlue);
         mColorsPanelButtons.add(mSharpenButton);
         mColorsPanelButtons.add(mContrastButton);
         mColorsPanelButtons.add(mSaturationButton);
@@ -159,8 +150,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
         mColorsPanelButtons.add(mExposureButton);
         mColorsPanelButtons.add(mShadowRecoveryButton);
 
-        mCurvesButtonRGB.setSelected(true);
-
         // TODO: instead of click listeners, make the activity the single
         // listener and do a dispatch in the listener callback method.
         findViewById(R.id.showOriginalButton).setOnTouchListener(createOnTouchShowOriginalButton());
@@ -171,9 +160,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
 
         mVignetteButton.setOnClickListener(createOnClickVignetteButton());
         mCurvesButtonRGB.setOnClickListener(createOnClickCurvesRGBButton());
-        mCurvesButtonRed.setOnClickListener(createOnClickCurvesRedButton());
-        mCurvesButtonGreen.setOnClickListener(createOnClickCurvesGreenButton());
-        mCurvesButtonBlue.setOnClickListener(createOnClickCurvesBlueButton());
 
         mSharpenButton.setOnClickListener(createOnClickSharpenButton());
         mContrastButton.setOnClickListener(createOnClickContrastButton());
@@ -499,7 +485,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
                 hideListViews();
                 unselectBottomPanelButtons();
                 mListColors.setVisibility(View.VISIBLE);
-                mImageCurves.setVisibility(View.VISIBLE);
+                mImageShow.setVisibility(View.VISIBLE);
                 mColorsButton.setSelected(true);
 
                 if (ANIMATE_PANELS) {
@@ -603,69 +589,99 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
         };
     }
 
-    private OnClickListener createOnClickCurvesRedButton() {
+    private OnClickListener createOnClickSharpenButton() {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 hideImageViews();
-                mImageCurves.setVisibility(View.VISIBLE);
+                mImageShow.setVisibility(View.VISIBLE);
                 unselectPanelButtons(mColorsPanelButtons);
-                mCurvesButtonRed.setSelected(true);
-                mImageCurves.setUseRed(true);
-                mImageCurves.setUseGreen(false);
-                mImageCurves.setUseBlue(false);
-                mImageCurves.reloadCurve();
+                mSharpenButton.setSelected(true);
+                mImageShow.showToast("Sharpen", true);
+                mImageShow.setCurrentFilter(null);
             }
         };
     }
 
-    private OnClickListener createOnClickCurvesGreenButton() {
+    private OnClickListener createOnClickContrastButton() {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 hideImageViews();
-                mImageCurves.setVisibility(View.VISIBLE);
+                mImageShow.setVisibility(View.VISIBLE);
+                mImageShow.setShowControls(true);
+                ImagePreset preset = mImageShow.getImagePreset();
+                ImageFilter filter = preset.getFilter("Contrast");
+                if (filter == null) {
+                    ImageFilterContrast contrast = new ImageFilterContrast();
+                    ImagePreset copy = new ImagePreset(preset);
+                    copy.add(contrast);
+                    copy.setHistoryName(contrast.name());
+                    copy.setIsFx(false);
+                    filter = copy.getFilter("Contrast");
+                    mImageShow.setImagePreset(copy);
+                }
+                mImageShow.setCurrentFilter(filter);
                 unselectPanelButtons(mColorsPanelButtons);
-                mCurvesButtonGreen.setSelected(true);
-                mImageCurves.setUseRed(false);
-                mImageCurves.setUseGreen(true);
-                mImageCurves.setUseBlue(false);
-                mImageCurves.reloadCurve();
+                mContrastButton.setSelected(true);
+                invalidateViews();
             }
         };
     }
 
-    private OnClickListener createOnClickCurvesBlueButton() {
+    private OnClickListener createOnClickSaturationButton() {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 hideImageViews();
-                mImageCurves.setVisibility(View.VISIBLE);
+                mImageShow.setVisibility(View.VISIBLE);
+                mImageShow.setShowControls(true);
+                ImagePreset preset = mImageShow.getImagePreset();
+                ImageFilter filter = preset.getFilter("Saturated");
+                if (filter == null) {
+                    ImageFilterSaturated sat = new ImageFilterSaturated();
+                    ImagePreset copy = new ImagePreset(preset);
+                    copy.add(sat);
+                    copy.setHistoryName(sat.name());
+                    copy.setIsFx(false);
+                    filter = copy.getFilter("Saturated");
+                    mImageShow.setImagePreset(copy);
+                }
+                mImageShow.setCurrentFilter(filter);
                 unselectPanelButtons(mColorsPanelButtons);
-                mCurvesButtonBlue.setSelected(true);
-                mImageCurves.setUseRed(false);
-                mImageCurves.setUseGreen(false);
-                mImageCurves.setUseBlue(true);
-                mImageCurves.reloadCurve();
+                mSaturationButton.setSelected(true);
+                invalidateViews();
             }
         };
     }
 
-    private OnClickListener createOnClickSharpenButton() {
+    private OnClickListener createOnClickTintButton() {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 hideImageViews();
                 mImageShow.setVisibility(View.VISIBLE);
+                mImageShow.setShowControls(true);
+                ImagePreset preset = mImageShow.getImagePreset();
+                ImageFilter filter = preset.getFilter("Hue");
+                if (filter == null) {
+                    ImageFilterHue contrast = new ImageFilterHue();
+                    ImagePreset copy = new ImagePreset(preset);
+                    copy.add(contrast);
+                    copy.setHistoryName(contrast.name());
+                    copy.setIsFx(false);
+                    filter = copy.getFilter("Hue");
+                    mImageShow.setImagePreset(copy);
+                }
+                mImageShow.setCurrentFilter(filter);
                 unselectPanelButtons(mColorsPanelButtons);
-                mSharpenButton.setSelected(true);
-                mImageShow.showToast("Sharpen", true);
-                mImageShow.setCurrentFilter(null);
+                mTintButton.setSelected(true);
+                invalidateViews();
             }
         };
     }
 
-    private OnClickListener createOnClickContrastButton() {
+    private OnClickListener createOnClickVibranceButton() {
         return new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -673,153 +689,75 @@ public class FilterShowActivity extends Activity implements OnItemClickListener
                 mImageShow.setVisibility(View.VISIBLE);
                 mImageShow.setShowControls(true);
                 ImagePreset preset = mImageShow.getImagePreset();
-                ImageFilter filter = preset.getFilter("Contrast");
+                ImageFilter filter = preset.getFilter("Hue");
                 if (filter == null) {
-                  ImageFilterContrast contrast = new ImageFilterContrast();
+                    ImageFilterHue contrast = new ImageFilterHue();
                     ImagePreset copy = new ImagePreset(preset);
                     copy.add(contrast);
                     copy.setHistoryName(contrast.name());
                     copy.setIsFx(false);
-                    filter = copy.getFilter("Contrast");
+                    filter = copy.getFilter("Hue");
                     mImageShow.setImagePreset(copy);
                 }
                 mImageShow.setCurrentFilter(filter);
                 unselectPanelButtons(mColorsPanelButtons);
-                mContrastButton.setSelected(true);
+                mVibranceButton.setSelected(true);
                 invalidateViews();
             }
         };
     }
 
-    private OnClickListener createOnClickSaturationButton() {
-      return new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-              hideImageViews();
-              mImageShow.setVisibility(View.VISIBLE);
-              mImageShow.setShowControls(true);
-              ImagePreset preset = mImageShow.getImagePreset();
-              ImageFilter filter = preset.getFilter("Saturated");
-              if (filter == null) {
-                ImageFilterSaturated sat = new ImageFilterSaturated();
-                  ImagePreset copy = new ImagePreset(preset);
-                  copy.add(sat);
-                  copy.setHistoryName(sat.name());
-                  copy.setIsFx(false);
-                  filter = copy.getFilter("Saturated");
-                  mImageShow.setImagePreset(copy);
-              }
-              mImageShow.setCurrentFilter(filter);
-              unselectPanelButtons(mColorsPanelButtons);
-              mSaturationButton.setSelected(true);
-              invalidateViews();
-          }
-      };
-  }
-
-    private OnClickListener createOnClickTintButton() {
-      return new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-              hideImageViews();
-              mImageShow.setVisibility(View.VISIBLE);
-              mImageShow.setShowControls(true);
-              ImagePreset preset = mImageShow.getImagePreset();
-              ImageFilter filter = preset.getFilter("Hue");
-              if (filter == null) {
-                ImageFilterHue contrast = new ImageFilterHue();
-                  ImagePreset copy = new ImagePreset(preset);
-                  copy.add(contrast);
-                  copy.setHistoryName(contrast.name());
-                  copy.setIsFx(false);
-                  filter = copy.getFilter("Hue");
-                  mImageShow.setImagePreset(copy);
-              }
-              mImageShow.setCurrentFilter(filter);
-              unselectPanelButtons(mColorsPanelButtons);
-              mTintButton.setSelected(true);
-              invalidateViews();
-          }
-      };
-  }
-
-    private OnClickListener createOnClickVibranceButton() {
-      return new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-              hideImageViews();
-              mImageShow.setVisibility(View.VISIBLE);
-              mImageShow.setShowControls(true);
-              ImagePreset preset = mImageShow.getImagePreset();
-              ImageFilter filter = preset.getFilter("Hue");
-              if (filter == null) {
-                ImageFilterHue contrast = new ImageFilterHue();
-                  ImagePreset copy = new ImagePreset(preset);
-                  copy.add(contrast);
-                  copy.setHistoryName(contrast.name());
-                  copy.setIsFx(false);
-                  filter = copy.getFilter("Hue");
-                  mImageShow.setImagePreset(copy);
-              }
-              mImageShow.setCurrentFilter(filter);
-              unselectPanelButtons(mColorsPanelButtons);
-              mVibranceButton.setSelected(true);
-              invalidateViews();
-          }
-      };
-  }
-
     private OnClickListener createOnClickExposureButton() {
-      return new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-              hideImageViews();
-              mImageShow.setVisibility(View.VISIBLE);
-              mImageShow.setShowControls(true);
-              ImagePreset preset = mImageShow.getImagePreset();
-              ImageFilter filter = preset.getFilter("Brightness");
-              if (filter == null) {
-                ImageFilterBrightness bright = new ImageFilterBrightness();
-                  ImagePreset copy = new ImagePreset(preset);
-                  copy.add(bright);
-                  copy.setHistoryName(bright.name());
-                  copy.setIsFx(false);
-                  filter = copy.getFilter("Brightness");
-                  mImageShow.setImagePreset(copy);
-              }
-              mImageShow.setCurrentFilter(filter);
-              unselectPanelButtons(mColorsPanelButtons);
-              mExposureButton.setSelected(true);
-              invalidateViews();
-          }
-      };
-  }
+        return new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                hideImageViews();
+                mImageShow.setVisibility(View.VISIBLE);
+                mImageShow.setShowControls(true);
+                ImagePreset preset = mImageShow.getImagePreset();
+                ImageFilter filter = preset.getFilter("Brightness");
+                if (filter == null) {
+                    ImageFilterBrightness bright = new ImageFilterBrightness();
+                    ImagePreset copy = new ImagePreset(preset);
+                    copy.add(bright);
+                    copy.setHistoryName(bright.name());
+                    copy.setIsFx(false);
+                    filter = copy.getFilter("Brightness");
+                    mImageShow.setImagePreset(copy);
+                }
+                mImageShow.setCurrentFilter(filter);
+                unselectPanelButtons(mColorsPanelButtons);
+                mExposureButton.setSelected(true);
+                invalidateViews();
+            }
+        };
+    }
 
     private OnClickListener createOnClickShadowRecoveryButton() {
-      return new View.OnClickListener() {
-          @Override
-          public void onClick(View v) {
-              hideImageViews();
-              mImageShow.setVisibility(View.VISIBLE);
-              mImageShow.setShowControls(true);
-              ImagePreset preset = mImageShow.getImagePreset();
-              ImageFilter filter = preset.getFilter("Hue");
-              if (filter == null) {
-                ImageFilterHue contrast = new ImageFilterHue();
-                  ImagePreset copy = new ImagePreset(preset);
-                  copy.add(contrast);
-                  copy.setHistoryName(contrast.name());
-                  copy.setIsFx(false);
-                  filter = copy.getFilter("Hue");
-                  mImageShow.setImagePreset(copy);
-              }
-              mImageShow.setCurrentFilter(filter);
-              unselectPanelButtons(mColorsPanelButtons);
-              mShadowRecoveryButton.setSelected(true);
-              invalidateViews();
-          }
-      };
-  }
+        return new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                hideImageViews();
+                mImageShow.setVisibility(View.VISIBLE);
+                mImageShow.setShowControls(true);
+                ImagePreset preset = mImageShow.getImagePreset();
+                ImageFilter filter = preset.getFilter("Hue");
+                if (filter == null) {
+                    ImageFilterHue contrast = new ImageFilterHue();
+                    ImagePreset copy = new ImagePreset(preset);
+                    copy.add(contrast);
+                    copy.setHistoryName(contrast.name());
+                    copy.setIsFx(false);
+                    filter = copy.getFilter("Hue");
+                    mImageShow.setImagePreset(copy);
+                }
+                mImageShow.setCurrentFilter(filter);
+                unselectPanelButtons(mColorsPanelButtons);
+                mShadowRecoveryButton.setSelected(true);
+                invalidateViews();
+            }
+        };
+    }
 
     // //////////////////////////////////////////////////////////////////////////////