Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Avoid running changes to WiFi level" into sc-v2-dev

Browse Source
This commit is contained in:
Weng Su
2021-12-15 16:41:49 +00:00
committed by Android (Google) Code Review
parent 357b9e317f 0b2bd16cc6
commit e14bfadc03
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java
View File

@@ -151,7 +151,8 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
} }
void onBind(@NonNull WifiEntry wifiEntry) { void onBind(@NonNull WifiEntry wifiEntry) {
mWifiIcon.setImageDrawable(getWifiDrawable(wifiEntry)); mWifiIcon.setImageDrawable(
getWifiDrawable(wifiEntry.getLevel(), wifiEntry.shouldShowXLevelIcon()));
setWifiNetworkLayout(wifiEntry.getTitle(), setWifiNetworkLayout(wifiEntry.getTitle(),
Html.fromHtml(wifiEntry.getSummary(false), Html.FROM_HTML_MODE_LEGACY)); Html.fromHtml(wifiEntry.getSummary(false), Html.FROM_HTML_MODE_LEGACY));
@@ -188,12 +189,13 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
mWifiSummaryText.setText(summary); mWifiSummaryText.setText(summary);
} }
Drawable getWifiDrawable(@NonNull WifiEntry wifiEntry) { Drawable getWifiDrawable(int level, boolean hasNoInternet) {
if (wifiEntry.getLevel() == WifiEntry.WIFI_LEVEL_UNREACHABLE) { // If the Wi-Fi level is equal to WIFI_LEVEL_UNREACHABLE(-1), then a null drawable
// will be returned.
if (level == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
return null; return null;
} }
final Drawable drawable = mWifiIconInjector.getIcon(wifiEntry.shouldShowXLevelIcon(), final Drawable drawable = mWifiIconInjector.getIcon(hasNoInternet, level);
wifiEntry.getLevel());
if (drawable == null) { if (drawable == null) {
return null; return null;
} }