summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2012-01-20 11:28:44 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-20 11:28:44 -0800
commit4d3161f379195302b720e120c5e6b65a0adfaf8c (patch)
tree8db813c75501832102fec718d08efd1009a0a600
parentad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28 (diff)
parent32f470017246e397e2c21556b9dc04bb99e52862 (diff)
Merge "Always show appropriate mobile service label." into ics-mr1
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index d9114a5d0f44..666d69658f23 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -913,6 +913,9 @@ public class NetworkController extends BroadcastReceiver {
combinedActivityIconId = mMobileActivityIconId;
combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
mContentDescriptionCombinedSignal = mContentDescriptionDataType;
+ } else {
+ mobileLabel = mHasMobileDataFeature ?
+ context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";
}
if (mWifiConnected) {