Refactor filters to simplify their creation/addition

Bug:7688780
Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0

14 files changed, 155 insertions, 32 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index cf10a3e55..724511a59 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -67,6 +67,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterParametricBorder;
 import com.android.gallery3d.filtershow.filters.ImageFilterRS;
 import com.android.gallery3d.filtershow.filters.ImageFilterSaturated;
 import com.android.gallery3d.filtershow.filters.ImageFilterShadows;
+import com.android.gallery3d.filtershow.filters.ImageFilterSharpen;
 import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet;
 import com.android.gallery3d.filtershow.filters.ImageFilterVibrance;
 import com.android.gallery3d.filtershow.filters.ImageFilterVignette;
@@ -294,46 +295,32 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
 
         mPanelController.addPanel(mColorsButton, mListColors, 3);
 
-        int[] recastIDs = {
-                R.id.tinyplanetButton,
-                R.id.vignetteButton,
-                R.id.vibranceButton,
-                R.id.contrastButton,
-                R.id.saturationButton,
-                R.id.bwfilterButton,
-                R.id.wbalanceButton,
-                R.id.hueButton,
-                R.id.exposureButton,
-                R.id.shadowRecoveryButton
-        };
         ImageFilter[] filters = {
                 new ImageFilterTinyPlanet(),
+                new ImageFilterWBalance(),
+                new ImageFilterExposure(),
                 new ImageFilterVignette(),
-                new ImageFilterVibrance(),
                 new ImageFilterContrast(),
-                new ImageFilterSaturated(),
-                new ImageFilterBwFilter(),
-                new ImageFilterWBalance(),
+                new ImageFilterShadows(),
+                new ImageFilterVibrance(),
+                // TODO: move sharpen and curves here
+                // sharpen
+                // curves
                 new ImageFilterHue(),
-                new ImageFilterExposure(),
-                new ImageFilterShadows()
+                new ImageFilterSaturated(),
+                new ImageFilterBwFilter()
         };
 
         for (int i = 0; i < filters.length; i++) {
             ImageSmallFilter fView = new ImageSmallFilter(this);
-            View v = listColors.findViewById(recastIDs[i]);
-            int pos = listColors.indexOfChild(v);
-            listColors.removeView(v);
-
             filters[i].setParameter(filters[i].getPreviewParameter());
-            if (v instanceof ImageButtonTitle)
-                filters[i].setName(((ImageButtonTitle) v).getText());
+            filters[i].setName(getString(filters[i].getTextId()));
             fView.setImageFilter(filters[i]);
             fView.setController(this);
             fView.setImageLoader(mImageLoader);
-            fView.setId(recastIDs[i]);
+            fView.setId(filters[i].getButtonId());
             mPanelController.addComponent(mColorsButton, fView);
-            listColors.addView(fView, pos);
+            listColors.addView(fView);
         }
 
         int[] overlayIDs = {
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index dd1c6b4eb..5629e7d1d 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -672,12 +672,12 @@ public class PanelController implements OnClickListener {
                 break;
             }
             case R.id.bwfilterButton: {
-            mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-            String ename = mCurrentImage.getContext().getString(R.string.bwfilter);
-            mUtilityPanel.setEffectName(ename);
-            ensureFilter(ename);
-            break;
-        }
+                mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
+                String ename = mCurrentImage.getContext().getString(R.string.bwfilter);
+                mUtilityPanel.setEffectName(ename);
+                ensureFilter(ename);
+                break;
+            }
             case R.id.wbalanceButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(false);
                 String ename = mCurrentImage.getContext().getString(R.string.wbalance);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index 7f4d5ed2a..2009449fb 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -47,6 +47,18 @@ public class ImageFilter implements Cloneable {
         filterType = type;
     }
 
+    public int getButtonId() {
+        return 0;
+    }
+
+    public int getTextId() {
+        return 0;
+    }
+
+    public int getOverlayBitmaps() {
+        return 0;
+    }
+
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
         ImageFilter filter = (ImageFilter) super.clone();
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
index 558abe3c3..1bb5c76ac 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 import android.graphics.Color;
 
@@ -29,6 +31,16 @@ public class ImageFilterBwFilter extends ImageFilter {
     }
 
     @Override
+    public int getButtonId() {
+        return R.id.bwfilterButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.bwfilter;
+    }
+
+    @Override
     public ImageFilter clone() throws CloneNotSupportedException {
         ImageFilterBwFilter filter = (ImageFilterBwFilter) super.clone();
         return filter;
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
index 0c3bb37ca..70e3d8589 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterContrast extends ImageFilter {
@@ -24,6 +26,16 @@ public class ImageFilterContrast extends ImageFilter {
         mName = "Contrast";
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.contrastButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.contrast;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float strength);
 
     @Override
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
index e38dc8eb5..63f860171 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterExposure extends ImageFilter {
@@ -24,6 +26,16 @@ public class ImageFilterExposure extends ImageFilter {
         mName = "Exposure";
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.exposureButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.exposure;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float bright);
 
     @Override
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
index 279718edb..e2ea388dc 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterHue extends ImageFilter {
@@ -29,6 +31,16 @@ public class ImageFilterHue extends ImageFilter {
     }
 
     @Override
+    public int getButtonId() {
+        return R.id.hueButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.hue;
+    }
+
+    @Override
     public ImageFilter clone() throws CloneNotSupportedException {
         ImageFilterHue filter = (ImageFilterHue) super.clone();
         filter.cmatrix = new ColorSpaceMatrix(cmatrix);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
index 1d3459195..129165b3e 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterSaturated extends ImageFilter {
@@ -24,6 +26,16 @@ public class ImageFilterSaturated extends ImageFilter {
         mName = "Saturated";
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.saturationButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.saturation;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float saturation);
 
     @Override
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
index 4e6b848ae..de8fcd5ea 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterShadows extends ImageFilter {
@@ -26,6 +28,16 @@ public class ImageFilterShadows extends ImageFilter {
     }
 
     @Override
+    public int getButtonId() {
+        return R.id.shadowRecoveryButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.shadow_recovery;
+    }
+
+    @Override
     public ImageFilter clone() throws CloneNotSupportedException {
         ImageFilterShadows filter = (ImageFilterShadows) super.clone();
         return filter;
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
index a355539c2..db29a8a91 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
@@ -28,6 +28,11 @@ public class ImageFilterSharpen extends ImageFilterRS {
     }
 
     @Override
+    public int getButtonId() {
+        return R.id.sharpenButton;
+    }
+
+    @Override
     public void createFilter(android.content.res.Resources res, float scaleFactor,
             boolean highQuality) {
         int w = mInPixelsAllocation.getType().getX();
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
index effd89ebe..36bd62630 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
@@ -22,6 +22,7 @@ import android.graphics.RectF;
 
 import com.adobe.xmp.XMPException;
 import com.adobe.xmp.XMPMeta;
+import com.android.gallery3d.R;
 import com.android.gallery3d.app.Log;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 
@@ -59,6 +60,16 @@ public class ImageFilterTinyPlanet extends ImageFilter {
         mAngle = 0;
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.tinyplanetButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.tinyplanet;
+    }
+
     public void setAngle(float angle) {
         mAngle = angle;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
index 34f8b245e..7720d0490 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterVibrance extends ImageFilter {
@@ -24,6 +26,16 @@ public class ImageFilterVibrance extends ImageFilter {
         mName = "Vibrance";
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.vibranceButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.vibrance;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float bright);
 
     @Override
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
index 7a471e5b9..3c904fa6c 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterVignette extends ImageFilter {
@@ -25,6 +27,16 @@ public class ImageFilterVignette extends ImageFilter {
         mName = "Vignette";
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.vignetteButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.vignette;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float strength);
 
     @Override
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
index 35d439ab4..b2842f208 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
@@ -16,6 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+
 import android.graphics.Bitmap;
 
 public class ImageFilterWBalance extends ImageFilter {
@@ -26,6 +28,16 @@ public class ImageFilterWBalance extends ImageFilter {
         mName = "WBalance";
     }
 
+    @Override
+    public int getButtonId() {
+        return R.id.wbalanceButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.wbalance;
+    }
+
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, int locX, int locY);
 
     @Override