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

dsandler · Android (Google) Code Review · commit 4d3161f37919 · 2012-01-20T11:28:44.000-08:00
diff --git 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 @@ void refreshViews() {
             combinedActivityIconId = mMobileActivityIconId;
             combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
             mContentDescriptionCombinedSignal = mContentDescriptionDataType;
+        } else {
+            mobileLabel = mHasMobileDataFeature ?
+                context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";
         }
 
         if (mWifiConnected) {

Original file line number	Diff line number	Diff line change
`@@ -913,6 +913,9 @@ void refreshViews() {`
`913`	`913`	`combinedActivityIconId = mMobileActivityIconId;`
`914`	`914`	`combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()`
`915`	`915`	`mContentDescriptionCombinedSignal = mContentDescriptionDataType;`
	`916`	`+ } else {`
	`917`	`+ mobileLabel = mHasMobileDataFeature ?`
	`918`	`+ context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";`
`916`	`919`	`}`
`917`	`920`
`918`	`921`	`if (mWifiConnected) {`