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

am c5eb3fa4: Use new date format for lock screen.

Browse Source 
Merge commit 'c5eb3fa4bdce22c15f4fef74a51a293399f9a980' into eclair-mr2

* commit 'c5eb3fa4bdce22c15f4fef74a51a293399f9a980':
  Use new date format for lock screen.
This commit is contained in:
Daniel Sandler
2009-11-13 14:59:17 -08:00
committed by Android Git Automerger
parent 1d7ed54139 6f2da1e578
commit a47fc99553
2 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
private boolean mSilentMode;
private AudioManager mAudioManager;
private java.text.DateFormat mDateFormat;
private String mDateFormatString;
private java.text.DateFormat mTimeFormat;
private boolean mCreatedInPortrait;
private boolean mEnableMenuKeyInLockScreen;
@@ -243,7 +243,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
refreshAlarmDisplay();
mTimeFormat = DateFormat.getTimeFormat(getContext());
mDateFormat = getLockScreenDateFormat();
mDateFormatString = getContext().getString(R.string.full_wday_month_day_no_year);
refreshTimeAndDateDisplay();
updateStatusLines();
}
@@ -369,29 +369,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
}
private void refreshTimeAndDateDisplay() {
Date now = new Date();
mDate.setText(mDateFormat.format(now));
}
/**
* @return A localized format like "Fri, Sep 18, 2009"
*/
private java.text.DateFormat getLockScreenDateFormat() {
SimpleDateFormat adjusted = null;
try {
// this call gives us the localized order
final SimpleDateFormat dateFormat = (SimpleDateFormat)
java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL);
adjusted = new SimpleDateFormat(dateFormat.toPattern()
.replace("MMMM", "MMM") // we want "Sep", not "September"
.replace("EEEE", "EEE")); // we want "Fri", no "Friday"
} catch (ClassCastException e) {
// in case the library implementation changes and this throws a class cast exception
// or anything else that is funky
Log.e("LockScreen", "couldn't finnagle our custom date format :(", e);
return java.text.DateFormat.getDateInstance(java.text.DateFormat.MEDIUM);
}
return adjusted;
mDate.setText(DateFormat.format(mDateFormatString, new Date()));
}
private void updateStatusLines() {

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

@@ -71,6 +71,8 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient
private boolean mCreatedInPortrait;
private String mDateFormatString;
private TextView mCarrier;
private TextView mDate;
@@ -169,6 +171,7 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient
mCarrier = (TextView) findViewById(R.id.carrier);
mDate = (TextView) findViewById(R.id.date);
mDateFormatString = getContext().getString(R.string.full_wday_month_day_no_year);
refreshTimeAndDateDisplay();
mStatus1 = (TextView) findViewById(R.id.status1);
@@ -317,8 +320,7 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient
private void refreshTimeAndDateDisplay() {
Date now = new Date();
mDate.setText(DateFormat.getMediumDateFormat(getContext()).format(now));
mDate.setText(DateFormat.format(mDateFormatString, new Date()));
}