Merge pull request #1383 from jocelynthode/master

Add time to messages when they are within the week
fork-5.53.8
Jake McGinty 2014-04-27 19:19:49 -07:00
commit 716519f4b8
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -27,7 +27,7 @@ public class DateUtils extends android.text.format.DateUtils {
prettyDate = DateUtils.formatDateTime(c, millis, DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_TIME);
} else if (isWithinWeek(millis)) {
prettyDate = DateUtils.formatDateTime(c, millis,
DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY);
DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY | DateUtils.FORMAT_SHOW_TIME);
} else if (isWithinYear(millis)) {
prettyDate = DateUtils.formatDateTime(c, millis,
DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL);