diff options
author | Doris Liu <tianliu@google.com> | 2013-10-03 11:00:59 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2013-10-03 11:00:59 -0700 |
commit | cbdd373181fdd389f02e71a8079e9aab5f11fbad (patch) | |
tree | c5a02e1b0dec0efbdc7d95f8fa8606b171c78536 /src/com/android/camera/FocusOverlayManager.java | |
parent | 7fc104e4e75ac881269fd4a093513da01565e5d6 (diff) | |
download | android_packages_apps_Snap-cbdd373181fdd389f02e71a8079e9aab5f11fbad.tar.gz android_packages_apps_Snap-cbdd373181fdd389f02e71a8079e9aab5f11fbad.tar.bz2 android_packages_apps_Snap-cbdd373181fdd389f02e71a8079e9aab5f11fbad.zip |
Leave ROI not set except in tap-to-focus scenario
Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
Diffstat (limited to 'src/com/android/camera/FocusOverlayManager.java')
-rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index b305e045d..c223aea6b 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -340,6 +340,10 @@ public class FocusOverlayManager { calculateTapArea(x, y, 1.5f, ((Area) mMeteringArea.get(0)).rect); } + private void resetMeteringAreas() { + mMeteringArea = null; + } + public void onSingleTapUp(int x, int y) { if (!mInitialized || mState == STATE_FOCUSING_SNAP_ON_FINISH) return; @@ -505,9 +509,9 @@ public class FocusOverlayManager { if (mFocusAreaSupported) { initializeFocusAreas(mPreviewWidth / 2, mPreviewHeight / 2); } - // Initialize mMeteringArea. + // Reset metering area when no specific region is selected. if (mMeteringAreaSupported) { - initializeMeteringAreas(mPreviewWidth / 2, mPreviewHeight / 2); + resetMeteringAreas(); } mFocusDefault = true; } |