summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 553a8ed03..0d0b3ee7f 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -1542,9 +1542,17 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
}
return mTrackingFocusRenderer;
}
+ FocusIndicator focusIndicator;
+ if (mFaceView != null && mFaceView.faceExists() && !mIsTouchAF) {
+ if (mPieRenderer != null) {
+ mPieRenderer.clear();
+ }
+ focusIndicator = mFaceView;
+ } else {
+ focusIndicator = mPieRenderer;
+ }
- return (mFaceView != null && mFaceView.faceExists() && !mIsTouchAF) ?
- mFaceView : mPieRenderer;
+ return focusIndicator;
}
@Override