am ba46f269: am a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE

* commit 'ba46f269abf8cbafaf68902a23935a1779aa316d': Fix enabling of submit button
2011-05-19 17:18:12 -07:00
parent 5179666491 ba46f269ab
commit 3493c20433
1 changed files with 5 additions and 7 deletions
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -271,14 +271,12 @@ public class WifiConfigController implements TextWatcher,
            (mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8)))) {
            enabled = false;
        } else {
-            enabled = true;
-        }
-
            if (ipAndProxyFieldsAreValid()) {
                enabled = true;
            } else {
                enabled = false;
            }
+        }
        submit.setEnabled(enabled);
    }