am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1

* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c': Always show appropriate mobile service label.
2012-01-20 11:31:10 -08:00
parent 1bc82792b8 4d3161f379
commit a64f899fa6
1 changed files with 3 additions and 0 deletions
--- 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) {