diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-06 16:44:40 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-06 16:44:40 +0200 |
| commit | 5cd750cb5e7ce5e9b0ddcab8e0089b964d1de70d (patch) | |
| tree | ebbec8a6d42bb769f2b5e717a47a05aa7fbfaf6d /src | |
| parent | a1507d91ffc8e0edcdb4fae7a95d746c0091622e (diff) | |
| parent | c489f368b861bdee5e438301e1cc6b6e8c067e54 (diff) | |
Merge branch 'kruks23-development' into development
Diffstat (limited to 'src')
| -rw-r--r-- | src/eu/siacs/conversations/utils/UIHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index 15d98d85..00885f7c 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -39,6 +39,7 @@ import android.preference.PreferenceManager; import android.provider.ContactsContract.Contacts; import android.support.v4.app.NotificationCompat; import android.support.v4.app.TaskStackBuilder; +import android.text.format.DateUtils; import android.text.Html; import android.util.DisplayMetrics; import android.view.LayoutInflater; @@ -51,6 +52,7 @@ public class UIHelper { private static final int BG_COLOR = 0xFF181818; private static final int FG_COLOR = 0xFFE5E5E5; private static final int TRANSPARENT = 0x00000000; + private static final int DATE_NO_YEAR_FLAGS = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL; public static String readableTimeDifference(Context context, long time) { if (time == 0) { @@ -66,8 +68,7 @@ public class UIHelper { SimpleDateFormat sdf = new SimpleDateFormat("HH:mm",Locale.US); return sdf.format(date); } else { - SimpleDateFormat sdf = new SimpleDateFormat("MM/dd",Locale.US); - return sdf.format(date); + return DateUtils.formatDateTime(context, date.getTime(), DATE_NO_YEAR_FLAGS); } } |