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

Commit d6e00a9c authored by Xi Han's avatar Xi Han Committed by Automerger Merge Worker
Browse files

Merge "Do not display "Network Available" when WiFi disabled." into... 

Merge "Do not display "Network Available" when WiFi disabled." into sc-qpr1-dev am: b8655177 am: 1c5bbfcf

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

Change-Id: I201ed53395438096470b74fc132f158b5a7571ad
parents 2077e691 1c5bbfcf

packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ public class InternetTile extends QSTileImpl<SignalState> { 
                state.icon = ResourceIcon.get(cb.mWifiSignalIconId);

            }

        } else if (cb.mNoDefaultNetwork) {

            if (cb.mNoNetworksAvailable) {

            if (cb.mNoNetworksAvailable || !cb.mEnabled) {

                state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);

                state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable);

            } else {
@@ -489,7 +489,7 @@ public class InternetTile extends QSTileImpl<SignalState> { 
            state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);

            state.secondaryLabel = r.getString(R.string.status_bar_airplane);

        } else if (cb.mNoDefaultNetwork) {

            if (cb.mNoNetworksAvailable) {

            if (cb.mNoNetworksAvailable || !mSignalCallback.mWifiInfo.mEnabled) {

                state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);

                state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable);

            } else {