From: masensio <masensio@solidgear.es>
Date: Tue, 22 Oct 2013 10:42:57 +0000 (+0200)
Subject: Merge branch 'setup_colors' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aabdaee86861832d15558f91f040479a1906beee?hp=6e0c53649089732e59e45563d29784a01a499a06

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 47fc2d8c..9b800579 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -189,6 +189,7 @@
 		android:id="@id/buttonOK"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="@android:drawable/btn_default"
 		android:layout_above="@id/account_register"
 		android:layout_centerHorizontal="true"
 		android:enabled="false"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index cda8d5bf..543627d5 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -170,6 +170,7 @@
             android:id="@+id/buttonOK"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@android:drawable/btn_default"
             android:layout_gravity="center_horizontal"
             android:enabled="false"
             android:onClick="onOkClick"