summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-12-13 22:35:25 -0800
committerRuben Brunk <rubenbrunk@google.com>2012-12-13 22:35:25 -0800
commit19ce6823b6f7f3779f0695dd73b5733e5391c8be (patch)
tree8f68931578dce77e10f5855b5e6438b84f7a55b2
parent7f7f875515cbafa91ca935748e6f9e97fa0b6b76 (diff)
downloadandroid_packages_apps_Snap-19ce6823b6f7f3779f0695dd73b5733e5391c8be.tar.gz
android_packages_apps_Snap-19ce6823b6f7f3779f0695dd73b5733e5391c8be.tar.bz2
android_packages_apps_Snap-19ce6823b6f7f3779f0695dd73b5733e5391c8be.zip
Refactoring: removed old filtershow slider.
Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageShow.java26
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java4
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 d9df7b7fc..7bd7d1193 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;
@@ -200,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) {
@@ -247,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,
@@ -260,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);
@@ -278,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) {
@@ -383,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);
}
@@ -685,9 +662,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);
}