From da4de5aa86b49be455efe396455b77be44dec684 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Mon, 28 Jan 2013 16:36:46 -0800
Subject: Refactor filters parameters - introduce FilterRepresentations -
 change filters lifecycle

Change-Id: I9416fca47a334d532a347cd5577795738c870933
---
 .../gallery3d/filtershow/imageshow/ImageShow.java  | 28 +---------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'src/com/android/gallery3d/filtershow/imageshow/ImageShow.java')

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 93c4622fa..8b58240a2 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -141,12 +141,6 @@ public class ImageShow extends View implements OnGestureListener,
         if (mSeekBar != null) {
             mSeekBar.setOnSeekBarChangeListener(this);
         }
-        if (getCurrentFilter() != null) {
-            int parameter = getCurrentFilter().getParameter();
-            int maxp = getCurrentFilter().getMaxParameter();
-            int minp = getCurrentFilter().getMinParameter();
-            updateSeekBar(parameter, minp, maxp);
-        }
     }
 
     private int parameterToUI(int parameter, int minp, int maxp, int uimax) {
@@ -178,11 +172,7 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public void resetParameter() {
-        ImageFilter currentFilter = getCurrentFilter();
-        if (currentFilter != null) {
-            updateSeekBar(currentFilter.getDefaultParameter(),
-                    getCurrentFilter().getMinParameter(), getCurrentFilter().getMaxParameter());
-        }
+        // TODO: implement reset
     }
 
     public void setPanelController(PanelController controller) {
@@ -195,16 +185,6 @@ public class ImageShow extends View implements OnGestureListener,
 
     @Override
     public void onNewValue(int parameter) {
-        int maxp = ImageFilter.DEFAULT_MAX_PARAMETER;
-        int minp = ImageFilter.DEFAULT_MIN_PARAMETER;
-        if (getCurrentFilter() != null) {
-            if (getCurrentFilter().getParameter() == parameter) {
-                return;
-            }
-            getCurrentFilter().setParameter(parameter);
-            maxp = getCurrentFilter().getMaxParameter();
-            minp = getCurrentFilter().getMinParameter();
-        }
         if (getImagePreset() != null) {
             getImagePreset().fillImageStateAdapter(mMasterImage.getState());
         }
@@ -616,12 +596,6 @@ public class ImageShow extends View implements OnGestureListener,
     @Override
     public void onProgressChanged(SeekBar arg0, int progress, boolean arg2) {
         int parameter = progress;
-        if (getCurrentFilter() != null) {
-            int maxp = getCurrentFilter().getMaxParameter();
-            int minp = getCurrentFilter().getMinParameter();
-            parameter = uiToParameter(progress, minp, maxp, arg0.getMax());
-        }
-
         onNewValue(parameter);
     }
 
-- 
cgit v1.2.3