diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-08-14 21:19:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-14 21:19:52 -0700 |
| commit | 63364838e1f742ac74d47498ae8f51e1e6e7e902 (patch) | |
| tree | 723a643a8a9d08832bae2a4ae31530b3a57aceb0 /src/com | |
| parent | b5ae14bfe25bdb5725ba9f724c923168fa0ca8fa (diff) | |
| parent | f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22 (diff) | |
| download | LegacyCamera-63364838e1f742ac74d47498ae8f51e1e6e7e902.zip LegacyCamera-63364838e1f742ac74d47498ae8f51e1e6e7e902.tar.gz LegacyCamera-63364838e1f742ac74d47498ae8f51e1e6e7e902.tar.bz2 | |
Merge "Remove focus mode setting if tap-to-focus is possible."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index af3af7d..96f439a 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -161,8 +161,13 @@ public class CameraSettings { flashMode, mParameters.getSupportedFlashModes()); } if (focusMode != null) { - filterUnsupportedOptions(group, - focusMode, mParameters.getSupportedFocusModes()); + if (mParameters.getMaxNumFocusAreas() == 0) { + filterUnsupportedOptions(group, + focusMode, mParameters.getSupportedFocusModes()); + } else { + // Remove the focus mode if we can use tap-to-focus. + removePreference(group, focusMode.getKey()); + } } if (videoFlashMode != null) { filterUnsupportedOptions(group, |