diff options
| author | Jim Miller <jaggies@google.com> | 2010-01-22 19:07:47 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-01-22 19:38:42 -0800 |
| commit | f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31 (patch) | |
| tree | 9a4a63a6248382e6438024e3052306d69720fbb9 | |
| parent | 36a6ec17ba8dc655d0bd1d9bc92afb1699e3aafe (diff) | |
| download | base-eclair-sholes-release2.tar.gz | |
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2eclair-sholes-release2eclair-releaseeclair-passion-release
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
Added explicit TextView.setColor() to workaround bug with TextView.setSelected().
| -rw-r--r-- | phone/com/android/internal/policy/impl/LockScreen.java | 6 | ||||
| -rw-r--r-- | phone/com/android/internal/policy/impl/UnlockScreen.java | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java index c370f9e..08cdd3f 100644 --- a/phone/com/android/internal/policy/impl/LockScreen.java +++ b/phone/com/android/internal/policy/impl/LockScreen.java @@ -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 { diff --git a/phone/com/android/internal/policy/impl/UnlockScreen.java b/phone/com/android/internal/policy/impl/UnlockScreen.java index e090ac5..32633e1 100644 --- a/phone/com/android/internal/policy/impl/UnlockScreen.java +++ b/phone/com/android/internal/policy/impl/UnlockScreen.java @@ -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( |