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

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

diff --git a/res/layout/grid_image.xml b/res/layout/grid_image.xml
index 383c615..9f93a3e 100644 (file)
--- a/res/layout/grid_image.xml
+++ b/res/layout/grid_image.xml
@@ -38,30 +38,13 @@
             android:scaleType="centerCrop"\r
             android:src="@drawable/ic_menu_archive"/>\r
 \r
-        <LinearLayout\r
+        <ImageView\r
+            android:id="@+id/sharedIcon"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="top|right"\r
-            android:orientation="vertical"\r
-            android:layout_margin="4dp">\r
-\r
-            <ImageView\r
-                android:id="@+id/sharedIcon"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="center"\r
-                android:layout_marginBottom="4dp"\r
-                android:src="@drawable/sharedlink" />\r
-\r
-            <ImageView\r
-                android:id="@+id/sharedWithMeIcon"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="center"\r
-                android:layout_marginTop="4dp"\r
-                android:src="@drawable/shared_with_me"\r
-                android:visibility="invisible" />\r
-        </LinearLayout>\r
+            android:layout_margin="4dp"\r
+            android:src="@drawable/shared_via_link" />\r
 \r
         <ImageView\r
             android:id="@+id/localFileIndicator"\r
@@ -81,6 +64,16 @@
             android:layout_marginBottom="4dp"\r
             android:layout_marginRight="4dp"\r
             android:src="@drawable/ic_favorite" />\r
+\r
+        <ImageView\r
+            android:id="@+id/custom_checkbox"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="center_vertical|bottom"\r
+            android:layout_marginLeft="4dp"\r
+            android:layout_marginRight="4dp"\r
+            android:gravity=""\r
+            android:src="@android:drawable/checkbox_off_background" />\r
     </FrameLayout>\r
 \r
 </LinearLayout>
\ No newline at end of file