aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/res/layout')
-rw-r--r--OpenPGP-Keychain/res/layout/edit_key_activity.xml2
-rw-r--r--OpenPGP-Keychain/res/layout/edit_key_key_item.xml2
-rw-r--r--OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml12
3 files changed, 11 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/res/layout/edit_key_activity.xml
index f8597b0df..351aec512 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_activity.xml
@@ -45,7 +45,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/edit_key_btn_change_pass_phrase"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="60dp"
android:padding="4dp"
android:text="@string/btn_set_passphrase"
bootstrapbutton:bb_icon_left="fa-pencil"
diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
index 11bce64ee..ad6bd6779 100644
--- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
@@ -82,7 +82,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/expiry"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="60dp"
android:text="@string/none"
bootstrapbutton:bb_type="default" />
</TableRow>
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 f3c09a41d..5229e7cf5 100644
--- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="10dp"
- android:text="@string/menu_import_from_qr_code"
+ android:text="@string/import_qr_scan_button"
bootstrapbutton:bb_icon_left="fa-barcode"
bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" />
@@ -18,13 +18,19 @@
<TextView
android:id="@+id/import_qrcode_text"
android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp"
+ android:visibility="gone" />
<ProgressBar
android:id="@+id/import_qrcode_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:progress="0" />
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp"
+ android:progress="0"
+ android:visibility="gone" />
</LinearLayout> \ No newline at end of file