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

Commit 92728a09 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am fe22c504: am f2be271d: Fix 2287263: Change carrier TextView to be 1 line... 

am fe22c504: am f2be271d: Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.

Merge commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70'

* commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
parents d8e1e74d f3b777a9

policy/com/android/internal/policy/impl/LockScreen.java

+5 −1
Original line number Diff line number Diff line
@@ -180,6 +180,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
        }



        mCarrier = (TextView) findViewById(R.id.carrier);

        // Required for Marquee to work

        mCarrier.setSelected(true);

        mCarrier.setTextColor(0xffffffff);



        mDate = (TextView) findViewById(R.id.date);

        mStatus1 = (TextView) findViewById(R.id.status1);

        mStatus2 = (TextView) findViewById(R.id.status2);
@@ -564,7 +568,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
        if (telephonyPlmn != null && telephonySpn == null) {

            return telephonyPlmn;

        } else if (telephonyPlmn != null && telephonySpn != null) {

            return telephonyPlmn + "\n" + telephonySpn;

            return telephonyPlmn + "|" + telephonySpn;

        } else if (telephonyPlmn == null && telephonySpn != null) {

            return telephonySpn;

        } else {

policy/com/android/internal/policy/impl/UnlockScreen.java

+4 −0
Original line number Diff line number Diff line
@@ -248,6 +248,10 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient 
        updateMonitor.registerConfigurationChangeCallback(this);

        setFocusableInTouchMode(true);



        // Required to get Marquee to work.

        mCarrier.setSelected(true);

        mCarrier.setTextColor(0xffffffff);



        // until we get an update...

        mCarrier.setText(

                LockScreen.getCarrierString(