aboutsummaryrefslogtreecommitdiffstats
path: root/APG/res/layout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 17:01:45 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 17:01:45 +0100
commit68039d3a8a0ce9b20ee426765094807112a634d7 (patch)
tree50d5f528382a89030be0c78f26e4cd7be5ca5b71 /APG/res/layout
parent6cc7156fbd094265dddd66562941c90a2d9079d6 (diff)
downloadopen-keychain-68039d3a8a0ce9b20ee426765094807112a634d7.tar.gz
open-keychain-68039d3a8a0ce9b20ee426765094807112a634d7.tar.bz2
open-keychain-68039d3a8a0ce9b20ee426765094807112a634d7.zip
Improved import with preview of keyrings
Diffstat (limited to 'APG/res/layout')
-rw-r--r--APG/res/layout/import_keys.xml22
1 files changed, 13 insertions, 9 deletions
diff --git a/APG/res/layout/import_keys.xml b/APG/res/layout/import_keys.xml
index 8e107cd96..1c2dbd0c7 100644
--- a/APG/res/layout/import_keys.xml
+++ b/APG/res/layout/import_keys.xml
@@ -6,7 +6,7 @@
<LinearLayout
android:id="@+id/import_from_qr_code_footer"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical"
@@ -36,23 +36,27 @@
</LinearLayout>
<ScrollView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_above="@id/import_from_qr_code_footer"
android:fillViewport="true" >
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingLeft="10dp"
- android:paddingRight="10dp" >
+ android:paddingLeft="12dp"
+ android:paddingRight="12dp" >
- <TextView
- android:id="@+id/import_from_qr_code_content"
+ <LinearLayout
+ android:id="@+id/import_keys_list_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="" />
+ android:layout_marginTop="16dp"
+ android:orientation="vertical"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp" >
+ </LinearLayout>
</LinearLayout>
</ScrollView>