diff options
| author | Jim Miller <jaggies@google.com> | 2010-01-28 12:37:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-28 12:37:42 -0800 |
| commit | 4313ab05dede50915adb908b9d1dbc3bd3404e3e (patch) | |
| tree | 5812ec53acdf62b0e18a95d9feee4d918ede78cf | |
| parent | 0f06f2f89132fd7afbaec4683284df26a837cf21 (diff) | |
| parent | fe22c50410029eaf37f3e8e910a8c5fdd5769c70 (diff) | |
| download | base-4313ab05dede50915adb908b9d1dbc3bd3404e3e.tar.gz | |
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.
| -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 657bff1..ba6b3b3 100644 --- a/phone/com/android/internal/policy/impl/LockScreen.java +++ b/phone/com/android/internal/policy/impl/LockScreen.java @@ -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 { diff --git a/phone/com/android/internal/policy/impl/UnlockScreen.java b/phone/com/android/internal/policy/impl/UnlockScreen.java index 5e6e54d..f2a2c95 100644 --- a/phone/com/android/internal/policy/impl/UnlockScreen.java +++ b/phone/com/android/internal/policy/impl/UnlockScreen.java @@ -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( |