Merge branch 'master' into release-1.4.4

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

diff --git a/res/layout/file_activity_details.xml b/res/layout/file_activity_details.xml
index da5d312..435a248 100644 (file)
--- a/res/layout/file_activity_details.xml
+++ b/res/layout/file_activity_details.xml
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-<fragment
-    android:id="@+id/fileDetail"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    class="eu.alefzero.owncloud.FileDetail" />
-
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--\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
+  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
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+  GNU General Public License for more details.\r
+\r
+  You should have received a copy of the GNU General Public License\r
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+\r
+-->\r
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
+    android:layout_width="fill_parent"\r
+    android:layout_height="fill_parent"\r
+    android:orientation="vertical" >\r
+\r
+    <LinearLayout\r
+        android:id="@+id/fragment"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="fill_parent" >\r
+            <!-- Preview: layout=@layout/file_details_fragment -->\r
+    </LinearLayout>\r
+\r
 </LinearLayout>
\ No newline at end of file