Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Jim Miller
2010-01-22 20:23:32 -08:00
committed by Android Git Automerger
parent d6a9355031 5bfb2e0d7c
commit f3b777a9ef
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/com/android/internal/policy/impl/LockScreen.java
View File

@@ -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 {

4
policy/com/android/internal/policy/impl/UnlockScreen.java
View File

@@ -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(