Merge branch 'develop' into regular_authentication_in_saml_server

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

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index ddad38c..abe0e7f 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -3,10 +3,11 @@
   ownCloud Android client application\r
 \r
   Copyright (C) 2012  Bartek Przybylski\r
   ownCloud Android client application\r
 \r
   Copyright (C) 2012  Bartek Przybylski\r

+  Copyright (C) 2012-2013 ownCloud Inc.\r
+\r

   This program is free software: you can redistribute it and/or modify\r
   This program is free software: you can redistribute it and/or modify\r

-  it under the terms of the GNU General Public License as published by\r
-  the Free Software Foundation, either version 3 of the License, or\r
-  (at your option) any later version.\r
+  it under the terms of the GNU General Public License version 2,\r
+  as published by the Free Software Foundation.\r

 \r
   This program is distributed in the hope that it will be useful,\r
   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 \r
   This program is distributed in the hope that it will be useful,\r
   but WITHOUT ANY WARRANTY; without even the implied warranty of\r


@@ -53,14 +54,14 @@
             android:src="@drawable/ic_favorite" />\r
         \r
     </FrameLayout>\r
             android:src="@drawable/ic_favorite" />\r
         \r
     </FrameLayout>\r

-\r\r\r\r
+\r

     <LinearLayout\r
         android:layout_width="0dp"\r
         android:layout_height="match_parent"\r
         android:layout_weight="1"\r
         android:gravity="center_vertical"\r
         android:orientation="vertical" >\r
     <LinearLayout\r
         android:layout_width="0dp"\r
         android:layout_height="match_parent"\r
         android:layout_weight="1"\r
         android:gravity="center_vertical"\r
         android:orientation="vertical" >\r

-\r\r
+\r

         <TextView\r
             android:id="@+id/Filename"\r
             android:layout_width="wrap_content"\r
         <TextView\r
             android:id="@+id/Filename"\r
             android:layout_width="wrap_content"\r


@@ -101,7 +102,16 @@
         </LinearLayout>\r
 \r
     </LinearLayout>\r
         </LinearLayout>\r
 \r
     </LinearLayout>\r

-\r\r\r\r
+\r
+    <ImageView\r
+        android:id="@+id/shareIcon"\r
+        android:layout_width="wrap_content"\r
+        android:layout_height="wrap_content"\r
+        android:layout_gravity="center_vertical"\r
+        android:layout_marginLeft="4dp"\r
+        android:layout_marginRight="4dp"\r
+        android:src="@drawable/sharedlink" />\r
+\r

     <ImageView\r
         android:id="@+id/custom_checkbox"\r
         android:layout_width="wrap_content"\r
     <ImageView\r
         android:id="@+id/custom_checkbox"\r
         android:layout_width="wrap_content"\r