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

Commit 3ac5d684 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace the globe+airplane icon with gblobe+x icon" into sc-dev am:... 

Merge "Replace the globe+airplane icon with gblobe+x icon" into sc-dev am: 2ca03547 am: 21b43199

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

Change-Id: I40be80c7678c6dfa980baa7914c99abb81610406
parents d0b6abbf 21b43199

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

+3 −3
Original line number Diff line number Diff line
@@ -416,10 +416,10 @@ public class InternetTile extends QSTileImpl<SignalState> { 
        if (cb.mAirplaneModeEnabled) {

            if (!state.value) {

                state.state = Tile.STATE_INACTIVE;

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

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

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

            } else if (!wifiConnected) {

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

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

                if (cb.mNoNetworksAvailable) {

                    state.secondaryLabel =

                            r.getString(R.string.quick_settings_networks_unavailable);
@@ -486,7 +486,7 @@ public class InternetTile extends QSTileImpl<SignalState> { 


        if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) {

            state.state = Tile.STATE_INACTIVE;

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

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

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

        } else if (cb.mNoDefaultNetwork && cb.mNoNetworksAvailable) {

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