commit f16669a6014498e191d871d85efeab936b33dfa7
author Irfan Sheriff <isheriff@google.com> Tue Dec 13 13:17:45 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 13:17:45 2011 -0800
tree b8cb5e0d5321361ea901ec1208d6bfc4f282bdda
parent f5bf1e7b68bd57c40253abe751dc33bef1109e68
parent 0c0bd827a104ee3a5891b8c5f1dae6db422e09e9

Merge "Fix button visibility on connect"

src/com/android/settings/wifi/WifiConfigController.java

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2f8ae54..3852cc9 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -271,7 +271,7 @@
     }
 
     /* show submit button if password, ip and proxy settings are valid */
-    private void enableSubmitIfAppropriate() {
+    void enableSubmitIfAppropriate() {
         Button submit = mConfigUi.getSubmitButton();
         if (submit == null) return;
         boolean enabled = false;

src/com/android/settings/wifi/WifiDialog.java

diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index f980d0c..82b0cc6 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -56,6 +56,9 @@
         setInverseBackgroundForced(true);
         mController = new WifiConfigController(this, mView, mAccessPoint, mEdit);
         super.onCreate(savedInstanceState);
+        /* During creation, the submit button can be unavailable to determine
+         * visibility. Right after creation, update button visibility */
+        mController.enableSubmitIfAppropriate();
     }
 
     @Override