Refactoring: removed old filtershow slider.

[android-x86/packages-apps-Gallery2.git] / 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 358d5b7..7bd7d11 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -23,6 +23,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.net.Uri;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
@@ -74,16 +75,12 @@ 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;
     private ImageStateAdapter mImageStateAdapter = null;
 
-    private Rect mImageBounds = new Rect();
+    protected Rect mImageBounds = new Rect();
 
     private boolean mTouchShowOriginal = false;
     private long mTouchShowOriginalDate = 0;
@@ -199,9 +196,6 @@ public class ImageShow extends View implements OnGestureListener,
         if (currentFilter != null) {
             onNewValue(currentFilter.getDefaultParameter());
         }
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.reset();
-        }
     }
 
     public void setPanelController(PanelController controller) {
@@ -246,9 +240,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,
@@ -259,9 +250,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);
@@ -277,10 +265,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) {
@@ -324,6 +308,10 @@ public class ImageShow extends View implements OnGestureListener,
         return dst;
     }
 
+    public Rect getImageCropBounds() {
+        return GeometryMath.roundNearest(getImagePreset().mGeoData.getPreviewCropBounds());
+    }
+
     public Rect getDisplayedImageBounds() {
         return mImageBounds;
     }
@@ -378,12 +366,6 @@ public class ImageShow extends View implements OnGestureListener,
                     1.5f * mTextPadding, mPaint);
         }
 
-        if (showControls()) {
-            if (USE_SLIDER_GESTURE) {
-                mSliderController.onDraw(canvas);
-            }
-        }
-
         drawToast(canvas);
     }
 
@@ -646,13 +628,13 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public void updateImage() {
+        invalidate();
         if (!updateGeometryFlags()) {
             return;
         }
         Bitmap bitmap = mImageLoader.getOriginalBitmapLarge();
         if (bitmap != null) {
             imageSizeChanged(bitmap);
-            invalidate();
         }
     }
 
@@ -669,12 +651,17 @@ public class ImageShow extends View implements OnGestureListener,
         mImageLoader.saveImage(getImagePreset(), filterShowActivity, file);
     }
 
+    public void saveToUri(Bitmap f, Uri u, String m, FilterShowActivity filterShowActivity) {
+        mImageLoader.saveToUri(f, u, m, filterShowActivity);
+    }
+
+    public void returnFilteredResult(FilterShowActivity filterShowActivity) {
+        mImageLoader.returnFilteredResult(getImagePreset(), filterShowActivity);
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         super.onTouchEvent(event);
-        if (USE_SLIDER_GESTURE) {
-            mSliderController.onTouchEvent(event);
-        }
         if (mGestureDetector != null) {
             mGestureDetector.onTouchEvent(event);
         }