From ae159942ae27f5798051851160b9bae652f5a118 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/FocusStateListener.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/com/android/camera/FocusStateListener.java') diff --git a/src/com/android/camera/FocusStateListener.java b/src/com/android/camera/FocusStateListener.java index 6c536c53b..459e4ec23 100644 --- a/src/com/android/camera/FocusStateListener.java +++ b/src/com/android/camera/FocusStateListener.java @@ -44,31 +44,31 @@ public class FocusStateListener { switch (focusState) { case CaptureResult.CONTROL_AF_STATE_ACTIVE_SCAN: Log.d(TAG, "CONTROL_AF_STATE_ACTIVE_SCAN onFocusStarted"); - mUI.onFocusStarted(); + mUI.getFocusRing().startActiveFocus(); break; case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED: Log.d(TAG, "CONTROL_AF_STATE_FOCUSED_LOCKED onFocusSucceeded"); - mUI.onFocusSucceeded(false); + mUI.getFocusRing().stopFocusAnimations(); break; case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED: Log.d(TAG, "CONTROL_AF_STATE_NOT_FOCUSED_LOCKED onFocusFailed"); - mUI.onFocusFailed(false); + mUI.getFocusRing().stopFocusAnimations(); break; case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED: Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_FOCUSED onFocusSucceeded"); - mUI.onFocusSucceeded(true); + mUI.getFocusRing().stopFocusAnimations(); break; case CaptureResult.CONTROL_AF_STATE_PASSIVE_SCAN: Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_SCAN onFocusStarted"); - mUI.onFocusStarted(); + mUI.getFocusRing().startPassiveFocus(); break; case CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED: Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_UNFOCUSED onFocusFailed"); - mUI.onFocusFailed(true); + mUI.getFocusRing().stopFocusAnimations(); break; case CaptureResult.CONTROL_AF_STATE_INACTIVE: Log.d(TAG, "CONTROL_AF_STATE_INACTIVE clearFocus"); - mUI.clearFocus(); + mUI.getFocusRing().stopFocusAnimations(); break; } } -- cgit v1.2.3