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

This commit is contained in:
masensio 2013-10-31 16:59:38 +01:00
parent 20b5ecbac1
commit 39688fe30f
4 changed files with 15 additions and 19 deletions

View file

@ -189,13 +189,11 @@
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"
android:onClick="onOkClick"
android:text="@string/setup_btn_connect"
/>
android:text="@string/setup_btn_connect" />
<Button
android:id="@+id/account_register"

View file

@ -170,12 +170,10 @@
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"
android:text="@string/setup_btn_connect"
/>
android:text="@string/setup_btn_connect" />
<Button
android:id="@+id/account_register"

View file

@ -68,9 +68,10 @@
style="@style/PassCodeStyle" />
</LinearLayout>
<Button android:layout_width="wrap_content"
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_cancel"
android:textColor="@android:color/black"
android:id="@+id/cancel"/>
android:text="@string/common_cancel" />
</LinearLayout>

View file

@ -24,8 +24,7 @@
<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>