am 4a1b8898: am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE

* commit '4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
  Fix UI settings display issues

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

@@ -207,11 +207,12 @@ public class WifiConfigController implements TextWatcher,
                     mIpSettingsSpinner.setSelection(STATIC_IP);
                 } else {
                     mIpSettingsSpinner.setSelection(DHCP);
+                }
                 //Display IP addresses
                 for(InetAddress a : config.linkProperties.getAddresses()) {
                     addRow(group, R.string.wifi_ip_address, a.getHostAddress());
                 }
-                }
+
 
                 if (config.proxySettings == ProxySettings.STATIC) {
                     mProxySettingsSpinner.setSelection(PROXY_STATIC);

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

@@ -509,6 +509,7 @@ public class WifiSettings extends SettingsPreferenceFragment
                     WifiManager.EXTRA_NETWORK_INFO);
             mConnected.set(info.isConnected());
             changeNextButtonState(info.isConnected());
+            updateAccessPoints();
             updateConnectionState(info.getDetailedState());
         } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
             updateConnectionState(null);