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

Moving the error messages from slice to panel's subtitle

Browse Source 
Bug: 180888831
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I4572c8ad15effab0c95feaeac6a99f5aaabf6f90
This commit is contained in:
SongFerngWang
2021-03-09 14:38:48 +08:00
parent a922c902f6
commit 0c86903ec6
6 changed files with 237 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/network/ProviderModelSlice.java
View File

@@ -147,31 +147,6 @@ public class ProviderModelSlice extends WifiSlice {
listBuilder.addRow(getWifiSliceItemRow(item));
}
}
// Fifth section: If device has connection problem, this row show the message for user.
// 1) show non_carrier_network_unavailable:
// - while no wifi item
// 2) show all_network_unavailable:
// - while no wifi item + no carrier
// - while no wifi item + no data capability
if (worker == null || wifiList == null || wifiList.size() == 0) {
log("no wifi item");
int resId = R.string.non_carrier_network_unavailable;
if (!hasCarrier || !mHelper.isDataSimActive()) {
log("No carrier item or no carrier data.");
resId = R.string.all_network_unavailable;
}
if (!hasCarrier && !hasEthernet) {
// If there is no item in ProviderModelItem, slice needs a header.
listBuilder.setHeader(mHelper.createHeader(
NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS));
}
listBuilder.addGridRow(
mHelper.createMessageGridRow(resId,
NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS));
}
return listBuilder.build();
}