diff options
author | jinwu <jinwu@codeaurora.org> | 2018-09-21 18:40:21 +0800 |
---|---|---|
committer | jinwu <jinwu@codeaurora.org> | 2018-09-21 18:40:21 +0800 |
commit | 969e22782b5aa91b09169926319e2a8c0ba12405 (patch) | |
tree | cdbbc107e44f0e5208f3f5020d14a29e3a1542f8 /src/com/android/camera/ui | |
parent | a26301351c28e820f6c2346ebd07265cfed14c8b (diff) | |
download | android_packages_apps_Snap-969e22782b5aa91b09169926319e2a8c0ba12405.tar.gz android_packages_apps_Snap-969e22782b5aa91b09169926319e2a8c0ba12405.tar.bz2 android_packages_apps_Snap-969e22782b5aa91b09169926319e2a8c0ba12405.zip |
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
Diffstat (limited to 'src/com/android/camera/ui')
-rwxr-xr-x | src/com/android/camera/ui/ZoomRenderer.java | 8 |
1 files 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) { |