am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus.

* commit 'c0fe0b6915004303a550047e68a2124edae9fdb2':
  Show animated AF ring UI when lens is moving in continuous autofocus.

4 files changed, 7 insertions, 8 deletions

diff --git a/src/com/android/camera/CaptureModuleUI.java b/src/com/android/camera/CaptureModuleUI.java
index bbb7c60c4..74678dc0d 100644
--- a/src/com/android/camera/CaptureModuleUI.java
+++ b/src/com/android/camera/CaptureModuleUI.java
@@ -202,8 +202,8 @@ public class CaptureModuleUI implements
 
     public void setAutoFocusTarget(int x, int y) {
         // TODO: refactor.
-        boolean isAutoFocus = false;
-        mFocusUI.setFocusPosition(x, y, isAutoFocus);
+        boolean isPassiveScan = true;
+        mFocusUI.setFocusPosition(x, y, isPassiveScan);
     }
 
     public void clearAutoFocusIndicator() {
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index d236d8a71..fde7207ef 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -108,7 +108,7 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     public  interface FocusUI {
         public boolean hasFaces();
         public void clearFocus();
-        public void setFocusPosition(int x, int y, boolean isAutoFocus);
+        public void setFocusPosition(int x, int y, boolean isPassiveScan);
         public void onFocusStarted();
         public void onFocusSucceeded();
         public void onFocusFailed();
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 8b2c4fe44..d2619baab 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -227,7 +227,8 @@ public class VideoModule extends CameraModule
                     ? new CameraAgent.CameraAFMoveCallback() {
                 @Override
                 public void onAutoFocusMoving(boolean moving, CameraProxy camera) {
-                    mFocusManager.onAutoFocusMoving(moving);
+                    // mFocusManager.onAutoFocusMoving(moving) not called because UI
+                    // not compatible with vertical video hint UI.
                 }
             } : null;
 
diff --git a/src/com/android/camera/ui/FocusOverlay.java b/src/com/android/camera/ui/FocusOverlay.java
index 6d95e074d..46f640c25 100644
--- a/src/com/android/camera/ui/FocusOverlay.java
+++ b/src/com/android/camera/ui/FocusOverlay.java
@@ -48,7 +48,6 @@ public class FocusOverlay extends View implements FocusOverlayManager.FocusUI {
     private final int mFocusIndicatorSize;
     private boolean mShowIndicator;
     private final int mFocusOuterRingSize;
-    private boolean mCurrentRunIsAutoFocus = true;
 
     public FocusOverlay(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -70,7 +69,7 @@ public class FocusOverlay extends View implements FocusOverlayManager.FocusUI {
     }
 
     @Override
-    public void setFocusPosition(int x, int y, boolean isAutoFocus) {
+    public void setFocusPosition(int x, int y, boolean isPassiveScan) {
         mPositionX = x;
         mPositionY = y;
         mBounds.set(x - mFocusIndicatorSize / 2, y - mFocusIndicatorSize / 2,
@@ -78,7 +77,6 @@ public class FocusOverlay extends View implements FocusOverlayManager.FocusUI {
         mFocusIndicator.setBounds(mBounds);
         mFocusOuterRing.setBounds(x - mFocusOuterRingSize / 2, y - mFocusOuterRingSize / 2,
                 x + mFocusOuterRingSize / 2, y + mFocusOuterRingSize / 2);
-        mCurrentRunIsAutoFocus = isAutoFocus;
         if (getVisibility() != VISIBLE) {
             setVisibility(VISIBLE);
         }
@@ -127,7 +125,7 @@ public class FocusOverlay extends View implements FocusOverlayManager.FocusUI {
     public void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        if (mShowIndicator && !mCurrentRunIsAutoFocus) {
+        if (mShowIndicator) {
             mFocusOuterRing.draw(canvas);
             canvas.save();
             canvas.rotate(mAngle, mPositionX, mPositionY);