diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-10-06 01:12:30 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-10-06 01:12:30 +0200 |
| commit | b3d51b8b8025f5b33db7c7e922604d5945f313b4 (patch) | |
| tree | d1bac2e18e44f20a9ba23affba788ce4be428794 /OpenPGP-Keychain/res/layout | |
| parent | 2942d94a29ce298723b5f20b5bf4c2e43eb795a7 (diff) | |
| download | open-keychain-b3d51b8b8025f5b33db7c7e922604d5945f313b4.tar.gz open-keychain-b3d51b8b8025f5b33db7c7e922604d5945f313b4.tar.bz2 open-keychain-b3d51b8b8025f5b33db7c7e922604d5945f313b4.zip | |
QR Code import works now
Diffstat (limited to 'OpenPGP-Keychain/res/layout')
| -rw-r--r-- | OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml | 14 |
1 files changed, 13 insertions, 1 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 |