diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-21 04:17:16 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-21 04:17:16 -0700 |
commit | 5f79491eeff6b70dc6af076aaef13fc241dae00c (patch) | |
tree | 5e1d82e501303a0b3d6151d5e9fa7dfe5a310808 /src/com/android | |
parent | e41f80d0a5ddb60ccb1f3c1e2be5cca73abeae2e (diff) | |
parent | 222b96c4063b1b8276a7c376d266cce207c2ad2e (diff) | |
download | android_packages_apps_Snap-5f79491eeff6b70dc6af076aaef13fc241dae00c.tar.gz android_packages_apps_Snap-5f79491eeff6b70dc6af076aaef13fc241dae00c.tar.bz2 android_packages_apps_Snap-5f79491eeff6b70dc6af076aaef13fc241dae00c.zip |
Merge "Camera2: fix face still display after unmark the face detect option"
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index cb76c56e9..31e5c87e7 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -820,7 +820,7 @@ public class PhotoModule mFaceDetectionStarted = false; mCameraDevice.setFaceDetectionCallback(null, null); mCameraDevice.stopFaceDetection(); - mUI.clearFaces(); + mUI.onStopFaceDetection(); } } diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 419cca22b..5a085dca5 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -920,6 +920,7 @@ public class PhotoUI implements PieListener, } public void onStartFaceDetection(int orientation, boolean mirror) { + mFaceView.setBlockDraw(false); mFaceView.clear(); mFaceView.setVisibility(View.VISIBLE); mFaceView.setDisplayOrientation(orientation); @@ -927,6 +928,13 @@ public class PhotoUI implements PieListener, mFaceView.resume(); } + public void onStopFaceDetection() { + if (mFaceView != null) { + mFaceView.setBlockDraw(true); + mFaceView.clear(); + } + } + @Override public void onFaceDetection(Face[] faces, CameraManager.CameraProxy camera) { mFaceView.setFaces(faces); |