Remove custom_buttons option from setup.xml. Review account_setup and pincodelock

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 7bd362d..322ac9a 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -186,16 +186,14 @@
        </LinearLayout>\r
        \r
        <Button\r
        </LinearLayout>\r
        \r
        <Button\r

-               android:id="@id/buttonOK"\r
-               android:layout_width="match_parent"\r
-               android:layout_height="wrap_content"\r
-               android:background="@android:drawable/btn_default"\r
-               android:layout_above="@id/account_register"\r
-               android:layout_centerHorizontal="true"\r
-               android:enabled="false"\r
-               android:onClick="onOkClick"\r
-               android:text="@string/setup_btn_connect"\r
-               />\r
+           android:id="@id/buttonOK"\r
+           android:layout_width="match_parent"\r
+           android:layout_height="wrap_content"\r
+           android:layout_above="@id/account_register"\r
+           android:layout_centerHorizontal="true"\r
+           android:enabled="false"\r
+           android:onClick="onOkClick"\r
+           android:text="@string/setup_btn_connect" />\r

 \r
        <Button\r
            android:id="@+id/account_register"\r
 \r
        <Button\r
            android:id="@+id/account_register"\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index c263daf..de77dd2 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -170,12 +170,10 @@
             android:id="@+id/buttonOK"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:id="@+id/buttonOK"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r

-            android:background="@android:drawable/btn_default"\r

             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r

-            android:text="@string/setup_btn_connect"\r
-            />\r
+            android:text="@string/setup_btn_connect" />\r

 \r
         <Button\r
             android:id="@+id/account_register"\r
 \r
         <Button\r
             android:id="@+id/account_register"\r

diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index b1b6ce8..b2cf5df 100644 (file)
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -68,9 +68,10 @@
             style="@style/PassCodeStyle" />\r
     </LinearLayout>\r
 \r
             style="@style/PassCodeStyle" />\r
     </LinearLayout>\r
 \r

-    <Button android:layout_width="wrap_content"\r
+    <Button\r
+        android:id="@+id/cancel"\r
+        android:layout_width="wrap_content"\r

         android:layout_height="wrap_content"\r
         android:layout_height="wrap_content"\r

-        android:text="@string/common_cancel"\r
-        android:textColor="@android:color/black"\r
-        android:id="@+id/cancel"/>\r
+        android:text="@string/common_cancel" />\r
+\r

 </LinearLayout>\r
 </LinearLayout>\r

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 395929b..dc32b09 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -24,8 +24,7 @@
     <color name="actionbar_end_color">#1D2D44</color>
     
     <!-- Button -->
     <color name="actionbar_end_color">#1D2D44</color>
     
     <!-- Button -->

-    <bool name="custom_buttons">false</bool> <!-- enable background customization -->
-    <color name="button_text_color">#FFFFFF</color>
+    <color name="button_text_color">#000000</color>

     
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">true</bool>
     
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">true</bool>