aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/account_item.xml14
-rw-r--r--res/layout/create_key.xml14
-rw-r--r--res/layout/decrypt_message.xml146
-rw-r--r--res/layout/edit_key.xml29
-rw-r--r--res/layout/edit_key_key_item.xml216
-rw-r--r--res/layout/edit_key_section.xml2
-rw-r--r--res/layout/edit_key_user_id_item.xml167
-rw-r--r--res/layout/encrypt_file.xml166
-rw-r--r--res/layout/encrypt_message.xml138
-rw-r--r--res/layout/file_dialog.xml24
-rw-r--r--res/layout/key_list.xml28
-rw-r--r--res/layout/key_list_child_item_master_key.xml88
-rw-r--r--res/layout/key_list_child_item_sub_key.xml76
-rw-r--r--res/layout/key_list_child_item_user_id.xml14
-rw-r--r--res/layout/key_list_group_item.xml55
-rw-r--r--res/layout/mailbox_message_item.xml58
-rw-r--r--res/layout/main.xml93
-rw-r--r--res/layout/select_public_key.xml57
-rw-r--r--res/layout/select_public_key_item.xml137
-rw-r--r--res/layout/select_secret_key.xml9
-rw-r--r--res/layout/select_secret_key_item.xml111
-rw-r--r--res/values/strings.xml11
22 files changed, 980 insertions, 673 deletions
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
index e37000ff0..c2a75075e 100644
--- a/res/layout/account_item.xml
+++ b/res/layout/account_item.xml
@@ -24,12 +24,12 @@
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight">
-<TextView
- android:id="@+id/account_name"
- android:text="someone@gmail.com"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
+ <TextView
+ android:id="@+id/account_name"
+ android:text="someone@gmail.com"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
</LinearLayout>
diff --git a/res/layout/create_key.xml b/res/layout/create_key.xml
index 569b703f5..ab327ffeb 100644
--- a/res/layout/create_key.xml
+++ b/res/layout/create_key.xml
@@ -18,35 +18,47 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
+
<TableLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:stretchColumns="1"
android:layout_marginRight="?android:attr/scrollbarSize"
android:paddingLeft="6dip">
+
<TableRow>
+
<TextView android:id="@+id/label_algorithm"
android:text="Algorithm"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"/>
+
<Spinner
android:id="@+id/algorithm"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
+
</TableRow>
+
<TableRow>
+
<TextView android:id="@+id/label_size"
android:text="Key Size"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"/>
+
<EditText android:id="@+id/size"
android:text="1024"
android:layout_height="wrap_content"
- android:layout_width="fill_parent" android:gravity="right" android:numeric="integer"/>
+ android:layout_width="fill_parent"
+ android:gravity="right"
+ android:numeric="integer"/>
</TableRow>
+
</TableLayout>
+
</ScrollView>
diff --git a/res/layout/decrypt_message.xml b/res/layout/decrypt_message.xml
index 2a0aa153d..de5b5e7fa 100644
--- a/res/layout/decrypt_message.xml
+++ b/res/layout/decrypt_message.xml
@@ -21,77 +21,79 @@
android:layout_height="fill_parent"
android:fillViewport="true">
-<EditText
- android:id="@+id/message"
- android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:gravity="top"/>
-
-<LinearLayout
- android:orientation="horizontal"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:paddingLeft="5dip"
- android:paddingRight="5dip">
-
-<LinearLayout
- android:id="@+id/layout_signature"
- android:orientation="horizontal"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_weight="2">
-
-<RelativeLayout
- android:layout_height="wrap_content"
- android:layout_width="wrap_content">
-<ImageView
- android:id="@+id/ic_signature"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/signed_large"/>
-
-<ImageView
- android:id="@+id/ic_signature_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/overlay_error"/>
-
-</RelativeLayout>
-
-<LinearLayout
- android:orientation="vertical"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingLeft="5dip">
-
-<TextView
- android:id="@+id/main_user_id"
- android:text="Main User Id"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left"/>
-
-<TextView
- android:id="@+id/main_user_id_rest"
- android:text="Main User Id Rest"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:layout_gravity="left"/>
-
-</LinearLayout>
-</LinearLayout>
-
-<Button
- android:id="@+id/btn_decrypt"
- android:text="@string/btn_decrypt"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"/>
-
-</LinearLayout>
+ <EditText
+ android:id="@+id/message"
+ android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:gravity="top"/>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip">
+
+ <LinearLayout
+ android:id="@+id/layout_signature"
+ android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_weight="2">
+
+ <RelativeLayout
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
+
+ <ImageView
+ android:id="@+id/ic_signature"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/signed_large"/>
+
+ <ImageView
+ android:id="@+id/ic_signature_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/overlay_error"/>
+
+ </RelativeLayout>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingLeft="5dip">
+
+ <TextView
+ android:id="@+id/main_user_id"
+ android:text="Main User Id"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"/>
+
+ <TextView
+ android:id="@+id/main_user_id_rest"
+ android:text="Main User Id Rest"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/btn_decrypt"
+ android:text="@string/btn_decrypt"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
</LinearLayout>
-
diff --git a/res/layout/edit_key.xml b/res/layout/edit_key.xml
index 2fceeb5a3..bf994fa44 100644
--- a/res/layout/edit_key.xml
+++ b/res/layout/edit_key.xml
@@ -22,19 +22,21 @@
android:paddingTop="5dip"
android:fillViewport="true">
-<ScrollView
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1">
-<LinearLayout
- android:id="@+id/container"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical"
- android:layout_marginRight="?android:attr/scrollbarSize"/>
-</ScrollView>
+ <ScrollView
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1">
-<LinearLayout
+ <LinearLayout
+ android:id="@+id/container"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:layout_marginRight="?android:attr/scrollbarSize"/>
+
+ </ScrollView>
+
+ <LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -53,6 +55,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/btn_doNotSave"/>
-</LinearLayout>
+
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/edit_key_key_item.xml b/res/layout/edit_key_key_item.xml
index 46de4a977..78c1d1254 100644
--- a/res/layout/edit_key_key_item.xml
+++ b/res/layout/edit_key_key_item.xml
@@ -15,99 +15,129 @@
-->
<org.thialfihar.android.apg.ui.widget.KeyEditor
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="5dip">
-
-<View
- android:id="@+id/separator"
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"/>
-
-<LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:orientation="horizontal">
- <TableLayout
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="16dip"
- android:stretchColumns="1">
- <TableRow>
- <TextView android:id="@+id/label_key_id" android:text="Key ID"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"/>
- <TextView
- android:id="@+id/key_id"
- android:text="00000000 00000000"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingRight="5dip"
- android:typeface="monospace"/>
- </TableRow>
- <TableRow>
- <TextView android:id="@+id/label_algorithm"
- android:text="Algorithm"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"/>
- <TextView android:id="@+id/algorithm"
- android:text="Name"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingRight="5dip"/>
- </TableRow>
- <TableRow>
- <TextView android:id="@+id/label_creation"
- android:text="Creation"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"/>
- <TextView
- android:id="@+id/creation"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"/>
- </TableRow>
- <TableRow>
- <TextView android:id="@+id/label_expiry"
- android:text="Expiry"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"/>
- <Button
- android:id="@+id/expiry"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"/>
- </TableRow>
- <TableRow>
- <TextView android:id="@+id/label_usage"
- android:text="Usage"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"/>
- <Spinner
- android:id="@+id/usage"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"/>
- </TableRow>
- </TableLayout>
-
- <ImageButton
- android:id="@+id/edit_delete"
- android:layout_width="wrap_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingLeft="5dip">
+
+ <View
+ android:id="@+id/separator"
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"/>
+
+ <LinearLayout
android:layout_height="wrap_content"
- style="@style/MinusButton"
- android:layout_gravity="center_vertical"/>
+ android:layout_width="fill_parent"
+ android:orientation="horizontal">
+
+ <TableLayout
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_marginLeft="16dip"
+ android:stretchColumns="1">
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/label_key_id"
+ android:text="Key ID"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip"/>
+
+ <TextView
+ android:id="@+id/key_id"
+ android:text="00000000 00000000"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingRight="5dip"
+ android:typeface="monospace"/>
+
+ </TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/label_algorithm"
+ android:text="Algorithm"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip"/>
+
+ <TextView
+ android:id="@+id/algorithm"
+ android:text="Name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingRight="5dip"/>
+
+ </TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/label_creation"
+ android:text="Creation"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip"/>
+
+ <TextView
+ android:id="@+id/creation"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+
+ </TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/label_expiry"
+ android:text="Expiry"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip"/>
+
+ <Button
+ android:id="@+id/expiry"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+
+ </TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/label_usage"
+ android:text="Usage"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip"/>
+
+ <Spinner
+ android:id="@+id/usage"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+
+ </TableRow>
+
+ </TableLayout>
+
+ <ImageButton
+ android:id="@+id/edit_delete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/MinusButton"
+ android:layout_gravity="center_vertical"/>
+
+ </LinearLayout>
-</LinearLayout>
</org.thialfihar.android.apg.ui.widget.KeyEditor>
diff --git a/res/layout/edit_key_section.xml b/res/layout/edit_key_section.xml
index b3a48f87e..e57b3b8df 100644
--- a/res/layout/edit_key_section.xml
+++ b/res/layout/edit_key_section.xml
@@ -15,7 +15,7 @@
-->
<org.thialfihar.android.apg.ui.widget.SectionView
- xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
diff --git a/res/layout/edit_key_user_id_item.xml b/res/layout/edit_key_user_id_item.xml
index 998c436cb..40b852e3e 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/res/layout/edit_key_user_id_item.xml
@@ -15,82 +15,99 @@
-->
<org.thialfihar.android.apg.ui.widget.UserIdEditor
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="5dip">
-
-<View
- android:id="@+id/separator"
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"/>
-
-<RadioButton
- android:id="@+id/is_main_user_id" android:text="Main User ID"
- android:layout_height="wrap_content" android:layout_width="wrap_content"
- android:layout_marginLeft="20dip"/>
-
-<LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:orientation="horizontal">
- <TableLayout
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="16dip">
- <TableRow>
- <TextView
- android:id="@+id/name_label"
- android:text="Name"
- android:layout_gravity="center_vertical"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingRight="5dip"/>
- <EditText
- android:id="@+id/name"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"/>
- </TableRow>
- <TableRow>
- <TextView
- android:id="@+id/email_label"
- android:text="Email"
- android:layout_gravity="center_vertical"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingRight="5dip"/>
- <EditText
- android:id="@+id/email"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"/>
- </TableRow>
- <TableRow>
- <TextView
- android:id="@+id/comment_label"
- android:text="Comment"
- android:layout_gravity="center_vertical"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingRight="5dip"/>
- <EditText
- android:id="@+id/comment"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"/>
- </TableRow>
- </TableLayout>
-
- <ImageButton
- android:id="@+id/edit_delete"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingLeft="5dip">
+
+ <View
+ android:id="@+id/separator"
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"/>
+
+ <RadioButton
+ android:id="@+id/is_main_user_id"
+ android:text="Main User ID"
+ android:layout_height="wrap_content"
android:layout_width="wrap_content"
+ android:layout_marginLeft="20dip"/>
+
+ <LinearLayout
android:layout_height="wrap_content"
- style="@style/MinusButton"
- android:layout_gravity="center_vertical"/>
+ android:layout_width="fill_parent"
+ android:orientation="horizontal">
+
+ <TableLayout
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:layout_marginLeft="16dip">
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/name_label"
+ android:text="Name"
+ android:layout_gravity="center_vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingRight="5dip"/>
+
+ <EditText
+ android:id="@+id/name"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"/>
+
+ </TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/email_label"
+ android:text="Email"
+ android:layout_gravity="center_vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingRight="5dip"/>
+
+ <EditText
+ android:id="@+id/email"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"/>
+
+ </TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:id="@+id/comment_label"
+ android:text="Comment"
+ android:layout_gravity="center_vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingRight="5dip"/>
+
+ <EditText
+ android:id="@+id/comment"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"/>
+
+ </TableRow>
+
+ </TableLayout>
+
+ <ImageButton
+ android:id="@+id/edit_delete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/MinusButton"
+ android:layout_gravity="center_vertical"/>
+
+ </LinearLayout>
-</LinearLayout>
</org.thialfihar.android.apg.ui.widget.UserIdEditor>
diff --git a/res/layout/encrypt_file.xml b/res/layout/encrypt_file.xml
new file mode 100644
index 000000000..8a2b9665b
--- /dev/null
+++ b/res/layout/encrypt_file.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:paddingTop="5dip">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip">
+
+ <TextView
+ android:id="@+id/label_filename"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="50dip"
+ android:layout_height="wrap_content"
+ android:text="@string/label_file"/>
+
+ <EditText
+ android:id="@+id/filename"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ <ImageButton
+ android:id="@+id/btn_browse"
+ android:src="@drawable/ic_launcher_folder_small"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"/>
+
+ </LinearLayout>
+
+ <TabHost
+ android:id="@+id/tab_host"
+ android:layout_weight="1"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip">
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="65dip"/>
+
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:paddingTop="65dip">
+
+ <LinearLayout
+ android:id="@+id/tab_asymmetric"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="3dip"
+ android:orientation="horizontal">
+
+ <CheckBox
+ android:text="@string/sign"
+ android:id="@+id/sign"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="5dip">
+
+ <TextView
+ android:id="@+id/main_user_id"
+ android:text="Main User Id"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"/>
+
+ <TextView
+ android:id="@+id/main_user_id_rest"
+ android:text="Main User Id Rest"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <View
+ android:id="@+id/separator"
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"/>
+
+ <TextView
+ android:id="@+id/label_encrypt_keys"
+ android:text="@string/label_encrypt_keys"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <ListView
+ android:id="@+id/public_key_list"
+ android:choiceMode="multipleChoice"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/tab_symmetric"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
+
+
+
+ </LinearLayout>
+
+ </FrameLayout>
+
+ </TabHost>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ style="@android:style/ButtonBar">
+
+ <Button
+ android:id="@+id/btn_encrypt"
+ android:text="@string/btn_encrypt"
+ android:layout_weight="1"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/encrypt_message.xml b/res/layout/encrypt_message.xml
index 254552e03..3d8db4e6e 100644
--- a/res/layout/encrypt_message.xml
+++ b/res/layout/encrypt_message.xml
@@ -21,75 +21,73 @@
android:layout_height="fill_parent"
android:fillViewport="true">
-<EditText
- android:id="@+id/message"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:gravity="top"
- android:inputType="text|textCapSentences|textMultiLine|textLongMessage">
-</EditText>
-
-<LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="fill_parent" android:paddingBottom="3dip">
+ <EditText
+ android:id="@+id/message"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:gravity="top"
+ android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/>
+
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:paddingBottom="3dip">
+
+ <CheckBox
+ android:text="@string/sign"
+ android:id="@+id/sign"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="5dip">
+
+ <TextView
+ android:id="@+id/main_user_id"
+ android:text="Main User Id"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"/>
+
+ <TextView
+ android:id="@+id/main_user_id_rest"
+ android:text="Main User Id Rest"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ style="@android:style/ButtonBar">
+
+ <Button
+ android:text="@string/btn_selectEncryptKeys"
+ android:id="@+id/btn_selectEncryptKeys"
+ android:layout_weight="1"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"/>
+
+ <Button
+ android:id="@+id/btn_send"
+ android:text="@string/btn_send"
+ android:layout_weight="1"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
-<CheckBox
- android:text="@string/sign"
- android:id="@+id/sign"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
-
-<LinearLayout
- android:orientation="vertical"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:layout_gravity="center_vertical"
- android:paddingRight="5dip">
-
-<TextView
- android:id="@+id/main_user_id"
- android:text="Main User Id"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right">
-</TextView>
-
-<TextView
- android:id="@+id/main_user_id_rest"
- android:text="Main User Id Rest"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:layout_gravity="right">
-</TextView>
-
-</LinearLayout>
</LinearLayout>
-
-<LinearLayout
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- style="@android:style/ButtonBar">
-
-<Button
- android:text="@string/btn_selectEncryptKeys"
- android:id="@+id/btn_selectEncryptKeys"
- android:layout_weight="1"
- android:layout_width="0dip"
- android:layout_height="wrap_content"/>
-
-<Button
- android:id="@+id/btn_send"
- android:text="@string/btn_send"
- android:layout_weight="1"
- android:layout_width="0dip"
- android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
-</LinearLayout>
-
-
diff --git a/res/layout/file_dialog.xml b/res/layout/file_dialog.xml
index 6804ecaba..c42d2636e 100644
--- a/res/layout/file_dialog.xml
+++ b/res/layout/file_dialog.xml
@@ -15,21 +15,23 @@
-->
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
- >
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip">
+
<EditText
android:id="@+id/input"
- android:layout_width="wrap_content"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_weight="1"
- />
+ android:layout_weight="1"/>
- <ImageButton
+ <ImageButton
android:id="@+id/btn_browse"
+ android:src="@drawable/ic_launcher_folder_small"
android:layout_height="wrap_content"
- android:src="@drawable/ic_launcher_folder_small" android:layout_width="wrap_content"/>
+ android:layout_width="wrap_content"/>
+
</LinearLayout>
diff --git a/res/layout/key_list.xml b/res/layout/key_list.xml
new file mode 100644
index 000000000..f08495368
--- /dev/null
+++ b/res/layout/key_list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fillViewport="true">
+
+ <ExpandableListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"/>
+
+</ScrollView>
diff --git a/res/layout/key_list_child_item_master_key.xml b/res/layout/key_list_child_item_master_key.xml
index 47eba65b5..f98f94762 100644
--- a/res/layout/key_list_child_item_master_key.xml
+++ b/res/layout/key_list_child_item_master_key.xml
@@ -19,54 +19,62 @@
android:singleLine="true"
android:paddingLeft="10dip"
android:layout_marginRight="?android:attr/scrollbarSize"
- android:layout_height="?android:attr/listPreferredItemHeight" android:layout_width="fill_parent">
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_width="fill_parent">
-<LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:orientation="horizontal"
- android:paddingRight="3dip">
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:orientation="horizontal"
+ android:paddingRight="3dip">
-<ImageView
- android:id="@+id/ic_master_key"
- android:src="@drawable/key_small"
- android:paddingRight="6dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:layout_gravity="center_vertical"/>
+ <ImageView
+ android:id="@+id/ic_master_key"
+ android:src="@drawable/key_small"
+ android:paddingRight="6dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
-<TextView
- android:id="@+id/key_id"
- android:text="Key ID"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:paddingRight="5dip" android:typeface="monospace"/>
+ <TextView
+ android:id="@+id/key_id"
+ android:text="Key ID"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="5dip"
+ android:typeface="monospace"/>
-<TextView
- android:id="@+id/key_details"
- android:text="(RSA, 1024bit)"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/key_details"
+ android:text="(RSA, 1024bit)"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <LinearLayout
+ android:gravity="right"
+ android:orientation="horizontal"
+ android:paddingBottom="2dip"
+ android:paddingTop="2dip"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_gravity="center_vertical">
-<LinearLayout
- android:gravity="right"
- android:orientation="horizontal"
- android:layout_width="fill_parent" android:paddingBottom="2dip" android:paddingTop="2dip" android:layout_height="fill_parent" android:layout_gravity="center_vertical">
+ <ImageView
+ android:id="@+id/ic_encrypt_key"
+ android:src="@drawable/encrypted_small"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<ImageView
- android:id="@+id/ic_encrypt_key"
- android:src="@drawable/encrypted_small"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <ImageView
+ android:id="@+id/ic_sign_key"
+ android:src="@drawable/signed_small"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<ImageView
- android:id="@+id/ic_sign_key"
- android:src="@drawable/signed_small"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ </LinearLayout>
-</LinearLayout>
+ </LinearLayout>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout/key_list_child_item_sub_key.xml b/res/layout/key_list_child_item_sub_key.xml
index 085d78f05..11ad90fe1 100644
--- a/res/layout/key_list_child_item_sub_key.xml
+++ b/res/layout/key_list_child_item_sub_key.xml
@@ -22,49 +22,51 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_width="fill_parent">
-<LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:orientation="horizontal"
- android:paddingRight="3dip">
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:orientation="horizontal"
+ android:paddingRight="3dip">
-<TextView
- android:id="@+id/key_id"
- android:text="Key ID"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:paddingRight="5dip" android:typeface="monospace"/>
+ <TextView
+ android:id="@+id/key_id"
+ android:text="Key ID"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="5dip"
+ android:typeface="monospace"/>
-<TextView
- android:id="@+id/key_details"
- android:text="(RSA, 1024bit)"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/key_details"
+ android:text="(RSA, 1024bit)"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <LinearLayout
+ android:gravity="right"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:paddingBottom="2dip"
+ android:paddingTop="2dip"
+ android:layout_gravity="center_vertical">
-<LinearLayout
- android:gravity="right"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:paddingBottom="2dip"
- android:paddingTop="2dip"
- android:layout_gravity="center_vertical">
+ <ImageView
+ android:id="@+id/ic_encrypt_key"
+ android:src="@drawable/encrypted_small"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<ImageView
- android:id="@+id/ic_encrypt_key"
- android:src="@drawable/encrypted_small"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <ImageView
+ android:id="@+id/ic_sign_key"
+ android:src="@drawable/signed_small"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<ImageView
- android:id="@+id/ic_sign_key"
- android:src="@drawable/signed_small"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ </LinearLayout>
-</LinearLayout>
+ </LinearLayout>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout/key_list_child_item_user_id.xml b/res/layout/key_list_child_item_user_id.xml
index 80cdd2867..fa2b720de 100644
--- a/res/layout/key_list_child_item_user_id.xml
+++ b/res/layout/key_list_child_item_user_id.xml
@@ -22,12 +22,12 @@
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight">
-<TextView
- android:id="@+id/user_id"
- android:text="User ID"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="3dip"/>
+ <TextView
+ android:id="@+id/user_id"
+ android:text="User ID"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="3dip"/>
</LinearLayout>
diff --git a/res/layout/key_list_group_item.xml b/res/layout/key_list_group_item.xml
index aaada82e3..c04c1d223 100644
--- a/res/layout/key_list_group_item.xml
+++ b/res/layout/key_list_group_item.xml
@@ -21,32 +21,33 @@
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight">
-<LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:paddingLeft="36dip">
-
-<TextView
- android:id="@+id/main_user_id"
- android:text="Main User ID"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-<TextView
- android:id="@+id/main_user_id_rest"
- android:text="&lt;user@somewhere.com&gt;"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
-<LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="36dip">
+
+ <TextView
+ android:id="@+id/main_user_id"
+ android:text="Main User ID"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:id="@+id/main_user_id_rest"
+ android:text="&lt;user@somewhere.com&gt;"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ </LinearLayout>
</LinearLayout>
-
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout/mailbox_message_item.xml b/res/layout/mailbox_message_item.xml
index 6026909d3..131abff46 100644
--- a/res/layout/mailbox_message_item.xml
+++ b/res/layout/mailbox_message_item.xml
@@ -24,34 +24,34 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_width="fill_parent">
-<ImageView
- android:id="@+id/ic_status"
- android:src="@drawable/encrypted"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"/>
-
-<LinearLayout
- android:orientation="vertical"
- android:paddingLeft="5dip"
- android:layout_weight="1"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
-<TextView
- android:id="@+id/subject"
- android:text="Subject"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-<TextView
- android:id="@+id/email_address"
- android:text="user@somewhere.com"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <ImageView
+ android:id="@+id/ic_status"
+ android:src="@drawable/encrypted"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:paddingLeft="5dip"
+ android:layout_weight="1"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/subject"
+ android:text="Subject"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:id="@+id/email_address"
+ android:text="user@somewhere.com"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
</LinearLayout>
-
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 5418b21f6..c91abd082 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -22,41 +22,68 @@
android:paddingTop="5dip"
android:fillViewport="true">
-<ScrollView
- android:layout_marginTop="10dip"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:fillViewport="true">
+ <ScrollView
+ android:layout_marginTop="10dip"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:fillViewport="true">
-<ListView
- android:id="@+id/account_list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-</ListView>
+ <ListView
+ android:id="@+id/account_list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"/>
-</ScrollView>
+ </ScrollView>
-<LinearLayout
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- style="@android:style/ButtonBar">
-
-<Button
- android:id="@+id/btn_encryptMessage"
- android:text="@string/btn_encryptMessage"
- android:layout_width="wrap_content"
- android:layout_weight="1"
- android:layout_height="wrap_content"/>
-
-<Button
- android:id="@+id/btn_decryptMessage"
- android:text="@string/btn_decryptMessage"
- android:layout_width="wrap_content"
- android:layout_weight="1"
- android:layout_height="wrap_content"/>
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ style="@android:style/ButtonBar">
-</LinearLayout>
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:id="@+id/btn_encryptMessage"
+ android:text="@string/btn_encryptMessage"
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"/>
+
+ <Button
+ android:id="@+id/btn_decryptMessage"
+ android:text="@string/btn_decryptMessage"
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
-</LinearLayout> \ No newline at end of file
+ <Button
+ android:id="@+id/btn_encryptFile"
+ android:text="@string/btn_encryptFile"
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"/>
+
+ <Button
+ android:id="@+id/btn_decryptFile"
+ android:text="@string/btn_decryptFile"
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/select_public_key.xml b/res/layout/select_public_key.xml
index 9a2d9f578..3c7c6534a 100644
--- a/res/layout/select_public_key.xml
+++ b/res/layout/select_public_key.xml
@@ -21,34 +21,33 @@
android:layout_height="fill_parent"
android:fillViewport="true">
-<ListView
- android:id="@+id/list"
- android:choiceMode="multipleChoice"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1">
-</ListView>
-
-<LinearLayout
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- style="@android:style/ButtonBar">
-
-<Button
- android:text="@android:string/ok"
- android:id="@+id/btn_ok"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"/>
-
-<Button
- android:text="@android:string/cancel"
- android:id="@+id/btn_cancel"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"/>
-
-</LinearLayout>
+ <ListView
+ android:id="@+id/list"
+ android:choiceMode="multipleChoice"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ style="@android:style/ButtonBar">
+
+ <Button
+ android:text="@android:string/ok"
+ android:id="@+id/btn_ok"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ <Button
+ android:text="@android:string/cancel"
+ android:id="@+id/btn_cancel"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/select_public_key_item.xml b/res/layout/select_public_key_item.xml
index aba0c09b9..cdc81399f 100644
--- a/res/layout/select_public_key_item.xml
+++ b/res/layout/select_public_key_item.xml
@@ -22,75 +22,76 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_width="fill_parent">
-<CheckBox
- android:id="@+id/selected"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:clickable="false"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <CheckBox
+ android:id="@+id/selected"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:clickable="false"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<LinearLayout
- android:orientation="vertical"
- android:paddingLeft="5dip"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1">
-
-<TextView
- android:id="@+id/main_user_id"
- android:text="Main User ID"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-<TextView
- android:id="@+id/main_user_id_rest"
- android:text="&lt;user@somewhere.com&gt;"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-</LinearLayout>
+ <LinearLayout
+ android:orientation="vertical"
+ android:paddingLeft="5dip"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
-<LinearLayout
- android:id="@+id/right_column"
- android:orientation="vertical"
- android:minWidth="90dip"
- android:paddingLeft="3dip"
- android:gravity="right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
-
-<TextView
- android:id="@+id/key_id"
- android:text="BBBBBBBB"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:typeface="monospace"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"/>
-
-<TextView
- android:id="@+id/creation"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="31.12.2009"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-<TextView
- android:id="@+id/expiry"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="31.12.2010"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-<TextView
- android:id="@+id/status"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="expired"
- android:textStyle="italic"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/main_user_id"
+ android:text="Main User ID"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-</LinearLayout>
+ <TextView
+ android:id="@+id/main_user_id_rest"
+ android:text="&lt;user@somewhere.com&gt;"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/right_column"
+ android:orientation="vertical"
+ android:minWidth="90dip"
+ android:paddingLeft="3dip"
+ android:gravity="right"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
-</LinearLayout> \ No newline at end of file
+ <TextView
+ android:id="@+id/key_id"
+ android:text="BBBBBBBB"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:typeface="monospace"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"/>
+
+ <TextView
+ android:id="@+id/creation"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="31.12.2009"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:id="@+id/expiry"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="31.12.2010"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:id="@+id/status"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="expired"
+ android:textStyle="italic"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/select_secret_key.xml b/res/layout/select_secret_key.xml
index 64967ace6..f252f56e5 100644
--- a/res/layout/select_secret_key.xml
+++ b/res/layout/select_secret_key.xml
@@ -21,10 +21,9 @@
android:layout_height="fill_parent"
android:fillViewport="true">
-<ListView
- android:id="@+id/list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-</ListView>
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"/>
</LinearLayout>
diff --git a/res/layout/select_secret_key_item.xml b/res/layout/select_secret_key_item.xml
index 0b0475c37..97a0ce5b3 100644
--- a/res/layout/select_secret_key_item.xml
+++ b/res/layout/select_secret_key_item.xml
@@ -22,67 +22,68 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_width="fill_parent">
-<LinearLayout
- android:orientation="vertical"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1">
+ <LinearLayout
+ android:orientation="vertical"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
-<TextView
- android:id="@+id/main_user_id"
- android:text="Main User ID"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/main_user_id"
+ android:text="Main User ID"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<TextView
- android:id="@+id/main_user_id_rest"
- android:text="&lt;user@somewhere.com&gt;"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-</LinearLayout>
+ <TextView
+ android:id="@+id/main_user_id_rest"
+ android:text="&lt;user@somewhere.com&gt;"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<LinearLayout
- android:orientation="vertical"
- android:minWidth="90dip"
- android:paddingLeft="3dip"
- android:gravity="right"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
+ </LinearLayout>
-<TextView
- android:id="@+id/key_id"
- android:text="BBBBBBBB"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:typeface="monospace"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"/>
+ <LinearLayout
+ android:orientation="vertical"
+ android:minWidth="90dip"
+ android:paddingLeft="3dip"
+ android:gravity="right"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
-<TextView
- android:id="@+id/creation"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="31.12.2009"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/key_id"
+ android:text="BBBBBBBB"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:typeface="monospace"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"/>
-<TextView
- android:id="@+id/expiry"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="31.12.2010"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/creation"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="31.12.2009"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-<TextView
- android:id="@+id/status"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="expired"
- android:textStyle="italic"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/expiry"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="31.12.2010"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
-</LinearLayout>
+ <TextView
+ android:id="@+id/status"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="expired"
+ android:textStyle="italic"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20eb5476d..f64258e0a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,6 +23,8 @@
<string name="title_selectSignature">Select Signature</string>
<string name="title_encryptMessage">Encrypt Message</string>
<string name="title_decryptMessage">Decrypt Message</string>
+ <string name="title_encryptFile">Encrypt File</string>
+ <string name="title_decryptFile">Decrypt File</string>
<string name="title_authentification">Authentification</string>
<string name="title_createKey">Create Key</string>
<string name="title_editKey">Edit Key</string>
@@ -31,15 +33,21 @@
<string name="section_keys">Keys</string>
<string name="btn_send">Send via Email</string>
+ <string name="btn_encrypt">Encrypt</string>
<string name="btn_decrypt">Decrypt</string>
<string name="btn_verify">Verify</string>
<string name="btn_selectEncryptKeys">Select Recipients</string>
<string name="btn_reply">Reply</string>
<string name="btn_encryptMessage">Encrypt Message</string>
<string name="btn_decryptMessage">Decrypt Message</string>
+ <string name="btn_encryptFile">Encrypt File</string>
+ <string name="btn_decryptFile">Decrypt File</string>
<string name="btn_save">Save</string>
<string name="btn_doNotSave">Cancel</string>
+ <string name="tab_symmetric">Symmetric</string>
+ <string name="tab_asymmetric">Asymmetric</string>
+
<string name="menu_about">About</string>
<string name="menu_addAccount">Add GMail Account</string>
<string name="menu_managePublicKeys">Manage Public Keys</string>
@@ -53,6 +61,9 @@
<string name="unknown_user_id">&lt;unknown&gt;</string>
<string name="none">&lt;none&gt;</string>
+ <string name="label_file">File:</string>
+ <string name="label_encrypt_keys">Encrypt with:</string>
+
<string name="sign_only">Sign only</string>
<string name="encrypt_only">Encrypt only</string>
<string name="sign_and_encrypt">Sign and Encrypt</string>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 13:17:16 +0000