Merge branch 'develop' into thumbnailOOM

[pub/Android/ownCloud.git] / res / layout / grid_image.xml

diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index e372faa..383c615 100644 (file)
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
   ownCloud Android client application\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
   ownCloud Android client application\r

-  Copyright (C) 2014 ownCloud Inc.\r
+  Copyright (C) 2015 ownCloud Inc.\r

 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r
 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r


@@ -29,6 +29,15 @@
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content" >\r
 \r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content" >\r
 \r

+        <com.owncloud.android.ui.SquareImageView\r
+            android:id="@+id/thumbnail"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="match_parent"\r
+            android:paddingLeft="10dp"\r
+            android:paddingRight="10dp"\r
+            android:scaleType="centerCrop"\r
+            android:src="@drawable/ic_menu_archive"/>\r
+\r

         <LinearLayout\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
         <LinearLayout\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r


@@ -53,14 +62,6 @@
                 android:src="@drawable/shared_with_me"\r
                 android:visibility="invisible" />\r
         </LinearLayout>\r
                 android:src="@drawable/shared_with_me"\r
                 android:visibility="invisible" />\r
         </LinearLayout>\r

-        <com.owncloud.android.ui.SquareImageView\r
-            android:id="@+id/thumbnail"\r
-            android:layout_width="match_parent"\r
-            android:layout_height="match_parent"\r
-            android:paddingLeft="10dp"\r
-            android:paddingRight="10dp"\r
-            android:scaleType="centerCrop"\r
-            android:src="@drawable/ic_menu_archive"/>\r

 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r
 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r