Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta

[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 25cc55a..e3c94f2 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -198,8 +198,13 @@ public class DisplayUtils {
         return fileExtension;\r
     }\r
 \r
         return fileExtension;\r
     }\r
 \r

+    public static CharSequence getRelativeTimestamp(Context context, OCFile file) {\r
+        return getRelativeDateTimeString(context, file.getModificationTimestamp(),\r
+                DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r
+    }\r
+\r

     @SuppressWarnings("deprecation")\r
     @SuppressWarnings("deprecation")\r

-    public static CharSequence getRelativeDateTimeString (\r
+    private static CharSequence getRelativeDateTimeString (\r

             Context c, long time, long minResolution, long transitionResolution, int flags\r
             ){\r
         \r
             Context c, long time, long minResolution, long transitionResolution, int flags\r
             ){\r
         \r