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

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

Merge "Remove the "airplane-safe" string from SysUI" into sc-dev am: 6e6666ff 

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

Change-Id: I39009d0667045c4d530ec5071e968df7332ae73a
parents f0bba7cc 6e6666ff

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -851,8 +851,6 @@ 
    <string name="quick_settings_wifi_label">Wi-Fi</string>

    <!-- QuickSettings: Internet [CHAR LIMIT=NONE] -->

    <string name="quick_settings_internet_label">Internet</string>

    <!-- QuickSettings: Airplane-safe [CHAR LIMIT=NONE] -->

    <string name="quick_settings_airplane_safe_label">Airplane-safe</string>

    <!-- QuickSettings: networks available [CHAR LIMIT=NONE] -->

    <string name="quick_settings_networks_available">Networks available</string>

    <!-- QuickSettings: networks unavailable [CHAR LIMIT=NONE] -->

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

+0 −4
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
                }

            } else {

                state.icon = ResourceIcon.get(cb.mWifiSignalIconId);

                state.label = r.getString(R.string.quick_settings_airplane_safe_label);

            }

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

            state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable);
@@ -480,9 +479,6 @@ public class InternetTile extends QSTileImpl<SignalState> { 
            state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available);

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

        } else {

            if (cb.mAirplaneModeEnabled) {

                state.label = r.getString(R.string.quick_settings_airplane_safe_label);

            }

            state.icon = new SignalIcon(cb.mMobileSignalIconId);

            state.secondaryLabel = appendMobileDataType(cb.mDataSubscriptionName,

                    getMobileDataContentName(cb));