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

am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1

Browse Source 
* commit '34a62348be92034a9fb7582e51754224785568dc':
  Fix 5581164: Use abbreviated day in lockscreen
This commit is contained in:
Jim Miller
2011-11-15 15:44:17 -08:00
committed by Android Git Automerger
parent c558a15931 34a62348be
commit 8622fb3476
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/values/donottranslate-cldr.xml
View File

@@ -145,5 +145,6 @@
<string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s – %6$s, %7$s %8$s, %9$s</string> <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s – %6$s, %7$s %8$s, %9$s</string>
<string name="short_format_month">%b</string> <string name="short_format_month">%b</string>
<string name="full_wday_month_day_no_year">EEEE, MMMM d</string> <string name="full_wday_month_day_no_year">EEEE, MMMM d</string>
<string name="abbrev_wday_month_day_no_year">EEE, MMMM d</string>
<string name="abbrev_wday_month_day_year">EEE, MMM d, yyyy</string> <string name="abbrev_wday_month_day_year">EEE, MMM d, yyyy</string>
</resources> </resources>

2
policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java
View File

@@ -168,7 +168,7 @@ class KeyguardStatusViewManager implements OnClickListener {
boolean emergencyButtonEnabledInScreen) { boolean emergencyButtonEnabledInScreen) {
if (DEBUG) Log.v(TAG, "KeyguardStatusViewManager()"); if (DEBUG) Log.v(TAG, "KeyguardStatusViewManager()");
mContainer = view; mContainer = view;
mDateFormatString = getContext().getString(R.string.full_wday_month_day_no_year); mDateFormatString = getContext().getString(R.string.abbrev_wday_month_day_no_year);
mLockPatternUtils = lockPatternUtils; mLockPatternUtils = lockPatternUtils;
mUpdateMonitor = updateMonitor; mUpdateMonitor = updateMonitor;
mCallback = callback; mCallback = callback;