diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-08-14 22:48:32 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-08-14 22:48:32 +0800 |
| commit | f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22 (patch) | |
| tree | d8c2da34ba45184d56cc380e647522e0e99e3b8b /src/com | |
| parent | 7058a9318dd5d6d5a1e79a84080cdc02975f68c1 (diff) | |
| download | LegacyCamera-f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22.zip LegacyCamera-f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22.tar.gz LegacyCamera-f5d28a1e17e011daf601d464ce4aa0b8d0ce2f22.tar.bz2 | |
Remove focus mode setting if tap-to-focus is possible.
bug:5141526
Change-Id: I947721209ffbcb3eb6f443cb503f80871031a0bf
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, |