Merge "Show roaming icon in status bar." (99f6ecc2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+27 −23

Original line number	Diff line number	Diff line
		@@ -1795,6 +1795,7 @@ public class PhoneStatusBar extends StatusBar {
		pw.println(" [" + i + "] icon=" + ic);
		}

		if (false) {
		pw.println("see the logcat for a dump of the views we have created.");
		// must happen on ui thread
		mHandler.post(new Runnable() {
		@@ -1821,6 +1822,9 @@ public class PhoneStatusBar extends StatusBar {
		}
		}

		mNetworkController.dump(fd, pw, args);
		}

		void onBarViewAttached() {
		WindowManager.LayoutParams lp;
		int pixelFormat;

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

+14 −3

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@ public class NetworkController extends BroadcastReceiver {
		}
		mServiceState = state;
		updateTelephonySignalStrength();
		updateDataNetType();
		updateDataIcon();
		refreshViews();
		}
		@@ -831,8 +832,13 @@ public class NetworkController extends BroadcastReceiver {
		mHasMobileDataFeature ? mDataSignalIconId : mWifiIconId;
		mContentDescriptionCombinedSignal = mHasMobileDataFeature
		? mContentDescriptionDataType : mContentDescriptionWifi;

		if ((isCdma() && isCdmaEri()) \|\| mPhone.isNetworkRoaming()) {
		mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
		} else {
		mDataTypeIconId = 0;
		}
		}

		if (DEBUG) {
		Slog.d(TAG, "refreshViews connected={"
		@@ -969,6 +975,7 @@ public class NetworkController extends BroadcastReceiver {
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("Network Controller state:");
		pw.println(" - telephony ------");
		pw.print(" mHspaDataDistinguishable=");
		pw.println(mHspaDataDistinguishable);
		@@ -982,6 +989,10 @@ public class NetworkController extends BroadcastReceiver {
		pw.println(mDataState);
		pw.print(" mDataActivity=");
		pw.println(mDataActivity);
		pw.print(" mDataNetType=");
		pw.print(mDataNetType);
		pw.print("/");
		pw.println(TelephonyManager.getNetworkTypeName(mDataNetType));
		pw.print(" mServiceState=");
		pw.println(mServiceState);
		pw.print(" mNetworkName=");
		@@ -989,7 +1000,7 @@ public class NetworkController extends BroadcastReceiver {
		pw.print(" mNetworkNameDefault=");
		pw.println(mNetworkNameDefault);
		pw.print(" mNetworkNameSeparator=");
		pw.println(mNetworkNameSeparator);
		pw.println(mNetworkNameSeparator.replace("\n","\\n"));
		pw.print(" mPhoneSignalIconId=0x");
		pw.print(Integer.toHexString(mPhoneSignalIconId));
		pw.print("/");
		@@ -1060,7 +1071,7 @@ public class NetworkController extends BroadcastReceiver {
		}

		private String getResourceName(int resId) {
		if (resId == 0) {
		if (resId != 0) {
		final Resources res = mContext.getResources();
		try {
		return res.getResourceName(resId);