diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
| -rw-r--r-- | OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml | 14 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml index 46b5fb458..ea8394333 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="vertical" > <Button android:id="@+id/import_qrcode_button" @@ -10,4 +10,16 @@ android:layout_height="wrap_content" android:text="@string/menu_importFromQrCode" /> + <TextView + android:id="@+id/import_qrcode_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <ProgressBar + android:id="@+id/import_qrcode_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:progress="0" /> + </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 2a0ea7a04..29b01a8aa 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -354,7 +354,10 @@ <string name="import_sign_and_upload">Import, Sign, and upload selected keys</string> <string name="import_finish">Finish</string> <string name="import_from_clipboard">Import from Clipboard</string> - + <string name="import_qr_code_missing">Missing QR Codes: %1$s</string> + <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> + <string name="import_qr_code_finished">QR Code scanning finished!</string> + <!-- Intent labels --> <string name="intent_decrypt_file">OpenPGP: Decrypt File</string> <string name="intent_import_key">OpenPGP: Import Key</string> |