PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UI settings display issues" into honeycomb-LTE

Browse Source
This commit is contained in:
Irfan Sheriff
2011-06-07 13:54:53 -07:00
committed by Android (Google) Code Review
parent c47e9a1d65 317e0aa530
commit f448c32d9b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/WifiConfigController.java
View File

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

1
src/com/android/settings/wifi/WifiSettings.java
View File

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