auto import from //depot/cupcake/@137055

2009-03-02 22:54:43 -08:00
parent 90e190609a
commit 8a156091ef
44 changed files with 1427 additions and 601 deletions
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -95,6 +95,7 @@ public class AdvancedSettings extends PreferenceActivity
        if (validChannelCounts == null) {
            Toast.makeText(this, R.string.wifi_setting_num_channels_error,
                           Toast.LENGTH_SHORT).show();
+            pref.setEnabled(false);
            return;
        }
        String[] entries = new String[validChannelCounts.length];
@@ -107,6 +108,7 @@ public class AdvancedSettings extends PreferenceActivity
        }
        pref.setEntries(entries);
        pref.setEntryValues(entryValues);
+        pref.setEnabled(true);
        int numChannels = wifiManager.getNumAllowedChannels();
        if (numChannels >= 0) {
            pref.setValue(String.valueOf(numChannels));