diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-24 12:20:13 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-24 12:20:13 -0700 |
commit | 593986b9513fe6b2c158829d389a116387488e00 (patch) | |
tree | ec53cd6bb8c93ea9d6c9056df566316fe8f27bf9 /src/com/android | |
parent | 59822721c5cc723d8f9d4208f0a7a3163a39afce (diff) | |
parent | de8ad436e64a1d844a10f2dbfbb48d9e4d9b976e (diff) | |
download | android_packages_apps_Snap-593986b9513fe6b2c158829d389a116387488e00.tar.gz android_packages_apps_Snap-593986b9513fe6b2c158829d389a116387488e00.tar.bz2 android_packages_apps_Snap-593986b9513fe6b2c158829d389a116387488e00.zip |
Merge "SnapdragonCamera: Fix slow zooming issue" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/ui/ZoomRenderer.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index 0358bda7a..11bff7a8d 100644 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -50,7 +50,6 @@ public class ZoomRenderer extends OverlayRenderer private Rect mTextBounds; private int mOrientation; private boolean mCamera2 = false; - private float mZoomValue; private float mZoomMinValue; private float mZoomMaxValue; @@ -98,8 +97,9 @@ public class ZoomRenderer extends OverlayRenderer public void setZoom(float zoomValue) { mCamera2 = true; - mZoomValue = zoomValue; - mCircleSize = (int) (mMinCircle + (mMaxCircle - mMinCircle) * (mZoomValue - mZoomMinValue) / + mZoomSig = (int) zoomValue; + mZoomFraction = (int)(zoomValue * 10) % 10; + mCircleSize = (int) (mMinCircle + (mMaxCircle - mMinCircle) * (zoomValue - mZoomMinValue) / (mZoomMaxValue - mZoomMinValue)); } @@ -138,7 +138,6 @@ public class ZoomRenderer extends OverlayRenderer canvas.drawCircle((float) mCenterX, (float) mCenterY, mCircleSize, mPaint); String txt = mZoomSig+"."+mZoomFraction+"x"; - if (mCamera2) txt = "" + mZoomValue; mTextPaint.getTextBounds(txt, 0, txt.length(), mTextBounds); canvas.drawText(txt, mCenterX - mTextBounds.centerX(), mCenterY - mTextBounds.centerY(), mTextPaint); @@ -155,7 +154,6 @@ public class ZoomRenderer extends OverlayRenderer if (mCamera2) { float zoom = mZoomMinValue + (mZoomMaxValue - mZoomMinValue) / (mMaxCircle - mMinCircle) * (mCircleSize - mMinCircle); - zoom = ((int) (zoom * 10)) / 10.0f; mListener.onZoomValueChanged(zoom); } else { int zoom = mMinZoom + (int) ((mCircleSize - mMinCircle) * (mMaxZoom - mMinZoom) / |