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

resolve merge conflicts of 0c7e4ed to master.

Browse Source 
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
This commit is contained in:
Jeff Davidson
2014-12-09 15:11:44 -08:00
parent 2a321adc9b 0c7e4ed697
commit 06b65d1c7d
6 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,8 @@ public class WifiConfigController implements TextWatcher,
}
}
if (mAccessPoint.networkId == INVALID_NETWORK_ID || mEdit) {
if ((mAccessPoint.networkId == INVALID_NETWORK_ID && !mAccessPoint.isActive())
|| mEdit) {
showSecurityFields();
showIpConfigFields();
showProxyFields();
@@ -265,7 +266,8 @@ public class WifiConfigController implements TextWatcher,
} else {
if (state != null) {
addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(),
state));
state, mAccessPoint.networkId ==
WifiConfiguration.INVALID_NETWORK_ID));
}
if (signalLevel != null) {
@@ -299,7 +301,7 @@ public class WifiConfigController implements TextWatcher,
addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
}
if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
if (mAccessPoint.networkId != INVALID_NETWORK_ID || mAccessPoint.isActive()) {
mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));
}
}