From 6612b3c922aa9045342794f3d2ae19cf52ded79b Mon Sep 17 00:00:00 2001 From: Paul Rohde Date: Fri, 5 Dec 2014 12:17:15 -0800 Subject: Drop new focus indicator into Camera2. * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b --- src/com/android/camera/VideoModule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/com/android/camera/VideoModule.java') diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 12e045440..71ded0596 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1481,7 +1481,7 @@ public class VideoModule implements CameraModule, R.array.pref_video_focusmode_default_array); mFocusManager = new FocusOverlayManager(mPreferences, defaultFocusModes, mParameters, this, mirror, - mActivity.getMainLooper(), mUI, mActivity); + mActivity.getMainLooper(), mUI.getFocusRing(), mActivity); } } @@ -3405,7 +3405,6 @@ public class VideoModule implements CameraModule, if (mParameters.getMaxNumDetectedFaces() > 0) { mFaceDetectionStarted = false; mCameraDevice.setFaceDetectionCallback(null, null); - mUI.pauseFaceDetection(); mCameraDevice.stopFaceDetection(); mUI.onStopFaceDetection(); } -- cgit v1.2.3