From: jabarros <jabarros@solidgear.es>
Date: Tue, 8 Jul 2014 11:03:09 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.5.8
X-Git-Tag: oc-android-1.7.0_signed~125^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/96e2d198e0129bc698561148eb45cf0422ebf4f2?hp=1c89aae29edf4bbc7345cb8a43f2695a8f1a0d64

Merge branch 'develop' into release-1.5.8
---

diff --git a/res/drawable-hdpi/folder_public.png b/res/drawable-hdpi/folder_public.png
new file mode 100644
index 00000000..00f71c21
Binary files /dev/null and b/res/drawable-hdpi/folder_public.png differ
diff --git a/res/drawable-mdpi/folder_public.png b/res/drawable-mdpi/folder_public.png
new file mode 100644
index 00000000..bffdace7
Binary files /dev/null and b/res/drawable-mdpi/folder_public.png differ
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 9c47aa6c..459f4f16 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -38,8 +38,8 @@
 
         <ImageView
             android:id="@+id/imageView1"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
             android:layout_gravity="center_vertical|center"
             android:layout_margin="4dp"
             android:src="@drawable/ic_menu_archive" />
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 408154ac..4a30be66 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -119,6 +119,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             sharedWithMeIconV.setVisibility(View.GONE);
 
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
+            localStateView.bringToFront();
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
             if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
@@ -184,6 +185,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 } else {
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
                 }
+
+                // If folder is sharedByLink, icon folder must be changed to
+                // folder-public one
+                if (file.isShareByLink()) {
+                    fileIcon.setImageResource(R.drawable.folder_public);
+                }
             }
 
             if (file.isShareByLink()) {