Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce

4 files changed, 3 insertions, 117 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index f7147eac1..8da8113de 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -814,7 +814,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
     }
 
     public void hideImageViews() {
-        mImageShow.setShowControls(false); // reset
         for (View view : mImageViews) {
             view.setVisibility(View.GONE);
         }
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 18a9585a6..cff07ff61 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -386,7 +386,7 @@ public class PanelController implements OnClickListener {
     }
 
     public void showDefaultImageView() {
-        showImageView(R.id.imageShow).setShowControls(false);
+        showImageView(R.id.imageShow);
         MasterImage.getImage().setCurrentFilter(null);
         MasterImage.getImage().setCurrentFilterRepresentation(null);
     }
@@ -515,7 +515,6 @@ public class PanelController implements OnClickListener {
                         mCurrentImage = showImageView(representation.getEditorId());
                     }
                 }
-                mCurrentImage.setShowControls(representation.showEditingControls());
                 mUtilityPanel.setShowParameter(representation.showParameterValue());
 
                 mCurrentImage.select();
@@ -533,7 +532,7 @@ public class PanelController implements OnClickListener {
 
         switch (view.getId()) {
             case R.id.tinyplanetButton: {
-                mCurrentImage = showImageView(R.id.imageTinyPlanet).setShowControls(true);
+                mCurrentImage = showImageView(R.id.imageTinyPlanet);
                 String ename = mCurrentImage.getContext().getString(R.string.tinyplanet);
                 mUtilityPanel.setEffectName(ename);
                 if (!mDisableFilterButtons) {
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index 79223980d..93875c025 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -40,9 +40,7 @@ import java.io.File;
 
 public class ImageShow extends View implements OnGestureListener,
         ScaleGestureDetector.OnScaleGestureListener,
-        OnDoubleTapListener,
-        SliderListener,
-        OnSeekBarChangeListener {
+        OnDoubleTapListener {
 
     private static final String LOGTAG = "ImageShow";
 
@@ -82,16 +80,10 @@ public class ImageShow extends View implements OnGestureListener,
         return new GeometryMetadata(getImagePreset().mGeoData);
     }
 
-    public void setGeometry(GeometryMetadata d) {
-        getImagePreset().mGeoData.set(d);
-    }
-
-    private boolean mShowControls = false;
     private String mToast = null;
     private boolean mShowToast = false;
     private boolean mImportantToast = false;
 
-    private SeekBar mSeekBar = null;
     private PanelController mController = null;
 
     private FilterShowActivity mActivity = null;
@@ -131,30 +123,9 @@ public class ImageShow extends View implements OnGestureListener,
     private final Handler mHandler = new Handler();
 
     public void select() {
-        if (mSeekBar != null) {
-            mSeekBar.setOnSeekBarChangeListener(this);
-        }
-    }
-
-    private int parameterToUI(int parameter, int minp, int maxp, int uimax) {
-        return (uimax * (parameter - minp)) / (maxp - minp);
-    }
-
-    private int uiToParameter(int ui, int minp, int maxp, int uimax) {
-        return ((maxp - minp) * ui) / uimax + minp;
-    }
-
-    public void updateSeekBar(int parameter, int minp, int maxp) {
-        if (mSeekBar == null) {
-            return;
-        }
-        int seekMax = mSeekBar.getMax();
-        int progress = parameterToUI(parameter, minp, maxp, seekMax);
-        mSeekBar.setProgress(progress);
     }
 
     public void unselect() {
-
     }
 
     public boolean hasModifications() {
@@ -176,7 +147,6 @@ public class ImageShow extends View implements OnGestureListener,
         return mController;
     }
 
-    @Override
     public void onNewValue(int parameter) {
         if (getImagePreset() != null) {
             getImagePreset().fillImageStateAdapter(MasterImage.getImage().getState());
@@ -192,17 +162,6 @@ public class ImageShow extends View implements OnGestureListener,
         return mTouch;
     }
 
-    @Override
-    public void onTouchDown(float x, float y) {
-        mTouch.x = (int) x;
-        mTouch.y = (int) y;
-        invalidate();
-    }
-
-    @Override
-    public void onTouchUp() {
-    }
-
     public ImageShow(Context context, AttributeSet attrs) {
         super(context, attrs);
 
@@ -231,10 +190,6 @@ public class ImageShow extends View implements OnGestureListener,
         setMeasuredDimension(parentWidth, parentHeight);
     }
 
-    public void setSeekBar(SeekBar seekBar) {
-        mSeekBar = seekBar;
-    }
-
     public ImageFilter getCurrentFilter() {
         return MasterImage.getImage().getCurrentFilter();
     }
@@ -476,28 +431,6 @@ public class ImageShow extends View implements OnGestureListener,
         }
     }
 
-    public ImageShow setShowControls(boolean value) {
-        mShowControls = value;
-        if (mShowControls) {
-            if (mSeekBar != null) {
-                mSeekBar.setVisibility(View.VISIBLE);
-            }
-        } else {
-            if (mSeekBar != null) {
-                mSeekBar.setVisibility(View.INVISIBLE);
-            }
-        }
-        return this;
-    }
-
-    public boolean showControls() {
-        return mShowControls;
-    }
-
-    public boolean showHires() {
-        return true;
-    }
-
     public boolean showTitle() {
         return false;
     }
@@ -638,48 +571,6 @@ public class ImageShow extends View implements OnGestureListener,
         invalidate();
     }
 
-    public float getImageRotation() {
-        return getImagePreset().mGeoData.getRotation();
-    }
-
-    public float getImageRotationZoomFactor() {
-        return getImagePreset().mGeoData.getScaleFactor();
-    }
-
-    public void setImageRotation(float r) {
-        getImagePreset().mGeoData.setRotation(r);
-    }
-
-    public void setImageRotationZoomFactor(float f) {
-        getImagePreset().mGeoData.setScaleFactor(f);
-    }
-
-    public void setImageRotation(float imageRotation,
-            float imageRotationZoomFactor) {
-        float r = getImageRotation();
-        if (imageRotation != r) {
-            invalidate();
-        }
-        setImageRotation(imageRotation);
-        setImageRotationZoomFactor(imageRotationZoomFactor);
-    }
-
-    @Override
-    public void onProgressChanged(SeekBar arg0, int progress, boolean arg2) {
-        int parameter = progress;
-        onNewValue(parameter);
-    }
-
-    @Override
-    public void onStartTrackingTouch(SeekBar arg0) {
-        // TODO Auto-generated method stub
-    }
-
-    @Override
-    public void onStopTrackingTouch(SeekBar arg0) {
-        // TODO Auto-generated method stub
-    }
-
     @Override
     public boolean onDoubleTap(MotionEvent arg0) {
         // TODO Auto-generated method stub
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java b/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
index 263a5b5bf..0e32dc1e1 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
@@ -49,9 +49,7 @@ public class ImageZoom extends ImageShow {
         mTouchDown = false;
     }
 
-    @Override
     public void onTouchDown(float x, float y) {
-        super.onTouchDown(x, y);
         if (mZoomedIn || mTouchDown) {
             return;
         }
@@ -81,7 +79,6 @@ public class ImageZoom extends ImageShow {
         invalidate();
     }
 
-    @Override
     public void onTouchUp() {
         mTouchDown = false;
     }