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 268ee51..a968f3b 100644 (file)
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -25,25 +25,46 @@
 \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:background="@color/background_color"\r
-        android:baselineAligned="false"\r
-        android:orientation="horizontal" >\r
+        android:orientation="vertical">\r
 \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
-        <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
-        <FrameLayout\r
-            android:id="@+id/right_fragment_container"\r
-            android:layout_width="0dp"\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_weight="2" />\r
+            android:background="@color/background_color"\r
+\r
+            android:orientation="horizontal"\r
+            android:id="@+id/ListLayout"\r
+            android:contentDescription="@string/list_layout"\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
+\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
     <include\r
@@ -52,4 +73,4 @@
         android:layout_height="match_parent"\r
         android:layout_gravity="start"/>\r
 \r
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>\r