Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev (56b135b9) · Commits · e / os / android_frameworks_base

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

+13 −16

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.provider.Telephony;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.Slog;
		import android.view.View;
		@@ -91,24 +92,20 @@ public class CarrierLabel extends TextView {
		Slog.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn
		+ " showPlmn=" + showPlmn + " plmn=" + plmn);
		}
		StringBuilder str = new StringBuilder();
		boolean something = false;
		if (showPlmn && plmn != null) {
		str.append(plmn);
		something = true;
		}
		if (showSpn && spn != null) {
		if (something) {
		str.append('\n');
		}
		str.append(spn);
		something = true;
		}
		if (something) {
		setText(str.toString());
		final String str;
		// match logic in KeyguardStatusViewManager
		final boolean plmnValid = showPlmn && !TextUtils.isEmpty(plmn);
		final boolean spnValid = showSpn && !TextUtils.isEmpty(spn);
		if (plmnValid && spnValid) {
		str = plmn + "\|" + spn;
		} else if (plmnValid) {
		str = plmn;
		} else if (spnValid) {
		str = spn;
		} else {
		setText(com.android.internal.R.string.lockscreen_carrier_default);
		str = "";
		}
		setText(str);
		}

+8 −6

Original line number	Diff line number	Diff line
		@@ -448,12 +448,14 @@ public class PhoneStatusBar extends BaseStatusBar {
		mNetworkController.addSignalCluster(signalCluster);
		signalCluster.setNetworkController(mNetworkController);

		if (SHOW_CARRIER_LABEL) {
		// for wifi-only devices, we show SSID; otherwise, we show PLMN
		if (mNetworkController.hasMobileDataFeature()) {
		mNetworkController.addMobileLabelView(mCarrierLabel);
		} else {
		mNetworkController.addWifiLabelView(mCarrierLabel);
		}
		}

		// final ImageView wimaxRSSI =
		// (ImageView)sb.findViewById(R.id.wimax_signal);