diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-25 17:20:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-25 17:20:34 -0700 |
| commit | db0f3d968ba24e7aab4af9b1c35801cc71a4ea3c (patch) | |
| tree | 175234f4bbb6cf7548920bdb714e0d3952fd4dd5 /src/com/android/camera/ui | |
| parent | 18ec4d4dcac362e3ea5dcdad15a8a5b9b554d740 (diff) | |
| parent | 969e22782b5aa91b09169926319e2a8c0ba12405 (diff) | |
| download | android_packages_apps_Snap-db0f3d968ba24e7aab4af9b1c35801cc71a4ea3c.tar.gz android_packages_apps_Snap-db0f3d968ba24e7aab4af9b1c35801cc71a4ea3c.tar.bz2 android_packages_apps_Snap-db0f3d968ba24e7aab4af9b1c35801cc71a4ea3c.zip | |
Merge "Fix issues about zoom render values" into camera-SnapdragonCamera.lnx.2.0
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) { |