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_nfc_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_nfc_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml index 2a8e74fc2..8c0a80e4e 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml @@ -3,8 +3,10 @@ xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:padding="10dp" - android:orientation="horizontal" > + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="horizontal"> <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/import_nfc_button" @@ -12,7 +14,7 @@ android:layout_height="70dp" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginLeft="10dp" + android:layout_marginLeft="8dp" android:text="@string/import_nfc_help_button" bootstrapbutton:bb_icon_left="fa-question" bootstrapbutton:bb_size="default" |