Fix crash in navigation in FileList

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

diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index cb0206c..42bdcdd 100644 (file)
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -2,7 +2,7 @@
 <!-- \r
   ownCloud Android client application\r
 \r
 <!-- \r
   ownCloud Android client application\r
 \r

-  Copyright (C) 2012-2013 ownCloud Inc.\r
+  Copyright (C) 2015 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
 \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


@@ -22,26 +22,28 @@
     android:layout_height="fill_parent"\r
     android:background="@color/background_color"\r
     android:orientation="vertical" >\r
     android:layout_height="fill_parent"\r
     android:background="@color/background_color"\r
     android:orientation="vertical" >\r

-
+\r

     <fragment\r
         android:id="@+id/local_files_list"\r
         android:layout_width="match_parent"\r
         android:layout_height="0dip"\r
         android:layout_weight="1"\r
         class="com.owncloud.android.ui.fragment.LocalFileListFragment" />\r
     <fragment\r
         android:id="@+id/local_files_list"\r
         android:layout_width="match_parent"\r
         android:layout_height="0dip"\r
         android:layout_weight="1"\r
         class="com.owncloud.android.ui.fragment.LocalFileListFragment" />\r

-
+\r

     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:gravity="center"\r
         android:orientation="horizontal" >\r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
         android:gravity="center"\r
         android:orientation="horizontal" >\r

-\r        <com.owncloud.android.ui.CustomButton\r
+\r
+        <Button\r

             android:id="@+id/upload_files_btn_cancel"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_weight="1"\r
             android:text="@string/common_cancel" />\r
             android:id="@+id/upload_files_btn_cancel"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_weight="1"\r
             android:text="@string/common_cancel" />\r

-\r              <com.owncloud.android.ui.CustomButton\r
+\r
+               <Button\r

                    android:id="@+id/upload_files_btn_upload"\r
                    android:layout_width="wrap_content"\r
                    android:layout_height="wrap_content"\r
                    android:id="@+id/upload_files_btn_upload"\r
                    android:layout_width="wrap_content"\r
                    android:layout_height="wrap_content"\r