aboutsummaryrefslogtreecommitdiffstats
path: root/org_apg/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'org_apg/res/layout')
-rw-r--r--org_apg/res/layout/key_list_group_item.xml53
-rw-r--r--org_apg/res/layout/key_list_public_activity.xml13
-rw-r--r--org_apg/res/layout/key_list_secret_activity.xml13
-rw-r--r--org_apg/res/layout/mailbox_message_item.xml57
-rw-r--r--org_apg/res/layout/select_public_key_activity.xml13
5 files changed, 59 insertions, 90 deletions
diff --git a/org_apg/res/layout/key_list_group_item.xml b/org_apg/res/layout/key_list_group_item.xml
index 35d0ab367..240be54b0 100644
--- a/org_apg/res/layout/key_list_group_item.xml
+++ b/org_apg/res/layout/key_list_group_item.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+ 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.
@@ -14,40 +15,26 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:singleLine="true"
- android:layout_marginRight="?android:attr/scrollbarSize"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="?android:attr/listPreferredItemHeight">
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_marginRight="?android:attr/scrollbarSize"
+ android:orientation="vertical"
+ android:paddingLeft="36dip"
+ android:singleLine="true" >
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
+ <TextView
+ android:id="@+id/mainUserId"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="36dip">
-
- <TextView
- android:id="@+id/mainUserId"
- android:text="Main User ID"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <TextView
- android:id="@+id/mainUserIdRest"
- android:text="&lt;user@somewhere.com&gt;"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ android:text="Main User ID"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- </LinearLayout>
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- </LinearLayout>
+ <TextView
+ android:id="@+id/mainUserIdRest"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="&lt;user@example.com>"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
-</LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/org_apg/res/layout/key_list_public_activity.xml b/org_apg/res/layout/key_list_public_activity.xml
new file mode 100644
index 000000000..529cb5067
--- /dev/null
+++ b/org_apg/res/layout/key_list_public_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true" >
+
+ <fragment
+ android:id="@+id/public_key_list_fragment"
+ android:name="org.thialfihar.android.apg.ui.KeyListPublicFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/org_apg/res/layout/key_list_secret_activity.xml b/org_apg/res/layout/key_list_secret_activity.xml
new file mode 100644
index 000000000..a60878b1a
--- /dev/null
+++ b/org_apg/res/layout/key_list_secret_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true" >
+
+ <fragment
+ android:id="@+id/secret_key_list_fragment"
+ android:name="org.thialfihar.android.apg.ui.KeyListSecretFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/org_apg/res/layout/mailbox_message_item.xml b/org_apg/res/layout/mailbox_message_item.xml
deleted file mode 100644
index 05a267fb6..000000000
--- a/org_apg/res/layout/mailbox_message_item.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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:singleLine="true"
- android:paddingLeft="3dip"
- android:layout_marginRight="?android:attr/scrollbarSize"
- android:paddingTop="3dip"
- android:paddingBottom="3dip"
- 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/emailAddress"
- android:text="user@somewhere.com"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/org_apg/res/layout/select_public_key_activity.xml b/org_apg/res/layout/select_public_key_activity.xml
new file mode 100644
index 000000000..77c606453
--- /dev/null
+++ b/org_apg/res/layout/select_public_key_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true" >
+
+ <fragment
+ android:id="@+id/select_public_key_fragment"
+ android:name="org.thialfihar.android.apg.ui.SelectPublicKeyListFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</RelativeLayout> \ No newline at end of file