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

Remove those stuff about CarrierAp, they are removed from FW.

Browse Source 
Bug: 130875004
Test: atest SettingsRoboTests
Change-Id: I549eabd1699a617dd6e639b725ade361c64d5a67
This commit is contained in:
Steven Liu
2019-12-09 08:57:24 -08:00
parent 0751e29195
commit 2bd1d93555
2 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,18 +347,11 @@ public class WifiConfigController implements TextWatcher,
showProxyFields();
final CheckBox advancedTogglebox =
(CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox);
mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(
mAccessPoint.isCarrierAp() ? View.GONE : View.VISIBLE);
advancedTogglebox.setOnCheckedChangeListener(this);
advancedTogglebox.setChecked(showAdvancedFields);
setAdvancedOptionAccessibilityString(showAdvancedFields);
mView.findViewById(R.id.wifi_advanced_fields)
.setVisibility(showAdvancedFields ? View.VISIBLE : View.GONE);
if (mAccessPoint.isCarrierAp()) {
addRow(group, R.string.wifi_carrier_connect,
String.format(mContext.getString(R.string.wifi_carrier_content),
mAccessPoint.getCarrierName()));
}
}
if (mMode == WifiConfigUiBase.MODE_MODIFY) {
@@ -1068,12 +1061,6 @@ public class WifiConfigController implements TextWatcher,
}
}
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B
&& mAccessPoint != null
&& mAccessPoint.isCarrierAp()) {
mEapMethodSpinner.setSelection(mAccessPoint.getCarrierApEapType());
}
if (refreshCertificates) {
loadCertificates(
mEapCaCertSpinner,
@@ -1263,9 +1250,6 @@ public class WifiConfigController implements TextWatcher,
setUserCertInvisible();
setPasswordInvisible();
setIdentityInvisible();
if (mAccessPoint != null && mAccessPoint.isCarrierAp()) {
setEapMethodInvisible();
}
break;
}