diff options
| -rw-r--r-- | OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml | 3 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml | 21 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 3 |
3 files changed, 21 insertions, 6 deletions
diff --git a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml index 961c6523a..abde4e972 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml @@ -10,7 +10,8 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_margin="10dp" - android:text="@string/import_from_clipboard" + android:text="@string/import_clipboard_button" + bootstrapbutton:bb_icon_left="fa-clipboard" bootstrapbutton:bb_size="default" bootstrapbutton:bb_type="default" /> diff --git a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml index 6d70578af..203cc6ad6 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml @@ -1,17 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_margin="10dp" android:orientation="horizontal" > <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_nfc_button" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="60dp" - android:layout_margin="10dp" - android:text="@string/menu_import_from_nfc" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginLeft="10dp" + android:text="@string/import_nfc_help_button" + bootstrapbutton:bb_icon_left="fa-question" bootstrapbutton:bb_size="default" bootstrapbutton:bb_type="default" /> -</LinearLayout>
\ No newline at end of file + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/import_nfc_button" + android:text="@string/import_nfc_text" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 746a13015..a17687369 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -332,6 +332,9 @@ <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> <string name="import_qr_code_finished">QR Code scanning finished!</string> <string name="import_qr_scan_button">Scan QR Code with \'Barcode Scanner\'</string> + <string name="import_nfc_text">To exchange keys via NFC, the device needs to be unlocked.</string> + <string name="import_nfc_help_button">Help</string> + <string name="import_clipboard_button">Get key from clipboard</string> <!-- Intent labels --> <string name="intent_decrypt_file">OpenPGP: Decrypt File</string> |