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

* commit 'a6f178a817ec36d5cf6d6a3d9c19c73278f0c3ca': Fix enabling of submit button
2011-05-19 17:15:43 -07:00
parent be94e211d1 a6f178a817
commit ba46f269ab
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,13 +271,11 @@ public class WifiConfigController implements TextWatcher,
            (mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8)))) {
            enabled = false;
        } else {
-            enabled = true;
-        }
-
-        if (ipAndProxyFieldsAreValid()) {
-            enabled = true;
-        } else {
-            enabled = false;
+            if (ipAndProxyFieldsAreValid()) {
+                enabled = true;
+            } else {
+                enabled = false;
+            }
        }
        submit.setEnabled(enabled);
    }