Merge branch 'master' into release-1.4.4

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

diff --git a/res/layout/main.xml b/res/layout/main.xml
index ef4705b..a55cf59 100644 (file)
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,25 +1,40 @@
 <?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
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
-    android:background="#F7F7F7"\r
-    android:orientation="vertical" >
-\r
-    <fragment\r
-        android:id="@+id/actionBar"\r
-        android:layout_width="fill_parent"\r
-        android:layout_height="wrap_content"\r
-        class="eu.alefzero.owncloud.ui.fragment.ActionBar" >
-        <!-- Preview: layout=@layout/action_bar -->
-    </fragment>\r
+    android:orientation="vertical" >\r
     \r
-    <fragment\r
-        android:id="@+id/landingPage"\r
+    <GridView\r
+        android:id="@+id/homeScreenGrid"\r
         android:layout_width="fill_parent"\r
-        android:layout_height="wrap_content"\r
-        class="eu.alefzero.owncloud.ui.fragment.LandingPageFragment" >\r
-        <!-- Preview: layout=@layout/landing_page_fragment -->\r
-    </fragment>\r
+        android:layout_height="fill_parent"\r
+        android:layout_gravity="center_horizontal"\r
+        android:columnWidth="90dp"\r
+        android:gravity="center"\r
+        android:horizontalSpacing="20dp"\r
+        android:verticalSpacing="20dp"\r
+        android:layout_marginTop="20dp"\r
+        android:numColumns="2"\r
+        android:stretchMode="columnWidth" >\r
+    </GridView>\r
 \r
     \r
 \r