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

Merge "Remove the "airplane-safe" string from SysUI" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-15 17:54:35 +00:00
committed by Android (Google) Code Review
parent 6b6d7892de cd738b376b
commit 6e6666fff7
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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] -->

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

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