Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...

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

diff --git a/res/layout/files.xml b/res/layout/files.xml
index 5d87b12..a968f3b 100644 (file)
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -25,72 +25,52 @@
 \r
     <!-- The main content view -->\r
     <LinearLayout\r
 \r
     <!-- The main content view -->\r
     <LinearLayout\r

-        xmlns:android="http://schemas.android.com/apk/res/android"\r

         android:layout_width="match_parent"\r
         android:layout_height="match_parent"\r
         android:layout_width="match_parent"\r
         android:layout_height="match_parent"\r

-        android:background="@color/background_color"\r
-        android:baselineAligned="false"\r
-        android:orientation="horizontal" >\r
+        android:orientation="vertical">\r

 \r
 \r

-        \r
-        <FrameLayout\r
-            android:id="@+id/left_fragment_container"\r
-            android:layout_width="0dp"\r
-            android:layout_height="match_parent"\r
-            android:layout_weight="1" />\r
+        <ProgressBar android:id="@+id/progressBar"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="6dp"\r
+            android:padding="0dp"\r
+            android:layout_margin="0dp"\r
+            style="@style/Widget.ownCloud.TopProgressBar"\r
+            android:indeterminate="true"\r
+            android:indeterminateOnly="true"\r
+            android:background="#ffffff"\r

 \r
 \r

-        <FrameLayout\r
-            android:id="@+id/right_fragment_container"\r
-            android:layout_width="0dp"\r
-            android:layout_height="match_parent"\r
-            android:layout_weight="2" />\r
-    </LinearLayout>\r
+            />\r

 \r
 \r

-    \r
-         <LinearLayout\r
-             xmlns:android="http://schemas.android.com/apk/res/android"\r
-             android:id="@+id/left_drawer"\r
-             android:layout_width="240dp"\r
-             android:layout_height="match_parent"\r
-             android:layout_gravity="start"\r
-             android:background="@color/background_color"\r
-             android:baselineAligned="false"\r
-             android:clickable="true"\r
-             android:orientation="vertical">\r
+        <LinearLayout\r
+            xmlns:android="http://schemas.android.com/apk/res/android"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="match_parent"\r
+            android:background="@color/background_color"\r

 \r
 \r

-    <LinearLayout\r
-        android:layout_width="match_parent"\r
-        android:layout_height="wrap_content"\r
-        android:layout_margin="5dp">\r
+            android:orientation="horizontal"\r
+            android:id="@+id/ListLayout"\r
+            android:contentDescription="@string/list_layout"\r
+            >\r

 \r
 \r

-        <ImageView\r
-            android:id="@+id/drawer_userIcon"\r
-            android:layout_width="40dp"\r
-            android:layout_height="40dp"\r
-            android:src="@drawable/abs__ab_solid_dark_holo" />\r
+            <FrameLayout\r
+                android:id="@+id/left_fragment_container"\r
+                android:layout_width="0dp"\r
+                android:layout_height="match_parent"\r
+                android:layout_weight="1" />\r

 \r
 \r

-        <TextView\r
-            android:id="@+id/drawer_username"\r
-            android:layout_width="wrap_content"\r
-            android:layout_height="wrap_content"\r
-            android:layout_gravity="center_vertical"\r
-            android:layout_marginLeft="5dp"\r
-            android:layout_marginStart="5dp"\r
-            android:textAppearance="?android:attr/textAppearanceLarge" />\r
+            <FrameLayout\r
+                android:id="@+id/right_fragment_container"\r
+                android:layout_width="0dp"\r
+                android:layout_height="match_parent"\r
+                android:layout_weight="2" />\r
+        </LinearLayout>\r

 \r
     </LinearLayout>\r
 \r
 \r
     </LinearLayout>\r
 \r

-    <TextView\r
-        android:layout_width="fill_parent"\r
-        android:layout_height="2dip"\r
-        android:background="@color/list_item_lastmod_and_filesize_text" />\r
-\r
-    <ListView\r
-        android:id="@+id/drawer_list"\r
-        android:layout_width="fill_parent"\r
+    <include\r
+        layout="@layout/drawer"\r
+        android:layout_width="240dp"\r

         android:layout_height="match_parent"\r
         android:layout_height="match_parent"\r

-        android:background="@color/background_color"\r
-        android:choiceMode="singleChoice"\r
-        />\r
-</LinearLayout>\r
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+        android:layout_gravity="start"/>\r
+\r
+</android.support.v4.widget.DrawerLayout>\r