diff options
author | Su Liu <suliu@codeaurora.org> | 2013-09-04 18:16:50 +0800 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
commit | 81b41090d9538992c125fec37069ba961fc15bec (patch) | |
tree | 06e5f9b8966aaed4fc7cba66368736a589a81045 /src/com/android/camera/ui | |
parent | 461a8209d21a834ac5ba20dbca6fd90da144cffa (diff) | |
download | android_packages_apps_Snap-81b41090d9538992c125fec37069ba961fc15bec.tar.gz android_packages_apps_Snap-81b41090d9538992c125fec37069ba961fc15bec.tar.bz2 android_packages_apps_Snap-81b41090d9538992c125fec37069ba961fc15bec.zip |
Camera: Change volume hard key button to zoom function
Able to capture image through volume hard key
button in camera application, change the function
to zoom function.
Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/ZoomRenderer.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index 9943b1c8d..be4996b41 100644 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -49,6 +49,7 @@ public class ZoomRenderer extends OverlayRenderer private int mZoomFraction; private Rect mTextBounds; private int mOrientation; + private Canvas mCanvas; public interface OnZoomChangedListener { void onZoomStart(); @@ -110,6 +111,7 @@ 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); @@ -125,6 +127,13 @@ 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(); @@ -139,6 +148,33 @@ public class ZoomRenderer extends OverlayRenderer return true; } + public boolean onScaleStepResize(boolean direction) { + int zoom; + float circle; + float circleStep = (mMaxCircle - mMinCircle)/10; + if(direction){ + circle = (int) (mCircleSize + circleStep); + } else { + circle = (int) (mCircleSize - circleStep); + } + circle = Math.max(mMinCircle, circle); + circle = Math.min(mMaxCircle, circle); + if (mListener != null && (int) circle != mCircleSize + && ((mMaxCircle - mMinCircle) != 0)) { + mCircleSize = (int) circle; + zoom = mMinZoom + (int) ((mCircleSize - mMinCircle) + * (mMaxZoom - mMinZoom) / (mMaxCircle - mMinCircle)); + if (mListener != null) { + mListener.onZoomStart(); + mListener.onZoomValueChanged(zoom); + mListener.onZoomEnd(); + } + return true; + } else { + return false; + } + } + @Override public boolean onScaleBegin(ScaleGestureDetector detector) { setVisible(true); |