From d3d73f5f85478df08c6de24088292dc2d931421d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 4 Oct 2015 22:51:44 +0200
Subject: [PATCH] center wizard buttons for other languages

---
 .../res/layout/create_key_email_fragment.xml   |  2 ++
 .../res/layout/create_key_final_fragment.xml   |  2 ++
 .../res/layout/create_key_name_fragment.xml    |  2 ++
 .../layout/create_key_passphrase_fragment.xml  |  2 ++
 .../res/layout/create_key_start_fragment.xml   |  2 ++
 .../layout/create_yubi_key_blank_fragment.xml  |  8 ++++----
 .../layout/create_yubi_key_import_fragment.xml |  2 ++
 .../layout/create_yubi_key_pin_fragment.xml    |  2 ++
 .../create_yubi_key_pin_repeat_fragment.xml    |  2 ++
 .../layout/create_yubi_key_wait_fragment.xml   | 18 +-----------------
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
index d4ece38ac..c1f692a88 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
@@ -62,6 +62,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_back"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -79,6 +80,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_next"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 9a6c33f82..118f0661a 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -155,6 +155,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_back"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -172,6 +173,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_create_key"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
index 7b8ba3fc1..4e37dd713 100644
--- a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
@@ -56,6 +56,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_back"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -73,6 +74,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_next"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
index 9d10bbe70..9368aa1ef 100644
--- a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
@@ -74,6 +74,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/btn_back"
             android:textAllCaps="true"
@@ -91,6 +92,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/btn_next"
             android:textAllCaps="true"
diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
index 20c434c02..622cdf5a0 100644
--- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
@@ -74,6 +74,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/first_time_import_key"
             android:textAllCaps="true"
@@ -91,6 +92,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/btn_do_not_save"
             android:textAllCaps="true"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
index ca203d0b5..7e2bf2246 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
@@ -45,6 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_back"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -52,8 +53,7 @@
             android:drawablePadding="8dp"
             android:gravity="left|center_vertical"
             android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical" />
+            style="?android:attr/borderlessButtonStyle" />
 
         <TextView
             android:id="@+id/create_key_next_button"
@@ -63,6 +63,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/first_time_blank_yubikey_yes"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -70,7 +71,6 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical|right"
             android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical" />
+            style="?android:attr/borderlessButtonStyle" />
     </LinearLayout>
 </RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml
index 838ee37b4..3a54f264f 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml
@@ -94,6 +94,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/btn_back"
             android:textAllCaps="true"
@@ -111,6 +112,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/btn_import"
             android:textAllCaps="true"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
index 393ec76d4..34871affe 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
@@ -80,6 +80,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_back"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -97,6 +98,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:text="@string/btn_next"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml
index d233398ca..af9080f55 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml
@@ -79,6 +79,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:clickable="true"
             android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
             android:drawablePadding="8dp"
@@ -96,6 +97,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:clickable="true"
             android:drawablePadding="8dp"
             android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml
index a000dc82e..7f26995a7 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml
@@ -56,27 +56,11 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
             android:drawablePadding="8dp"
+            android:layout_gravity="center_vertical"
             android:gravity="left|center_vertical"
             android:clickable="true"
             style="?android:attr/borderlessButtonStyle" />
 
-        <TextView
-            android:id="@+id/create_key_next_button"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_next"
-            android:textAllCaps="true"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/yubi_icon_24dp"
-            android:drawablePadding="16dp"
-            android:gravity="right|center_vertical"
-            android:clickable="false"
-            style="?android:attr/borderlessButtonStyle" />
-
     </LinearLayout>
 
 </RelativeLayout>