refactoring imageshow

Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee

2 files changed, 10 insertions, 20 deletions

diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
index c2be85809..089b24118 100644
--- a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
+++ b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
@@ -16,25 +16,16 @@
 
 package com.android.gallery3d.filtershow.ui;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
-import com.android.gallery3d.filtershow.filters.ImageFilterBorder;
-import com.android.gallery3d.filtershow.filters.ImageFilterDownsample;
-import com.android.gallery3d.filtershow.filters.ImageFilterParametricBorder;
 
 public class FilterIconButton extends IconButton implements View.OnClickListener {
     private Bitmap mOverlayBitmap = null;
@@ -89,11 +80,9 @@ public class FilterIconButton extends IconButton implements View.OnClickListener
     @Override
     public void onClick(View v) {
         if (mController != null && mImageFilter != null) {
-            if (!isSelected()) {
-                mController.useFilter(mImageFilter);
-                mParentContainer.dispatchSetSelected(false);
-                setSelected(true);
-            }
+            mController.useFilter(mImageFilter);
+            mParentContainer.dispatchSetSelected(false);
+            setSelected(true);
         }
         if (mListener != null && mListener != this) {
             mListener.onClick(v);
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 5fbfc900f..80c893562 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -36,10 +36,10 @@ import android.widget.PopupMenu;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.filters.ImageFilterCurves;
-import com.android.gallery3d.filtershow.imageshow.ImageSlave;
+import com.android.gallery3d.filtershow.imageshow.ImageShow;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 
-public class ImageCurves extends ImageSlave {
+public class ImageCurves extends ImageShow {
 
     private static final String LOGTAG = "ImageCurves";
     Paint gPaint = new Paint();
@@ -124,9 +124,10 @@ public class ImageCurves extends ImageSlave {
     }
 
     private ImageFilterCurves curves() {
-        if (getMaster() != null) {
-            String filterName = getFilterName();
-            return (ImageFilterCurves) getImagePreset().getFilter(filterName);
+        String filterName = getFilterName();
+        ImagePreset p = getImagePreset();
+        if (p != null) {
+            return (ImageFilterCurves) p.getFilter(filterName);
         }
         return null;
     }
@@ -144,7 +145,7 @@ public class ImageCurves extends ImageSlave {
     }
 
     public void resetCurve() {
-        if (getMaster() != null && curves() != null) {
+        if (curves() != null) {
             curves().reset();
             updateCachedImage();
         }