From 990c3ad530aa919256a0b341dbe763503b41ff2b Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Thu, 19 May 2011 16:05:02 -0700
Subject: [PATCH] Fix enabling of submit button

Change I478c915b introduced a regression where the submit
button is enabled even if no password is entered for a secure
network.

This happened because our checks would override a password
check when IP and proxy settings are valid (which is the default
setting)

Bug: 4462439
Change-Id: Icd3fde90759f33fa391ec79ae8075b6d8388d2e9
---
 .../android/settings/wifi/WifiConfigController.java  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 4e474916fb1..b433ed92acf 100644
--- 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);
     }