Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc1455f2 authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16465718

Change-Id: I44e615463c41b4faff5231ce1d9f76049f5443d0
parents f936cf7d e14bfadc

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

+7 −5
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern 
        }



        void onBind(@NonNull WifiEntry wifiEntry) {

            mWifiIcon.setImageDrawable(getWifiDrawable(wifiEntry));

            mWifiIcon.setImageDrawable(

                    getWifiDrawable(wifiEntry.getLevel(), wifiEntry.shouldShowXLevelIcon()));

            setWifiNetworkLayout(wifiEntry.getTitle(),

                    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);

        }



        Drawable getWifiDrawable(@NonNull WifiEntry wifiEntry) {

            if (wifiEntry.getLevel() == WifiEntry.WIFI_LEVEL_UNREACHABLE) {

        Drawable getWifiDrawable(int level, boolean hasNoInternet) {

            // 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;

            }

            final Drawable drawable = mWifiIconInjector.getIcon(wifiEntry.shouldShowXLevelIcon(),

                    wifiEntry.getLevel());

            final Drawable drawable = mWifiIconInjector.getIcon(hasNoInternet, level);

            if (drawable == null) {

                return null;

            }