diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 23:06:25 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 23:06:51 +0200 |
commit | 952bb99a2467bb5c1c2988d33451df0249e04a42 (patch) | |
tree | 7c8cdeba0812cf84443880010cbedc73ab3a52d7 /OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml | |
parent | 6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602 (diff) | |
parent | 8a2ffd8f90e9653ed69f945a94f6b9702dbdfff4 (diff) | |
download | open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.tar.gz open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.tar.bz2 open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.zip |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml index 472c05e65..590f7f797 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml @@ -3,13 +3,15 @@ xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_qrcode_button" android:layout_width="match_parent" android:layout_height="70dp" - android:layout_margin="10dp" android:text="@string/import_qr_scan_button" bootstrapbutton:bb_icon_left="fa-barcode" bootstrapbutton:bb_size="default" @@ -19,8 +21,9 @@ android:id="@+id/import_qrcode_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" android:visibility="gone" /> <ProgressBar @@ -28,8 +31,8 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:progress="0" android:visibility="gone" /> |