From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 13:00:16 +0000 (+0200)
Subject: Merge branch 'setup_colors' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fc5608de767a9c45073b870e2e2860a012800f99?hp=b66e309dfa8b145a293cb47b7cbcf588dc0c79ab

Merge branch 'setup_colors' into setup_app_name
---

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index fed4dceb..ee8bbc3d 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -26,6 +26,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/login_background_color"
         android:layout_above="@id/buttonOK"
         android:layout_alignParentTop="true"
         android:orientation="horizontal" >
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 52a8ed29..cda8d5bf 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -29,6 +29,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/login_background_color"
         android:gravity="center"
         android:orientation="vertical"
         android:padding="8dp" >
diff --git a/res/values/setup.xml b/res/values/setup.xml
index b5b91169..a7aad1f8 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -18,6 +18,7 @@
     <string name="auth_method_saml_web_sso">off</string>
     
     <!-- Colors -->
+    <color name="login_background_color">#FFFFFF</color>
     <color name="background_color">#F7F7F7</color>
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>