Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryce

2 files changed, 0 insertions, 30 deletions

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index f490859c9..4c74b16ca 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -75,10 +75,6 @@ public class ImageShow extends View implements OnGestureListener,
     private Bitmap mFiltersOnlyImage = null;
     private Bitmap mFilteredImage = null;
 
-    private final boolean USE_SLIDER_GESTURE = false; // set to true to have
-                                                      // slider gesture
-    protected SliderController mSliderController = new SliderController();
-
     private GestureDetector mGestureDetector = null;
 
     private HistoryAdapter mHistoryAdapter = null;
@@ -198,9 +194,6 @@ public class ImageShow extends View implements OnGestureListener,
             updateSeekBar(currentFilter.getDefaultParameter(),
                     getCurrentFilter().getMinParameter(), getCurrentFilter().getMaxParameter());
         }
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.reset();
-        }
     }
 
     public void setPanelController(PanelController controller) {
@@ -244,9 +237,6 @@ public class ImageShow extends View implements OnGestureListener,
 
     public ImageShow(Context context, AttributeSet attrs) {
         super(context, attrs);
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.setListener(this);
-        }
         mHistoryAdapter = new HistoryAdapter(context, R.layout.filtershow_history_operation_row,
                 R.id.rowTextView);
         mImageStateAdapter = new ImageStateAdapter(context,
@@ -257,9 +247,6 @@ public class ImageShow extends View implements OnGestureListener,
 
     public ImageShow(Context context) {
         super(context);
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.setListener(this);
-        }
         mHistoryAdapter = new HistoryAdapter(context, R.layout.filtershow_history_operation_row,
                 R.id.rowTextView);
         setupGestureDetector(context);
@@ -275,10 +262,6 @@ public class ImageShow extends View implements OnGestureListener,
         int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
         int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
         setMeasuredDimension(parentWidth, parentHeight);
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.setWidth(parentWidth);
-            mSliderController.setHeight(parentHeight);
-        }
     }
 
     public void setSeekBar(SeekBar seekBar) {
@@ -380,12 +363,6 @@ public class ImageShow extends View implements OnGestureListener,
                     1.5f * mTextPadding, mPaint);
         }
 
-        if (showControls()) {
-            if (USE_SLIDER_GESTURE) {
-                mSliderController.onDraw(canvas);
-            }
-        }
-
         drawToast(canvas);
     }
 
@@ -682,9 +659,6 @@ public class ImageShow extends View implements OnGestureListener,
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         super.onTouchEvent(event);
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.onTouchEvent(event);
-        }
         if (mGestureDetector != null) {
             mGestureDetector.onTouchEvent(event);
         }
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java b/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
index c7586fe9b..b66da0128 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
@@ -128,10 +128,6 @@ public class ImageZoom extends ImageSlave {
         drawImage(canvas, filteredImage);
         canvas.restore();
 
-        if (showControls()) {
-            mSliderController.onDraw(canvas);
-        }
-
         drawToast(canvas);
     }