summaryrefslogtreecommitdiff
path: root/phone/com/android/internal/policy/impl/LockScreen.java
diff options
context:
space:
mode:
Diffstat (limited to 'phone/com/android/internal/policy/impl/LockScreen.java')
-rw-r--r--phone/com/android/internal/policy/impl/LockScreen.java6
1 files changed, 5 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 {