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

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

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

Merge commit 'f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31' into eclair-plus-aosp

* commit 'f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
parents d6a93550 5bfb2e0d

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

+5 −1
Original line number Diff line number Diff line
@@ -179,6 +179,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);
@@ -544,7 +548,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
@@ -239,6 +239,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(