aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-07-23 12:57:02 +0000
committerThialfihar <thialfihar@gmail.com>2010-07-23 12:57:02 +0000
commit2407f3b9892ddb0d34cfc5c674b6d4e3a6d06b51 (patch)
tree36f8d8a446d1e3b81ce862e8edb3e4de3daf5de7 /res/layout
parent15461e47205e05b82bb49f7c633e5a6fb3cc9a47 (diff)
downloadopen-keychain-2407f3b9892ddb0d34cfc5c674b6d4e3a6d06b51.tar.gz
open-keychain-2407f3b9892ddb0d34cfc5c674b6d4e3a6d06b51.tar.bz2
open-keychain-2407f3b9892ddb0d34cfc5c674b6d4e3a6d06b51.zip
have a direct set/change pass phrase button in key creation/editing, instead of hiding it in the menu, also capitalize user id names automatically and give the email field an inputType of textEmailAddress
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/edit_key.xml28
-rw-r--r--res/layout/edit_key_user_id_item.xml6
2 files changed, 31 insertions, 3 deletions
diff --git a/res/layout/edit_key.xml b/res/layout/edit_key.xml
index 0b441b0a2..88be75d86 100644
--- a/res/layout/edit_key.xml
+++ b/res/layout/edit_key.xml
@@ -32,7 +32,33 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
- android:layout_marginRight="?android:attr/scrollbarSize"/>
+ android:layout_marginRight="?android:attr/scrollbarSize">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <View
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ <Button
+ android:id="@+id/btn_change_pass_phrase"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:text="@string/btn_setPassPhrase"/>
+
+ <View
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
</ScrollView>
diff --git a/res/layout/edit_key_user_id_item.xml b/res/layout/edit_key_user_id_item.xml
index 6164cf767..2dc383a01 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/res/layout/edit_key_user_id_item.xml
@@ -59,7 +59,8 @@
android:id="@+id/name"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"/>
+ android:layout_width="fill_parent"
+ android:inputType="textPersonName|textCapWords"/>
</TableRow>
@@ -77,7 +78,8 @@
android:id="@+id/email"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"/>
+ android:layout_width="fill_parent"
+ android:inputType="textEmailAddress"/>
</TableRow>