diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-10-13 17:03:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 17:03:30 -0700 |
| commit | 987e9b4e1849f2a3eab840de472e15ccde21d262 (patch) | |
| tree | 92d493b033965c737c6af4c4981a1fbcca7913e6 /src/com/android/camera/CameraSettings.java | |
| parent | c5555e8a09ff605eac085293de60bb1cdce3858a (diff) | |
| parent | bfc24ed96f5ff19ecd9684fba1db8daff3b828a1 (diff) | |
| download | LegacyCamera-987e9b4e1849f2a3eab840de472e15ccde21d262.zip LegacyCamera-987e9b4e1849f2a3eab840de472e15ccde21d262.tar.gz LegacyCamera-987e9b4e1849f2a3eab840de472e15ccde21d262.tar.bz2 | |
am bfc24ed9: am cec28d72: Merge "Do not show the setting if there is only one supported option." into gingerbread
Merge commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1'
* commit 'bfc24ed96f5ff19ecd9684fba1db8daff3b828a1':
Do not show the setting if there is only one supported option.
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index e187864..62642ef 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -306,6 +306,10 @@ public class CameraSettings { } pref.filterUnsupported(supported); + if (pref.getEntries().length <= 1) { + removePreference(group, pref.getKey()); + return; + } // Set the value to the first entry if it is invalid. String value = pref.getValue(); |