diff options
author | Andy Huibers <andyhuibers@google.com> | 2014-08-26 16:21:15 -0700 |
---|---|---|
committer | Andy Huibers <andyhuibers@google.com> | 2014-08-26 16:53:32 -0700 |
commit | bd9b80b267195f78a8514847d0f02629e761a334 (patch) | |
tree | 86283a8a289e1cf0e12f83723ad5f73ba91df19b /src/com/android/camera/FocusOverlayManager.java | |
parent | d4d1dbe00b84285bd0d235d984b9d71ea63a9305 (diff) | |
download | android_packages_apps_Camera2-bd9b80b267195f78a8514847d0f02629e761a334.tar.gz android_packages_apps_Camera2-bd9b80b267195f78a8514847d0f02629e761a334.tar.bz2 android_packages_apps_Camera2-bd9b80b267195f78a8514847d0f02629e761a334.zip |
Reset metering and focus areas when touch focus period ends.
Bug: 17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
Diffstat (limited to 'src/com/android/camera/FocusOverlayManager.java')
-rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index efc5ac4f6..f34590867 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -424,12 +424,12 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha public void onPreviewStarted() { mState = STATE_IDLE; + resetTouchFocus(); } public void onPreviewStopped() { // If auto focus was in progress, it would have been stopped. mState = STATE_IDLE; - resetTouchFocus(); updateFocusUI(); } @@ -590,6 +590,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha // Initialize mFocusArea. mFocusArea = null; mMeteringArea = null; + // This will cause current module to call getFocusAreas() and + // getMeteringAreas() and send updated regions to camera. + mListener.setFocusParameters(); if (mTouchCoordinate != null) { UsageStatistics.instance().tapToFocus(mTouchCoordinate, |