diff options
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 12 | ||||
| -rw-r--r-- | src/com/android/camera/PreviewGestures.java | 10 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/ui/ZoomRenderer.java | 37 |
4 files changed, 27 insertions, 43 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 49707d81e..6e116f9a9 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -53,7 +53,6 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.PopupWindow; import android.widget.Toast; -import android.graphics.Canvas; import com.android.camera.CameraPreference.OnPreferenceChangedListener; import com.android.camera.FocusOverlayManager.FocusUI; @@ -1249,22 +1248,13 @@ public class PhotoUI implements PieListener, mFaceView.setFaces(faces); } - - public boolean onScaleStepResize(boolean direction) - { + public boolean onScaleStepResize(boolean direction) { if(mGestures != null){ return mGestures.onScaleStepResize(direction); } return false; } - public void onScaleChangeDraw(Canvas canvas) - { - if(mGestures != null){ - mGestures.onScaleChangeDraw(canvas); - } - } - @Override public void onDisplayChanged() { Log.d(TAG, "Device flip detected."); diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java index 4a1eae083..42d64bb3c 100644 --- a/src/com/android/camera/PreviewGestures.java +++ b/src/com/android/camera/PreviewGestures.java @@ -20,7 +20,6 @@ import android.view.GestureDetector; import android.view.MotionEvent; import android.view.ScaleGestureDetector; import android.view.View; -import android.graphics.Canvas; import com.android.camera.PhotoMenu; import com.android.camera.VideoMenu; @@ -292,19 +291,12 @@ public class PreviewGestures mZoom.onScaleEnd(detector); } - public boolean onScaleStepResize(boolean direction) - { + public boolean onScaleStepResize(boolean direction) { if(mZoom != null){ return mZoom.onScaleStepResize(direction); } return false; } - public void onScaleChangeDraw(Canvas canvas) - { - if(mZoom != null){ - mZoom.onScaleChangeDraw(canvas); - } - } } diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 69dd4c629..69a231552 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -22,7 +22,6 @@ import org.codeaurora.snapcam.R; import android.content.res.Configuration; import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Point; import android.graphics.drawable.ColorDrawable; @@ -990,21 +989,13 @@ public class VideoUI implements PieRenderer.PieListener, return mCameraControls.getVisibility() == View.VISIBLE; } - public boolean onScaleStepResize(boolean direction) - { + public boolean onScaleStepResize(boolean direction) { if(mGestures != null){ return mGestures.onScaleStepResize(direction); } return false; } - public void onScaleChangeDraw(Canvas canvas) - { - if(mGestures != null){ - mGestures.onScaleChangeDraw(canvas); - } - } - @Override public void onDisplayChanged() { mCameraControls.checkLayoutFlip(); diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index be4996b41..bddd5cc6a 100644 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -22,6 +22,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; +import android.os.Handler; import android.view.ScaleGestureDetector; import org.codeaurora.snapcam.R; @@ -35,6 +36,8 @@ public class ZoomRenderer extends OverlayRenderer private int mMinZoom; private OnZoomChangedListener mListener; + private final Handler mHandler = new Handler(); + private ScaleGestureDetector mDetector; private Paint mPaint; private Paint mTextPaint; @@ -47,9 +50,9 @@ public class ZoomRenderer extends OverlayRenderer private int mOuterStroke; private int mZoomSig; private int mZoomFraction; + private boolean mInZoom; private Rect mTextBounds; private int mOrientation; - private Canvas mCanvas; public interface OnZoomChangedListener { void onZoomStart(); @@ -111,7 +114,6 @@ public class ZoomRenderer extends OverlayRenderer @Override public void onDraw(Canvas canvas) { - mCanvas = canvas; canvas.rotate(mOrientation, mCenterX, mCenterY); mPaint.setStrokeWidth(mInnerStroke); canvas.drawCircle(mCenterX, mCenterY, mMinCircle, mPaint); @@ -127,13 +129,6 @@ public class ZoomRenderer extends OverlayRenderer mTextPaint); } - public void onScaleChangeDraw(Canvas canvas) { - if(mCanvas != null){ - onDraw(mCanvas); - } - } - - @Override public boolean onScale(ScaleGestureDetector detector) { final float sf = detector.getScaleFactor(); @@ -151,7 +146,7 @@ public class ZoomRenderer extends OverlayRenderer public boolean onScaleStepResize(boolean direction) { int zoom; float circle; - float circleStep = (mMaxCircle - mMinCircle)/10; + float circleStep = (mMaxCircle - mMinCircle)/18; if(direction){ circle = (int) (mCircleSize + circleStep); } else { @@ -160,14 +155,20 @@ public class ZoomRenderer extends OverlayRenderer circle = Math.max(mMinCircle, circle); circle = Math.min(mMaxCircle, circle); if (mListener != null && (int) circle != mCircleSize - && ((mMaxCircle - mMinCircle) != 0)) { + && ((mMaxCircle - mMinCircle) > 0)) { mCircleSize = (int) circle; zoom = mMinZoom + (int) ((mCircleSize - mMinCircle) * (mMaxZoom - mMinZoom) / (mMaxCircle - mMinCircle)); if (mListener != null) { - mListener.onZoomStart(); + mHandler.removeCallbacks(mOnZoomEnd); + if (!mInZoom) { + mInZoom = true; + setVisible(true); + mListener.onZoomStart(); + update(); + } mListener.onZoomValueChanged(zoom); - mListener.onZoomEnd(); + mHandler.postDelayed(mOnZoomEnd, 300); } return true; } else { @@ -175,6 +176,16 @@ public class ZoomRenderer extends OverlayRenderer } } + Runnable mOnZoomEnd = new Runnable() { + public void run() { + mInZoom = false; + setVisible(false); + if (mListener != null) { + mListener.onZoomEnd(); + } + } + }; + @Override public boolean onScaleBegin(ScaleGestureDetector detector) { setVisible(true); |