summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2009-10-20 09:58:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-20 09:58:02 -0700
commitec339e54c58aa8cf2cdfa553134363ed9860fa5c (patch)
treee305ffca5581874472d742071413c2a507eeab0d /src
parent61c10fd17897182c993ea9e81e43bd28ba6b119e (diff)
parent22a695f8ca31dc2899e7206d68316c7e6d960657 (diff)
downloadLegacyCamera-ec339e54c58aa8cf2cdfa553134363ed9860fa5c.zip
LegacyCamera-ec339e54c58aa8cf2cdfa553134363ed9860fa5c.tar.gz
LegacyCamera-ec339e54c58aa8cf2cdfa553134363ed9860fa5c.tar.bz2
am 22a695f8: Fix the bug that one-item only settings still shown on menu.
Merge commit '22a695f8ca31dc2899e7206d68316c7e6d960657' into eclair-mr2 * commit '22a695f8ca31dc2899e7206d68316c7e6d960657': Fix the bug that one-item only settings still shown on menu.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 0f28902..e7d7d0e 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -189,7 +189,7 @@ public class CameraSettings {
// Remove the preference if the parameter is not supported or there is
// only one options for the settings.
- if (supported == null || allEntries.length <= 1) {
+ if (supported == null || supported.size() <= 1) {
removePreference(screen, pref);
return;
}