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

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

Browse Source 
Merge commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70'

* commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70':
  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-28 12:37:42 -08:00
committed by Android Git Automerger
parent d8e1e74ddb f3b777a9ef
commit 92728a0974
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

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

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

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