diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-30 10:12:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-30 10:12:51 -0800 |
| commit | 81cf9b252b034ca2dfa29318cd726f903de37531 (patch) | |
| tree | 96a25c24ff9aef63332313623c2d7c370d6d43aa /src | |
| parent | 9a3f6f8f1fbbbb827ff3a1f498204daa80331cf5 (diff) | |
| parent | 0843643301fee5b2b0993a421b663e2dac529b0c (diff) | |
| download | android_packages_apps_Snap-81cf9b252b034ca2dfa29318cd726f903de37531.tar.gz android_packages_apps_Snap-81cf9b252b034ca2dfa29318cd726f903de37531.tar.bz2 android_packages_apps_Snap-81cf9b252b034ca2dfa29318cd726f903de37531.zip | |
Merge "Change the FD ROI to range" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/ui/Camera2FaceView.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/com/android/camera/ui/Camera2FaceView.java b/src/com/android/camera/ui/Camera2FaceView.java index 53f7e2f09..f99351b30 100755 --- a/src/com/android/camera/ui/Camera2FaceView.java +++ b/src/com/android/camera/ui/Camera2FaceView.java @@ -164,9 +164,6 @@ public class Camera2FaceView extends FaceView { mMatrix.postRotate(mOrientation); // postRotate is clockwise canvas.rotate(-mOrientation); // rotate is counter-clockwise (for canvas) - float rectWidth; - float rectHeight; - float diameter; int extendFaceSize = 0; extendFaceSize = mExFaces == null? 0 : mExFaces.length; for (int i = 0; i < mFaces.length; i++) { @@ -187,12 +184,7 @@ public class Camera2FaceView extends FaceView { if (LOGV) CameraUtil.dumpRect(mRect, "Transformed rect"); mPaint.setColor(mColor); mRect.offset(dx, dy); - - rectHeight = mRect.bottom-mRect.top; - rectWidth = mRect.right - mRect.left; - diameter = rectHeight > rectWidth ? rectWidth : rectHeight; - - canvas.drawCircle(mRect.centerX(), mRect.centerY(), diameter/2, mPaint); + canvas.drawRect(mRect, mPaint); if (i < extendFaceSize && mExFaces[i] != null) { ExtendedFace exFace = mExFaces[i]; |