summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2012-01-20 11:31:10 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-20 11:31:10 -0800
commita64f899fa6159a8839a769d3f107f6c502da58c8 (patch)
tree35f47ea999bc229901e249893e37a69bc1eff2dd
parent1bc82792b87c0aee65c53f84a6d7c6b5031a09bc (diff)
parent4d3161f379195302b720e120c5e6b65a0adfaf8c (diff)
am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c': Always show appropriate mobile service label.
-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) {