Merge "Implement callbacks for focus indicator on zsl" into ub-camera-haleakala

diff --cc src/com/android/camera/one/v2/ZslOneCameraFactory.java
index 08eb811,e7d78af..dcb2a3c
--- 1/src/com/android/camera/one/v2/ZslOneCameraFactory.java
--- 2/src/com/android/camera/one/v2/ZslOneCameraFactory.java
+++ b/src/com/android/camera/one/v2/ZslOneCameraFactory.java
@@@ -125,15 -124,10 +124,14 @@@ public class ZslOneCameraFactory 
              rootBuilder.withResponseListener(
                      new TimestampResponseListener(globalTimestampCallback));
  
 +            // TODO Change AE mode depending on flash mode.
 +            rootBuilder.withParam(CaptureRequest.CONTROL_AE_MODE, CaptureRequest
 +                    .CONTROL_AE_MODE_ON);
 +
              rootBuilder.withStream(zslImageStream);
  
-             rootBuilder.withResponseListener(
-                     new MetadataResponseListener<Integer>(
-                             CaptureResult.CONTROL_AF_STATE, new FilteredUpdatable<>(afState)));
+             rootBuilder.withResponseListener(new TotalCaptureResultResponseListener
+                     (metadataCallback));
  
              Pollable<Rect> cropRegion = new ZoomedCropRegion(mCameraCharacteristics, zoomState);
              rootBuilder.withParam(CaptureRequest.SCALER_CROP_REGION, cropRegion);