Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps

[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / DisplayUtils.java

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 804a4dd..cdd8683 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -27,7 +27,10 @@ import java.util.HashSet;
 import java.util.Set;\r
 \r
 import android.annotation.TargetApi;\r
+import android.content.Context;\r
 import android.os.Build;\r
+import android.text.format.DateFormat;\r
+import android.text.format.DateUtils;\r
 \r
 import com.owncloud.android.MainApp;\r
 import com.owncloud.android.R;\r
@@ -274,4 +277,15 @@ public class DisplayUtils {
             return url;\r
         }\r
     }\r
+    \r
+    public static CharSequence getRelativeDateTimeString(Context c, long time, long minResolution, long transitionResolution, int flags){\r
+        if (time > System.currentTimeMillis()){\r
+            return DisplayUtils.unixTimeToHumanReadable(time);\r
+        } else if ((System.currentTimeMillis() - time) < 60000) {\r
+            return  c.getString(R.string.file_list_seconds_ago)  + ", " + \r
+                DateFormat.getTimeFormat(c).format(new Date(time));\r
+        } else {\r
+            return DateUtils.getRelativeDateTimeString(c, time, minResolution, transitionResolution, flags);\r
+        }\r
+    }\r
 }\r