Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aaa68e8 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit '56b135b9':
  Put PLMN and SPN on one line in the notification panel.
parents 2e6f14db 56b135b9

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

+13 −16
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;

import android.provider.Telephony;

import android.provider.Telephony;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Slog;

import android.util.Slog;

import android.view.View;

import android.view.View;
@@ -91,24 +92,20 @@ public class CarrierLabel extends TextView { 
            Slog.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn

            Slog.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn

                    + " showPlmn=" + showPlmn + " plmn=" + plmn);

                    + " showPlmn=" + showPlmn + " plmn=" + plmn);

        }

        }

        StringBuilder str = new StringBuilder();

        final String str;

        boolean something = false;

        // match logic in KeyguardStatusViewManager

        if (showPlmn && plmn != null) {

        final boolean plmnValid = showPlmn && !TextUtils.isEmpty(plmn);

            str.append(plmn);

        final boolean spnValid = showSpn && !TextUtils.isEmpty(spn);

            something = true;

        if (plmnValid && spnValid) {

        }

            str = plmn + "|" + spn;

        if (showSpn && spn != null) {

        } else if (plmnValid) {

            if (something) {

            str = plmn;

                str.append('\n');

        } else if (spnValid) {

            }

            str = spn;

            str.append(spn);

            something = true;

        }

        if (something) {

            setText(str.toString());

        } else {

        } else {

            setText(com.android.internal.R.string.lockscreen_carrier_default);

            str = "";

        }

        }

        setText(str);

    }

    }

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

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

        mNetworkController.addSignalCluster(signalCluster);

        signalCluster.setNetworkController(mNetworkController);

        signalCluster.setNetworkController(mNetworkController);





        if (SHOW_CARRIER_LABEL) {

            // for wifi-only devices, we show SSID; otherwise, we show PLMN

            // for wifi-only devices, we show SSID; otherwise, we show PLMN

            if (mNetworkController.hasMobileDataFeature()) {

            if (mNetworkController.hasMobileDataFeature()) {

                mNetworkController.addMobileLabelView(mCarrierLabel);

                mNetworkController.addMobileLabelView(mCarrierLabel);

            } else {

            } else {

                mNetworkController.addWifiLabelView(mCarrierLabel);

                mNetworkController.addWifiLabelView(mCarrierLabel);

            }

            }

        }





//        final ImageView wimaxRSSI =

//        final ImageView wimaxRSSI =

//                (ImageView)sb.findViewById(R.id.wimax_signal);

//                (ImageView)sb.findViewById(R.id.wimax_signal);