diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-15 15:42:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-15 15:42:20 -0800 |
| commit | 34a62348be92034a9fb7582e51754224785568dc (patch) | |
| tree | 757e0d02f3dc4584f99ae30e64b36403bb3d1d79 | |
| parent | cce32110e6f42378a76e0eb2495d24b6c8bc8ae7 (diff) | |
| parent | e5ae019b8cb3f4235b0d3e5eace27ce56680c60e (diff) | |
| download | frameworks_base-34a62348be92034a9fb7582e51754224785568dc.zip frameworks_base-34a62348be92034a9fb7582e51754224785568dc.tar.gz frameworks_base-34a62348be92034a9fb7582e51754224785568dc.tar.bz2 | |
Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
| -rw-r--r-- | core/res/res/values/donottranslate-cldr.xml | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/values/donottranslate-cldr.xml b/core/res/res/values/donottranslate-cldr.xml index a94fb58..15fcd8b 100644 --- a/core/res/res/values/donottranslate-cldr.xml +++ b/core/res/res/values/donottranslate-cldr.xml @@ -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="short_format_month">%b</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> </resources> diff --git a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java index 22b2460..ee54de1 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java @@ -168,7 +168,7 @@ class KeyguardStatusViewManager implements OnClickListener { boolean emergencyButtonEnabledInScreen) { if (DEBUG) Log.v(TAG, "KeyguardStatusViewManager()"); 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; mUpdateMonitor = updateMonitor; mCallback = callback; |