commit d849d2ba5f3d4ec6773d87dd16a89833a86a7856
author Doris Liu <tianliu@google.com> Thu Feb 13 23:24:54 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 13 23:24:54 2014 +0000
tree eb07b28af1993d7343cc8be1e2fc3d312a9c3f3c
parent a84a728d17c439d83a6ebd78e3e54b8480804600
parent 10a035c93e2cb3ed65f59258fa4d0aca89555bcd

Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali

src/com/android/camera/FocusOverlayManager.java

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index da50bd0..59875c8 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -98,7 +98,7 @@
     public  interface FocusUI {
         public boolean hasFaces();
         public void clearFocus();
-        public void setFocusPosition(int x, int y);
+        public void setFocusPosition(int x, int y, boolean isAutoFocus);
         public void onFocusStarted();
         public void onFocusSucceeded();
         public void onFocusFailed();
@@ -321,7 +321,7 @@
         // animate on false->true trasition only b/8219520
         if (moving && !mPreviousMoving) {
             // Auto focus at the center of the preview.
-            mUI.setFocusPosition(mPreviewRect.centerX(), mPreviewRect.centerY());
+            mUI.setFocusPosition(mPreviewRect.centerX(), mPreviewRect.centerY(), true);
             mUI.onFocusStarted();
         } else if (!moving) {
             mUI.onFocusSucceeded();
@@ -375,7 +375,7 @@
         }
 
         // Use margin to set the focus indicator to the touched area.
-        mUI.setFocusPosition(x, y);
+        mUI.setFocusPosition(x, y, false);
 
         // Stop face detection because we want to specify focus and metering area.
         mListener.stopFaceDetection();

src/com/android/camera/ui/FocusOverlay.java

diff --git a/src/com/android/camera/ui/FocusOverlay.java b/src/com/android/camera/ui/FocusOverlay.java
index 0c2bb22..32f50d5 100644
--- a/src/com/android/camera/ui/FocusOverlay.java
+++ b/src/com/android/camera/ui/FocusOverlay.java
@@ -46,6 +46,7 @@
     private final int mFocusIndicatorSize;
     private boolean mShowIndicator;
     private final int mFocusOuterRingSize;
+    private boolean mCurrentRunIsAutoFocus = true;
 
     public FocusOverlay(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -67,7 +68,7 @@
     }
 
     @Override
-    public void setFocusPosition(int x, int y) {
+    public void setFocusPosition(int x, int y, boolean isAutoFocus) {
         mPositionX = x;
         mPositionY = y;
         mBounds.set(x - mFocusIndicatorSize / 2, y - mFocusIndicatorSize / 2,
@@ -75,6 +76,7 @@
         mFocusIndicator.setBounds(mBounds);
         mFocusOuterRing.setBounds(x - mFocusOuterRingSize / 2, y - mFocusOuterRingSize / 2,
                 x + mFocusOuterRingSize / 2, y + mFocusOuterRingSize / 2);
+        mCurrentRunIsAutoFocus = isAutoFocus;
     }
 
     @Override
@@ -120,7 +122,7 @@
     public void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        if (mShowIndicator) {
+        if (mShowIndicator && !mCurrentRunIsAutoFocus) {
             mFocusOuterRing.draw(canvas);
             canvas.save();
             canvas.rotate(mAngle, mPositionX, mPositionY);