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 fed4dce..ee8bbc3 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -26,6 +26,7 @@
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
+        android:background="@color/login_background_color"\r
         android:layout_above="@id/buttonOK"\r
         android:layout_alignParentTop="true"\r
         android:orientation="horizontal" >\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 52a8ed2..cda8d5b 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -29,6 +29,7 @@
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
+        android:background="@color/login_background_color"\r
         android:gravity="center"\r
         android:orientation="vertical"\r
         android:padding="8dp" >\r

diff --git a/res/values/setup.xml b/res/values/setup.xml
index b5b9116..a7aad1f 100644 (file)
--- 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>