From 969e22782b5aa91b09169926319e2a8c0ba12405 Mon Sep 17 00:00:00 2001 From: jinwu Date: Fri, 21 Sep 2018 18:40:21 +0800 Subject: Fix issues about zoom render values speed of zoom is slowed down rounding the value of detector.getScaleFactor rounding the value mZoomSig and mZoomFraction Change-Id: Ia40a739b82133bb144d63dce16cb6b9dea0c8fcd CRs-Fixed: 2307773 --- src/com/android/camera/ui/ZoomRenderer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java index 48a565a6f..fac429a17 100755 --- a/src/com/android/camera/ui/ZoomRenderer.java +++ b/src/com/android/camera/ui/ZoomRenderer.java @@ -97,8 +97,8 @@ public class ZoomRenderer extends OverlayRenderer public void setZoom(float zoomValue) { mCamera2 = true; - mZoomSig = (int) zoomValue; - mZoomFraction = (int)(zoomValue * 10) % 10; + mZoomSig = Math.round(zoomValue * 10) / 10; + mZoomFraction = Math.round(zoomValue * 10) % 10; mCircleSize = (int) (mMinCircle + (mMaxCircle - mMinCircle) * (zoomValue - mZoomMinValue) / (mZoomMaxValue - mZoomMinValue)); } @@ -145,8 +145,8 @@ public class ZoomRenderer extends OverlayRenderer @Override public boolean onScale(ScaleGestureDetector detector) { - final float sf = detector.getScaleFactor(); - float circle = mCircleSize * sf * sf; + final float sf = (float) Math.round(detector.getScaleFactor() * 100) / 100f; + float circle = mCircleSize * sf; circle = Math.max(mMinCircle, circle); circle = Math.min(mMaxCircle, circle); if (mListener != null && circle != mCircleSize) { -- cgit v1.2.3