Merge branch 'develop' into regular_authentication_in_saml_server

[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 9c1613a..6c15ff7 100644 (file)
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -5,9 +5,8 @@
   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 as published by\r
-  the Free Software Foundation, either version 2 of the License, or\r
-  (at your option) any later version.\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
@@ -21,7 +20,7 @@
     android:id="@+id/upload_files_layout"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
-    android:background="@color/owncloud_white"\r
+    android:background="@color/background_color"\r
     android:orientation="vertical" >\r
 
     <fragment\r