Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 56b135b9: Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev

Browse Source 
* commit '56b135b91051664ae9027f50e9f20b7fcf6565ba':
  Put PLMN and SPN on one line in the notification panel.
This commit is contained in:
Daniel Sandler
2012-06-12 12:45:40 -07:00
committed by Android Git Automerger
parent 2e6f14dbd8 56b135b910
commit 2aaa68e839
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -447,12 +447,14 @@ public class PhoneStatusBar extends BaseStatusBar {
mNetworkController.addSignalCluster(signalCluster);
signalCluster.setNetworkController(mNetworkController);
// for wifi-only devices, we show SSID; otherwise, we show PLMN
if (mNetworkController.hasMobileDataFeature()) {
mNetworkController.addMobileLabelView(mCarrierLabel);
} else {
mNetworkController.addWifiLabelView(mCarrierLabel);
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 =