Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8622fb34 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

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

* commit '34a62348':
  Fix 5581164: Use abbreviated day in lockscreen
parents c558a159 34a62348

core/res/res/values/donottranslate-cldr.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;