aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml11
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml3
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml2
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml2
4 files changed, 6 insertions, 12 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
index c56ba130e..a974f6ec0 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
@@ -5,16 +5,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true"
- android:orientation="vertical">
-
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:fillViewport="true"
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@@ -73,7 +68,6 @@
android:layout_gravity="left"
android:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_alignTop="@+id/linearLayout"
android:layout_toRightOf="@+id/relativeLayout" />
<TextView
@@ -206,7 +200,6 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
- </LinearLayout>
<include layout="@layout/drawer_list" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
index 663949d8e..437e5ebaf 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
@@ -71,7 +71,8 @@
android:id="@+id/comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1" />
+ android:layout_weight="1"
+ android:inputType="text"/>
</TableRow>
</TableLayout>
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
index 058a43eaf..950978a0e 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
@@ -13,7 +13,7 @@
<EditText
android:id="@+id/server"
- android:layout_width="match_parent"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="textUri" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
index 4a09e4240..eddbe3cbf 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
@@ -14,7 +14,7 @@
android:orientation="horizontal" >
<RelativeLayout
- android:layout_width="wrap_content"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="6sp"
android:layout_marginLeft="16sp"