Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a1b8898 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

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

* commit 'f448c32d':
  Fix UI settings display issues
parents 3f3f390b f448c32d

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

+5 −4
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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);