diff options
author | Doris Liu <tianliu@google.com> | 2013-10-03 19:38:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-03 19:38:16 +0000 |
commit | 930b9b41185a2f59c05fe527300248776d3993a0 (patch) | |
tree | 2ef0323faac6db12bf5a76ed4c71c4edb63300d1 | |
parent | 68fc363bd33a9e506ccfd1ffa330c4525a2734ce (diff) | |
parent | cbdd373181fdd389f02e71a8079e9aab5f11fbad (diff) | |
download | android_packages_apps_Snap-930b9b41185a2f59c05fe527300248776d3993a0.tar.gz android_packages_apps_Snap-930b9b41185a2f59c05fe527300248776d3993a0.tar.bz2 android_packages_apps_Snap-930b9b41185a2f59c05fe527300248776d3993a0.zip |
Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
-rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 8 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 |
2 files changed, 6 insertions, 3 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; } diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 89be7cb8e..3f6cd1a89 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1574,7 +1574,6 @@ public class PhotoModule private void setMeteringAreasIfSupported() { if (mMeteringAreaSupported) { - // Use the same area for focus and metering. mParameters.setMeteringAreas(mFocusManager.getMeteringAreas()); } } |