Merge remote-tracking branch 'upstream/develop' into

[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 40bf119..682d2be 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -25,8 +25,6 @@ import java.util.HashMap;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r

-import android.util.Log;\r
-\r

 import com.owncloud.android.R;\r
 \r
 /**\r
 import com.owncloud.android.R;\r
 \r
 /**\r


@@ -151,6 +149,7 @@ public class DisplayUtils {
      * known MIME type.\r
      * \r
      * @param mimetype      MIME type string.\r
      * known MIME type.\r
      * \r
      * @param mimetype      MIME type string.\r

+     * @param filename      name, with extension\r

      * @return              Resource identifier of an image resource.\r
      */\r
     public static int getResourceId(String mimetype, String filename) {\r
      * @return              Resource identifier of an image resource.\r
      */\r
     public static int getResourceId(String mimetype, String filename) {\r