commit ca3c564536f154b83e380e37382bc7b9f6049302
author Andy Huibers <andyhuibers@google.com> Sat Sep 06 20:44:25 2014 -0700
committer Andy Huibers <andyhuibers@google.com> Mon Sep 08 12:33:56 2014 -0700
tree 3ff0b2538aa7a52e7e6ddce5f8d7910c2cbecd67
parent 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8

In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.

Bug: 17397777
Bug: 17028594
Bug: 17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f

src/com/android/camera/one/OneCamera.java

diff --git a/src/com/android/camera/one/OneCamera.java b/src/com/android/camera/one/OneCamera.java
index ab0f95e..1b7ecca 100644
--- a/src/com/android/camera/one/OneCamera.java
+++ b/src/com/android/camera/one/OneCamera.java
@@ -204,8 +204,9 @@
          * Called when state of auto focus system changes.
          *
          * @param state Current auto focus state.
+         * @param frameNumber Frame number if available.
          */
-        public void onFocusStatusUpdate(AutoFocusState state);
+        public void onFocusStatusUpdate(AutoFocusState state, long frameNumber);
     }
 
     /**

src/com/android/camera/one/v2/OneCameraImpl.java

diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java
index 3f7e461..28e214c 100644
--- a/src/com/android/camera/one/v2/OneCameraImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraImpl.java
@@ -615,7 +615,7 @@
 
         // Report state change when AF state has changed.
         if (resultAFState != mLastResultAFState && mFocusStateListener != null) {
-            mFocusStateListener.onFocusStatusUpdate(resultAFState);
+            mFocusStateListener.onFocusStatusUpdate(resultAFState, result.getFrameNumber());
         }
         mLastResultAFState = resultAFState;
     }

src/com/android/camera/one/v2/OneCameraZslImpl.java

diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index 874ace4..c8a21de 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -305,7 +305,8 @@
                             CaptureResult result) {
                         mFocusStateListener.onFocusStatusUpdate(
                                 AutoFocusHelper.stateFromCamera2State(
-                                        result.get(CaptureResult.CONTROL_AF_STATE)));
+                                        result.get(CaptureResult.CONTROL_AF_STATE)),
+                                result.getFrameNumber());
                     }
                 });