Passphrase dialog: Button to switch between keyboard layouts

OpenKeychain/src/main/res/layout/passphrase_dialog.xml

@@ -23,15 +23,32 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/enter_passphrase" />
 
-        <EditText
-            android:id="@+id/passphrase_passphrase"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:imeOptions="actionDone"
-            android:hint="@string/label_passphrase"
-            android:ems="10"
-            android:layout_gravity="center_horizontal" />
+            android:orientation="horizontal">
+
+            <EditText
+                android:id="@+id/passphrase_passphrase"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:imeOptions="actionDone"
+                android:hint="@string/label_passphrase"
+                android:ems="10"
+                android:layout_weight="1"
+                android:layout_gravity="center_horizontal" />
+
+            <ImageButton
+                android:id="@+id/passphrase_keyboard"
+                android:src="@drawable/ic_numeric_black_24dp"
+                style="@style/MaterialFlatButton"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
 
         <LinearLayout
             android:layout_width="wrap_content"

OpenKeychain/src/main/res/values/strings.xml

@@ -152,7 +152,6 @@
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
     <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
     <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
-    <string name="label_use_num_keypad_for_security_token_pin">Use number keypad for PINs</string>
     <string name="label_asymmetric_from">"Sign with:"</string>
     <string name="label_to">"Encrypt to"</string>
     <string name="label_delete_after_encryption">"Delete files after encryption"</string>
@@ -314,6 +313,8 @@
     <string name="passphrase_for_symmetric_encryption">"Enter password"</string>
     <string name="passphrase_for_backup">"Enter backup code"</string>
     <string name="passphrase_for">"Enter password for '%s'"</string>
+    <string name="passphrase_keyboard_hint_alpha">"Change to alphabetic keyboard"</string>
+    <string name="passphrase_keyboard_hint_numeric">"Change to numeric keyboard"</string>
     <string name="pin_for">"Enter PIN for '%s'"</string>
     <string name="security_token_pin_for">"Enter PIN to access Security Token for '%s'"</string>
     <string name="security_token_nfc_text">"Hold Security Token against the NFC marker at the back of your device."</string>

OpenKeychain/src/main/res/xml/passphrase_preferences.xml

@@ -7,8 +7,4 @@
         android:defaultValue="false"
         android:key="passphraseCacheSubs"
         android:title="@string/label_passphrase_cache_subs" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="useNumKeypadForYubikeyPin"
-        android:title="@string/label_use_num_keypad_for_security_token_pin" />
 </PreferenceScreen>