diff options
author | zhuw <zhuw@codeaurora.org> | 2018-03-21 16:42:58 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-21 03:35:30 -0700 |
commit | c9dae660aa23504d20b43554772e963c66fa47e2 (patch) | |
tree | 9c5f6bea5809895cdf9238e0bb109a7260e08221 /src/com/android/camera | |
parent | 57407dcab3f91547f663c3fb8dd70ea4d96d4031 (diff) | |
download | android_packages_apps_Snap-c9dae660aa23504d20b43554772e963c66fa47e2.tar.gz android_packages_apps_Snap-c9dae660aa23504d20b43554772e963c66fa47e2.tar.bz2 android_packages_apps_Snap-c9dae660aa23504d20b43554772e963c66fa47e2.zip |
Fix FD offset when back from recording in zoom condition
reset camera bound when back
Change-Id: Ia9527ad698e2a272c677f46d409f2e2095ed02b3
Diffstat (limited to 'src/com/android/camera')
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 7 | ||||
-rwxr-xr-x | src/com/android/camera/CaptureUI.java | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d2efbdab5..95f2fe0d8 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -902,12 +902,6 @@ public class CaptureModule implements CameraModule, PhotoController, mCaptureHDRTestEnable = false; } - public void startFaceDetection() { - mUI.onStartFaceDetection(mDisplayOrientation, - mSettingsManager.isFacingFront(getMainCameraId()), - mSettingsManager.getSensorActiveArraySize(getMainCameraId())); - } - private boolean canStartMonoPreview() { return getCameraMode() == MONO_MODE || (getCameraMode() == DUAL_MODE && isMonoPreviewOn()); @@ -5508,6 +5502,7 @@ public class CaptureModule implements CameraModule, PhotoController, else { mUI.onStartFaceDetection(mDisplayOrientation, mSettingsManager.isFacingFront(getMainCameraId()), + mCropRegion[getMainCameraId()], mSettingsManager.getSensorActiveArraySize(getMainCameraId())); } } diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 0d0b3ee7f..745483493 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -1605,14 +1605,15 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void resumeFaceDetection() { } - public void onStartFaceDetection(int orientation, boolean mirror, Rect cameraBound) { + public void onStartFaceDetection(int orientation, boolean mirror, Rect cameraBound, + Rect originalCameraBound) { mFaceView.setBlockDraw(false); mFaceView.clear(); mFaceView.setVisibility(View.VISIBLE); mFaceView.setDisplayOrientation(orientation); mFaceView.setMirror(mirror); mFaceView.setCameraBound(cameraBound); - mFaceView.setOriginalCameraBound(cameraBound); + mFaceView.setOriginalCameraBound(originalCameraBound); mFaceView.setZoom(mModule.getZoomValue()); mFaceView.resume(); } |