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

Merge "Always show appropriate mobile service label." into ics-mr1

Browse Source
This commit is contained in:
Daniel Sandler
2012-01-20 11:28:44 -08:00
committed by Android (Google) Code Review
parent ad1f4a2ca8 32f4700172
commit 4d3161f379
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
View File

@@ -913,6 +913,9 @@ public class NetworkController extends BroadcastReceiver {
combinedActivityIconId = mMobileActivityIconId; combinedActivityIconId = mMobileActivityIconId;
combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon() combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
mContentDescriptionCombinedSignal = mContentDescriptionDataType; mContentDescriptionCombinedSignal = mContentDescriptionDataType;
} else {
mobileLabel = mHasMobileDataFeature ?
context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";
} }
if (mWifiConnected) { if (mWifiConnected) {