sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'kruks23-development' into development

This commit is contained in:
iNPUTmice 2014-06-06 16:44:40 +02:00
parent a1507d91ff c489f368b8
commit 5cd750cb5e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eu/siacs/conversations/utils/UIHelper.java
View File

@ -39,6 +39,7 @@ import android.preference.PreferenceManager;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder; import android.support.v4.app.TaskStackBuilder;
import android.text.format.DateUtils;
import android.text.Html; import android.text.Html;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -51,6 +52,7 @@ public class UIHelper {
private static final int BG_COLOR = 0xFF181818; private static final int BG_COLOR = 0xFF181818;
private static final int FG_COLOR = 0xFFE5E5E5; private static final int FG_COLOR = 0xFFE5E5E5;
private static final int TRANSPARENT = 0x00000000; 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) { public static String readableTimeDifference(Context context, long time) {
if (time == 0) { if (time == 0) {
@ -66,8 +68,7 @@ public class UIHelper {
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm",Locale.US); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm",Locale.US);
return sdf.format(date); return sdf.format(date);
} else { } else {
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd",Locale.US); return DateUtils.formatDateTime(context, date.getTime(), DATE_NO_YEAR_FLAGS);
return sdf.format(date);
} }
} }