Merge "Fix enabling of submit button" into honeycomb-LTE

2011-05-19 16:47:04 -07:00
parent d6e23b9a5c 990c3ad530
commit a6f178a817
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);
    }