diff options
| author | zhuw <zhuw@codeaurora.org> | 2018-03-21 15:58:26 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-21 03:33:49 -0700 |
| commit | 57407dcab3f91547f663c3fb8dd70ea4d96d4031 (patch) | |
| tree | ca56e3b4d406a2dc235172aad1ef13d6ff614599 /src/com/android/camera/CaptureUI.java | |
| parent | ef8b1a12c6a513194e7ffe2d7be8639d69e1bbb8 (diff) | |
| download | android_packages_apps_Snap-57407dcab3f91547f663c3fb8dd70ea4d96d4031.tar.gz android_packages_apps_Snap-57407dcab3f91547f663c3fb8dd70ea4d96d4031.tar.bz2 android_packages_apps_Snap-57407dcab3f91547f663c3fb8dd70ea4d96d4031.zip | |
Fix indicator still show when CAF focused
conflict with FD indicator's showing and dismissing
Change-Id: Ib674ac3569f4378dd104581185b4bd1b84e63675
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
| -rwxr-xr-x | src/com/android/camera/CaptureUI.java | 12 |
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 |