From 1feb948acf81532f82b36456080920543004b097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 16 Jan 2013 14:31:16 +0100
Subject: Renaming APG to OpenPGP Keychain

---
 APG/res/layout/account_item.xml                    |  35 ---
 APG/res/layout/create_key.xml                      |  73 -----
 APG/res/layout/decrypt.xml                         | 181 ------------
 APG/res/layout/edit_key.xml                        |  59 ----
 APG/res/layout/edit_key_key_item.xml               | 134 ---------
 APG/res/layout/edit_key_section.xml                |  57 ----
 APG/res/layout/edit_key_user_id_item.xml           | 107 -------
 APG/res/layout/encrypt.xml                         | 306 ---------------------
 APG/res/layout/file_dialog.xml                     |  49 ----
 APG/res/layout/filter_info.xml                     |  38 ---
 APG/res/layout/general.xml                         |  59 ----
 APG/res/layout/help_activity.xml                   |  14 -
 APG/res/layout/help_fragment_about.xml             |  62 -----
 APG/res/layout/import_keys.xml                     |  63 -----
 APG/res/layout/key_list_child_item.xml             |  96 -------
 APG/res/layout/key_list_group_item.xml             |  40 ---
 APG/res/layout/key_list_public_activity.xml        |  25 --
 APG/res/layout/key_list_secret_activity.xml        |  25 --
 APG/res/layout/key_server_editor.xml               |  52 ----
 APG/res/layout/key_server_export_layout.xml        |  34 ---
 APG/res/layout/key_server_preference.xml           |  90 ------
 APG/res/layout/key_server_query_layout.xml         |  53 ----
 APG/res/layout/key_server_query_result_item.xml    |  97 -------
 APG/res/layout/key_server_query_result_user_id.xml |  26 --
 APG/res/layout/main.xml                            | 124 ---------
 APG/res/layout/passphrase.xml                      |  40 ---
 APG/res/layout/passphrase_repeat.xml               |  62 -----
 APG/res/layout/select_key_item.xml                 |  82 ------
 APG/res/layout/select_public_key_activity.xml      |  13 -
 APG/res/layout/select_secret_key_activity.xml      |  13 -
 APG/res/layout/share_nfc_beam.xml                  |  14 -
 APG/res/layout/sign_key_layout.xml                 |  40 ---
 32 files changed, 2163 deletions(-)
 delete mode 100644 APG/res/layout/account_item.xml
 delete mode 100644 APG/res/layout/create_key.xml
 delete mode 100644 APG/res/layout/decrypt.xml
 delete mode 100644 APG/res/layout/edit_key.xml
 delete mode 100644 APG/res/layout/edit_key_key_item.xml
 delete mode 100644 APG/res/layout/edit_key_section.xml
 delete mode 100644 APG/res/layout/edit_key_user_id_item.xml
 delete mode 100644 APG/res/layout/encrypt.xml
 delete mode 100644 APG/res/layout/file_dialog.xml
 delete mode 100644 APG/res/layout/filter_info.xml
 delete mode 100644 APG/res/layout/general.xml
 delete mode 100644 APG/res/layout/help_activity.xml
 delete mode 100644 APG/res/layout/help_fragment_about.xml
 delete mode 100644 APG/res/layout/import_keys.xml
 delete mode 100644 APG/res/layout/key_list_child_item.xml
 delete mode 100644 APG/res/layout/key_list_group_item.xml
 delete mode 100644 APG/res/layout/key_list_public_activity.xml
 delete mode 100644 APG/res/layout/key_list_secret_activity.xml
 delete mode 100644 APG/res/layout/key_server_editor.xml
 delete mode 100644 APG/res/layout/key_server_export_layout.xml
 delete mode 100644 APG/res/layout/key_server_preference.xml
 delete mode 100644 APG/res/layout/key_server_query_layout.xml
 delete mode 100644 APG/res/layout/key_server_query_result_item.xml
 delete mode 100644 APG/res/layout/key_server_query_result_user_id.xml
 delete mode 100644 APG/res/layout/main.xml
 delete mode 100644 APG/res/layout/passphrase.xml
 delete mode 100644 APG/res/layout/passphrase_repeat.xml
 delete mode 100644 APG/res/layout/select_key_item.xml
 delete mode 100644 APG/res/layout/select_public_key_activity.xml
 delete mode 100644 APG/res/layout/select_secret_key_activity.xml
 delete mode 100644 APG/res/layout/share_nfc_beam.xml
 delete mode 100644 APG/res/layout/sign_key_layout.xml

(limited to 'APG/res/layout')

diff --git a/APG/res/layout/account_item.xml b/APG/res/layout/account_item.xml
deleted file mode 100644
index 0aa76719a..000000000
--- a/APG/res/layout/account_item.xml
+++ /dev/null
@@ -1,35 +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:layout_marginRight="?android:attr/scrollbarSize"
-    android:paddingLeft="6dip"
-    android:paddingTop="6dip"
-    android:paddingBottom="6dip"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight">
-
-    <TextView
-        android:id="@+id/accountName"
-        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/APG/res/layout/create_key.xml b/APG/res/layout/create_key.xml
deleted file mode 100644
index 235d33f88..000000000
--- a/APG/res/layout/create_key.xml
+++ /dev/null
@@ -1,73 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <TableLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:stretchColumns="1" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"
-            android:text="@string/keyCreationElGamalInfo" />
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/label_algorithm" />
-
-            <Spinner
-                android:id="@+id/create_key_algorithm"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="4dp" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/label_keySize" />
-
-            <EditText
-                android:id="@+id/create_key_size"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="right"
-                android:numeric="integer"
-                android:padding="4dp"
-                android:text="1024" />
-        </TableRow>
-    </TableLayout>
-    <!-- </LinearLayout> -->
-
-</ScrollView>
\ No newline at end of file
diff --git a/APG/res/layout/decrypt.xml b/APG/res/layout/decrypt.xml
deleted file mode 100644
index 4901536ae..000000000
--- a/APG/res/layout/decrypt.xml
+++ /dev/null
@@ -1,181 +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:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true"
-    android:orientation="vertical" >
-
-    <ScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fillViewport="true" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp" >
-
-            <LinearLayout
-                android:id="@+id/signature"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:orientation="horizontal"
-                android:padding="4dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp" >
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="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:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingLeft="5dip" >
-
-                    <TextView
-                        android:id="@+id/mainUserId"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left"
-                        android:text="Main User Id"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <TextView
-                        android:id="@+id/mainUserIdRest"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left"
-                        android:text="Main User Id Rest"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <ImageView
-                    android:id="@+id/sourcePrevious"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_previous" />
-
-                <TextView
-                    android:id="@+id/sourceLabel"
-                    style="@style/SectionHeader"
-                    android:layout_width="0dip"
-                    android:layout_height="fill_parent"
-                    android:layout_weight="1"
-                    android:gravity="center_horizontal|center_vertical"
-                    android:text="@string/label_message"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <ImageView
-                    android:id="@+id/sourceNext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_next" />
-            </LinearLayout>
-
-            <ViewFlipper
-                android:id="@+id/source"
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1" >
-
-                <LinearLayout
-                    android:id="@+id/sourceMessage"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:orientation="vertical"
-                    android:padding="4dp" >
-
-                    <EditText
-                        android:id="@+id/message"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent"
-                        android:gravity="top"
-                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-                        android:scrollHorizontally="true" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/sourceFile"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:orientation="vertical"
-                    android:padding="4dp" >
-
-                    <LinearLayout
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal" >
-
-                        <EditText
-                            android:id="@+id/filename"
-                            android:layout_width="0dip"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:inputType="textNoSuggestions" />
-
-                        <ImageButton
-                            android:id="@+id/btn_browse"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:src="@drawable/ic_menu_filebrowser" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal" >
-
-                        <CheckBox
-                            android:id="@+id/deleteAfterDecryption"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/label_deleteAfterDecryption" />
-                    </LinearLayout>
-                </LinearLayout>
-            </ViewFlipper>
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/edit_key.xml b/APG/res/layout/edit_key.xml
deleted file mode 100644
index 3ab5f1c52..000000000
--- a/APG/res/layout/edit_key.xml
+++ /dev/null
@@ -1,59 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp" >
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:text="@string/label_passPhrase" />
-
-        <CheckBox
-            android:id="@+id/edit_key_no_passphrase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_noPassPhrase" />
-
-        <Button
-            android:id="@+id/edit_key_btn_change_pass_phrase"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:text="@string/btn_setPassPhrase" />
-
-        <LinearLayout
-            android:id="@+id/edit_key_container"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/APG/res/layout/edit_key_key_item.xml b/APG/res/layout/edit_key_key_item.xml
deleted file mode 100644
index 5556ec22e..000000000
--- a/APG/res/layout/edit_key_key_item.xml
+++ /dev/null
@@ -1,134 +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.
--->
-
-<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" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <TableLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:stretchColumns="1" >
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_keyId"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_keyId" />
-
-                <TextView
-                    android:id="@+id/keyId"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="00000000 00000000"
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_algorithm" />
-
-                <TextView
-                    android:id="@+id/algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="Name" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_creation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_creation" />
-
-                <TextView
-                    android:id="@+id/creation"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_expiry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_expiry" />
-
-                <Button
-                    android:id="@+id/expiry"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_usage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_usage" />
-
-                <Spinner
-                    android:id="@+id/usage"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-        </TableLayout>
-
-        <ImageButton
-            android:id="@+id/delete"
-            style="@style/MinusButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-</org.thialfihar.android.apg.ui.widget.KeyEditor>
\ No newline at end of file
diff --git a/APG/res/layout/edit_key_section.xml b/APG/res/layout/edit_key_section.xml
deleted file mode 100644
index e8f788f6d..000000000
--- a/APG/res/layout/edit_key_section.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.
--->
-
-<org.thialfihar.android.apg.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/header"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/SectionHeader"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:text="Section Name" />
-
-        <ImageView
-            style="@style/PlusButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:duplicateParentState="true" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/editors"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="6dip" />
-
-</org.thialfihar.android.apg.ui.widget.SectionView>
\ No newline at end of file
diff --git a/APG/res/layout/edit_key_user_id_item.xml b/APG/res/layout/edit_key_user_id_item.xml
deleted file mode 100644
index 26a7304e0..000000000
--- a/APG/res/layout/edit_key_user_id_item.xml
+++ /dev/null
@@ -1,107 +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.
--->
-
-<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" >
-
-    <RadioButton
-        android:id="@+id/isMainUserId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/label_mainUserId" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <TableLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" >
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_name" />
-
-                <EditText
-                    android:id="@+id/name"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="textPersonName|textCapWords" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_email"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_email" />
-
-                <EditText
-                    android:id="@+id/email"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="textEmailAddress" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_comment" />
-
-                <EditText
-                    android:id="@+id/comment"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
-            </TableRow>
-        </TableLayout>
-
-        <ImageButton
-            android:id="@+id/delete"
-            style="@style/MinusButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-</org.thialfihar.android.apg.ui.widget.UserIdEditor>
\ No newline at end of file
diff --git a/APG/res/layout/encrypt.xml b/APG/res/layout/encrypt.xml
deleted file mode 100644
index 4ed9f6aff..000000000
--- a/APG/res/layout/encrypt.xml
+++ /dev/null
@@ -1,306 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="4dp" >
-
-            <ImageView
-                android:id="@+id/modePrevious"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_previous" />
-
-            <TextView
-                android:id="@+id/modeLabel"
-                style="@style/SectionHeader"
-                android:layout_width="0dip"
-                android:layout_height="fill_parent"
-                android:layout_weight="1"
-                android:gravity="center_horizontal|center_vertical"
-                android:text="@string/label_asymmetric" />
-
-            <ImageView
-                android:id="@+id/modeNext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_next" />
-        </LinearLayout>
-
-        <ViewFlipper
-            android:id="@+id/mode"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" >
-
-            <LinearLayout
-                android:id="@+id/modeAsymmetric"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="4dp" >
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <CheckBox
-                        android:id="@+id/sign"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/label_sign" />
-
-                    <LinearLayout
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingLeft="16dp" >
-
-                        <TextView
-                            android:id="@+id/mainUserId"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:ellipsize="end"
-                            android:singleLine="true"
-                            android:text="Sign User Id"
-                            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                        <TextView
-                            android:id="@+id/mainUserIdRest"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:ellipsize="end"
-                            android:singleLine="true"
-                            android:text="Sign email"
-                            android:textAppearance="?android:attr/textAppearanceSmall" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingBottom="3dip" >
-
-                    <TextView
-                        android:id="@+id/label_selectPublicKeys"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:text="@string/label_selectPublicKeys"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <Button
-                        android:id="@+id/btn_selectEncryptKeys"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/btn_selectEncryptKeys" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <TableLayout
-                android:id="@+id/modeSymmetric"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:stretchColumns="1" >
-
-                <TableRow>
-
-                    <TextView
-                        android:id="@+id/label_passPhrase"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_passPhrase"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <EditText
-                        android:id="@+id/passPhrase"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword" />
-                </TableRow>
-
-                <TableRow>
-
-                    <TextView
-                        android:id="@+id/label_passPhraseAgain"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_passPhraseAgain"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <EditText
-                        android:id="@+id/passPhraseAgain"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword" />
-                </TableRow>
-            </TableLayout>
-        </ViewFlipper>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="4dp" >
-
-            <ImageView
-                android:id="@+id/sourcePrevious"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_previous" />
-
-            <TextView
-                android:id="@+id/sourceLabel"
-                style="@style/SectionHeader"
-                android:layout_width="0dip"
-                android:layout_height="fill_parent"
-                android:layout_weight="1"
-                android:gravity="center_horizontal|center_vertical"
-                android:text="@string/label_message"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <ImageView
-                android:id="@+id/sourceNext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_next" />
-        </LinearLayout>
-
-        <ViewFlipper
-            android:id="@+id/source"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" >
-
-            <LinearLayout
-                android:id="@+id/sourceMessage"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical"
-                android:padding="4dp" >
-
-                <EditText
-                    android:id="@+id/message"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:gravity="top"
-                    android:inputType="text|textCapSentences|textMultiLine|textLongMessage" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/sourceFile"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical"
-                android:padding="4dp" >
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <EditText
-                        android:id="@+id/filename"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:inputType="textNoSuggestions" />
-
-                    <ImageButton
-                        android:id="@+id/btn_browse"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_menu_filebrowser" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <TextView
-                        android:id="@+id/label_fileCompression"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_fileCompression"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                    <Spinner
-                        android:id="@+id/fileCompression"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <CheckBox
-                        android:id="@+id/deleteAfterEncryption"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/label_deleteAfterEncryption" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
-
-                    <CheckBox
-                        android:id="@+id/asciiArmour"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/label_asciiArmour" />
-                </LinearLayout>
-            </LinearLayout>
-        </ViewFlipper>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/APG/res/layout/file_dialog.xml b/APG/res/layout/file_dialog.xml
deleted file mode 100644
index c95f874a5..000000000
--- a/APG/res/layout/file_dialog.xml
+++ /dev/null
@@ -1,49 +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:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip" >
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <EditText
-            android:id="@+id/input"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <ImageButton
-            android:id="@+id/btn_browse"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_menu_filebrowser" />
-    </LinearLayout>
-
-    <CheckBox
-        android:id="@+id/checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/filter_info.xml b/APG/res/layout/filter_info.xml
deleted file mode 100644
index 9fef6548e..000000000
--- a/APG/res/layout/filter_info.xml
+++ /dev/null
@@ -1,38 +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:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="5dip"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/filterInfo"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:ellipsize="end"/>
-
-    <Button
-        android:id="@+id/btn_clear"
-        android:text="@string/btn_clearFilter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/APG/res/layout/general.xml b/APG/res/layout/general.xml
deleted file mode 100644
index c6702efac..000000000
--- a/APG/res/layout/general.xml
+++ /dev/null
@@ -1,59 +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:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <ListView
-        android:id="@+id/options"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:padding="5dip"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@android:style/ButtonBar">
-
-        <Button
-            android:text="dummy"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:visibility="invisible"/>
-
-        <Button
-            android:id="@+id/btn_cancel"
-            android:text="@android:string/cancel"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="2"/>
-
-        <Button
-            android:text="dummy"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:visibility="invisible"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/APG/res/layout/help_activity.xml b/APG/res/layout/help_activity.xml
deleted file mode 100644
index fa233ac2c..000000000
--- a/APG/res/layout/help_activity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <android.support.v4.view.ViewPager
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-        </android.support.v4.view.ViewPager>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/help_fragment_about.xml b/APG/res/layout/help_fragment_about.xml
deleted file mode 100644
index 82cb0a89f..000000000
--- a/APG/res/layout/help_fragment_about.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:isScrollContainer="true"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="16dp"
-        android:scrollbars="vertical" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal" >
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:layout_marginRight="10dp"
-                    android:src="@drawable/icon" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/app_name"
-                    android:textSize="18sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/help_about_version"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@android:style/TextAppearance.Small" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView
-            android:id="@+id/help_about_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:textAppearance="@android:style/TextAppearance.Small" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/APG/res/layout/import_keys.xml b/APG/res/layout/import_keys.xml
deleted file mode 100644
index 1c2dbd0c7..000000000
--- a/APG/res/layout/import_keys.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true" >
-
-    <LinearLayout
-        android:id="@+id/import_from_qr_code_footer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp" >
-
-        <Button
-            android:id="@+id/import_from_qr_code_import"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="importOnClick"
-            android:text="@string/import_from_qr_code_import" />
-
-        <Button
-            android:id="@+id/import_from_qr_code_import_sign_and_upload"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="signAndUploadOnClick"
-            android:text="@string/import_from_qr_code_import_sign_and_upload" />
-
-        <Button
-            android:id="@+id/import_from_qr_code_finish"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:onClick="finishOnClick"
-            android:text="@string/import_from_qr_code_finish" />
-    </LinearLayout>
-
-    <ScrollView
-        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="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingRight="12dp" >
-
-            <LinearLayout
-                android:id="@+id/import_keys_list_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:orientation="vertical"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp" >
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/APG/res/layout/key_list_child_item.xml b/APG/res/layout/key_list_child_item.xml
deleted file mode 100644
index 868989cf6..000000000
--- a/APG/res/layout/key_list_child_item.xml
+++ /dev/null
@@ -1,96 +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:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:layout_marginRight="?android:attr/scrollbarSize"
-    android:orientation="vertical"
-    android:singleLine="true" >
-
-    <LinearLayout
-        android:id="@+id/keyLayout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="8dip"
-        android:paddingRight="3dip" >
-
-        <ImageView
-            android:id="@+id/ic_masterKey"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingRight="6dip"
-            android:src="@drawable/key_small" />
-
-        <TextView
-            android:id="@+id/keyId"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="5dip"
-            android:text="Key ID"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:typeface="monospace" />
-
-        <TextView
-            android:id="@+id/keyDetails"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="(RSA, 1024bit)"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_gravity="center_vertical"
-            android:gravity="right"
-            android:orientation="horizontal"
-            android:paddingBottom="2dip"
-            android:paddingTop="2dip" >
-
-            <ImageView
-                android:id="@+id/ic_encryptKey"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/encrypted_small" />
-
-            <ImageView
-                android:id="@+id/ic_signKey"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/signed_small" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/userIdLayout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="36dip"
-        android:singleLine="true" >
-
-        <TextView
-            android:id="@+id/userId"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="3dip"
-            android:text="User ID"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/key_list_group_item.xml b/APG/res/layout/key_list_group_item.xml
deleted file mode 100644
index 240be54b0..000000000
--- a/APG/res/layout/key_list_group_item.xml
+++ /dev/null
@@ -1,40 +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:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:layout_marginRight="?android:attr/scrollbarSize"
-    android:orientation="vertical"
-    android:paddingLeft="36dip"
-    android:singleLine="true" >
-
-    <TextView
-        android:id="@+id/mainUserId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Main User ID"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <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>
\ No newline at end of file
diff --git a/APG/res/layout/key_list_public_activity.xml b/APG/res/layout/key_list_public_activity.xml
deleted file mode 100644
index 9872c3e1b..000000000
--- a/APG/res/layout/key_list_public_activity.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <fragment
-        android:id="@+id/key_list_public_fragment"
-        android:name="org.thialfihar.android.apg.ui.KeyListPublicFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:layout_weight="1"
-        android:background="@drawable/abs__ab_bottom_solid_light_holo"
-        android:paddingBottom="3dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="3dp"
-        android:text="@string/listInformation" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/key_list_secret_activity.xml b/APG/res/layout/key_list_secret_activity.xml
deleted file mode 100644
index c813a5d7d..000000000
--- a/APG/res/layout/key_list_secret_activity.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <fragment
-        android:id="@+id/key_list_secret_fragment"
-        android:name="org.thialfihar.android.apg.ui.KeyListSecretFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:layout_weight="1"
-        android:background="@drawable/abs__ab_bottom_solid_light_holo"
-        android:paddingBottom="3dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="3dp"
-        android:text="@string/listInformation" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/key_server_editor.xml b/APG/res/layout/key_server_editor.xml
deleted file mode 100644
index e4c25b316..000000000
--- a/APG/res/layout/key_server_editor.xml
+++ /dev/null
@@ -1,52 +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.
--->
-
-<org.thialfihar.android.apg.ui.widget.KeyServerEditor
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal"
-        android:layout_marginLeft="3dip">
-
-        <EditText
-            android:id="@+id/server"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:inputType="textUri"/>
-
-        <ImageButton
-                android:id="@+id/delete"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/MinusButton"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="3dip"/>
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"/>
-
-</org.thialfihar.android.apg.ui.widget.KeyServerEditor>
diff --git a/APG/res/layout/key_server_export_layout.xml b/APG/res/layout/key_server_export_layout.xml
deleted file mode 100644
index 257f087ee..000000000
--- a/APG/res/layout/key_server_export_layout.xml
+++ /dev/null
@@ -1,34 +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:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <Spinner
-        android:id="@+id/keyServer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button
-        android:id="@+id/btn_export_to_server"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/btn_export_to_server" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/key_server_preference.xml b/APG/res/layout/key_server_preference.xml
deleted file mode 100644
index e9b1d5a95..000000000
--- a/APG/res/layout/key_server_preference.xml
+++ /dev/null
@@ -1,90 +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:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+android:id/text_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:orientation="horizontal" >
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6sp"
-            android:layout_marginLeft="16sp"
-            android:layout_marginRight="6sp"
-            android:layout_marginTop="6sp"
-            android:layout_weight="1"
-            android:background="@android:drawable/menuitem_background"
-            android:focusable="true" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:focusable="true"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:id="@+id/summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@android:id/title"
-                android:layout_below="@android:id/title"
-                android:maxLines="2"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/add"
-            style="@style/PlusButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dip"
-            android:layout_marginRight="6dip"
-            android:clickable="true" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-
-        <LinearLayout
-            android:id="@+id/editors"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical" />
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/key_server_query_layout.xml b/APG/res/layout/key_server_query_layout.xml
deleted file mode 100644
index 6af4f3644..000000000
--- a/APG/res/layout/key_server_query_layout.xml
+++ /dev/null
@@ -1,53 +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:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <Spinner
-        android:id="@+id/keyServer"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/query"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-        <Button
-            android:id="@+id/btn_search"
-            android:text="@string/btn_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-    <ListView
-        android:id="@+id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-</LinearLayout>
diff --git a/APG/res/layout/key_server_query_result_item.xml b/APG/res/layout/key_server_query_result_item.xml
deleted file mode 100644
index 29c8b88f4..000000000
--- a/APG/res/layout/key_server_query_result_item.xml
+++ /dev/null
@@ -1,97 +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:paddingRight="?android:attr/scrollbarSize"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <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/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"/>
-
-        </LinearLayout>
-
-        <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/keyId"
-                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/algorithm"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:id="@+id/status"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#e00"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/list"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="30dip">
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/APG/res/layout/key_server_query_result_user_id.xml b/APG/res/layout/key_server_query_result_user_id.xml
deleted file mode 100644
index 9d3a4a1ab..000000000
--- a/APG/res/layout/key_server_query_result_user_id.xml
+++ /dev/null
@@ -1,26 +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.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_marginRight="?android:attr/scrollbarSize"
-    android:singleLine="true"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:paddingRight="3dip">
-
-</TextView>
diff --git a/APG/res/layout/main.xml b/APG/res/layout/main.xml
deleted file mode 100644
index 66a334462..000000000
--- a/APG/res/layout/main.xml
+++ /dev/null
@@ -1,124 +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:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <org.thialfihar.android.apg.ui.widget.DashboardLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
-
-        <Button
-            android:id="@+id/dashboard_manage_keys"
-            style="@style/DashboardButton"
-            android:drawableTop="@drawable/dashboard_manage_keys"
-            android:onClick="manageKeysOnClick"
-            android:text="@string/dashboard_manage_keys" />
-
-        <Button
-            android:id="@+id/dashboard_my_keys"
-            style="@style/DashboardButton"
-            android:drawableTop="@drawable/dashboard_my_keys"
-            android:onClick="myKeysOnClick"
-            android:text="@string/dashboard_my_keys" />
-
-        <Button
-            android:id="@+id/dashboard_encrypt"
-            style="@style/DashboardButton"
-            android:drawableTop="@drawable/dashboard_encrypt"
-            android:onClick="encryptOnClick"
-            android:text="@string/dashboard_encrypt" />
-
-        <Button
-            android:id="@+id/dashboard_decrypt"
-            style="@style/DashboardButton"
-            android:drawableTop="@drawable/dashboard_decrypt"
-            android:onClick="decryptOnClick"
-            android:text="@string/dashboard_decrypt" />
-        
-        
-        <Button
-            android:id="@+id/dashboard_scan_qrcode"
-            style="@style/DashboardButton"
-            android:drawableTop="@drawable/dashboard_scan_qrcode"
-            android:onClick="scanQrcodeOnClick"
-            android:text="@string/dashboard_import_keys" />
-
-        <Button
-            android:id="@+id/dashboard_help"
-            style="@style/DashboardButton"
-            android:drawableTop="@drawable/dashboard_help"
-            android:onClick="helpOnClick"
-            android:text="@string/dashboard_help" />
-    </org.thialfihar.android.apg.ui.widget.DashboardLayout>
-
-    <!-- <LinearLayout -->
-    <!-- style="@android:style/ButtonBar" -->
-    <!-- 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:orientation="horizontal" > -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_encryptFile" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_encryptFile" /> -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_decryptFile" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_decryptFile" /> -->
-    <!-- </LinearLayout> -->
-
-
-    <!-- <LinearLayout -->
-    <!-- android:layout_width="fill_parent" -->
-    <!-- android:layout_height="wrap_content" -->
-    <!-- android:orientation="horizontal" > -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_encryptMessage" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_encryptMessage" /> -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_decryptMessage" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_decryptMessage" /> -->
-    <!-- </LinearLayout> -->
-    <!-- </LinearLayout> -->
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/passphrase.xml b/APG/res/layout/passphrase.xml
deleted file mode 100644
index fc9cb1710..000000000
--- a/APG/res/layout/passphrase.xml
+++ /dev/null
@@ -1,40 +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:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp" >
-
-    <TextView
-        android:id="@+id/passphrase_label_passphrase"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:padding="4dp"
-        android:text="@string/label_passPhrase" />
-
-    <EditText
-        android:id="@+id/passphrase_passphrase"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:imeOptions="actionDone"
-        android:inputType="textPassword"
-        android:padding="4dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/passphrase_repeat.xml b/APG/res/layout/passphrase_repeat.xml
deleted file mode 100644
index 8f1d42aac..000000000
--- a/APG/res/layout/passphrase_repeat.xml
+++ /dev/null
@@ -1,62 +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.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:stretchColumns="1" >
-
-    <TableRow>
-
-        <TextView
-            android:id="@+id/passphrase_label_passphrase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"
-            android:text="@string/label_passPhrase" />
-
-        <EditText
-            android:id="@+id/passphrase_passphrase"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:padding="4dp" />
-    </TableRow>
-
-    <TableRow>
-
-        <TextView
-            android:id="@+id/passphrase_label_passphrase_again"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"
-            android:text="@string/label_passPhraseAgain" />
-
-        <EditText
-            android:id="@+id/passphrase_passphrase_again"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="textPassword"
-            android:padding="4dp" />
-    </TableRow>
-
-</TableLayout>
\ No newline at end of file
diff --git a/APG/res/layout/select_key_item.xml b/APG/res/layout/select_key_item.xml
deleted file mode 100644
index 5eed7c268..000000000
--- a/APG/res/layout/select_key_item.xml
+++ /dev/null
@@ -1,82 +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:paddingRight="?android:attr/scrollbarSize"
-    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"/>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:paddingLeft="5dip"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-
-        <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@example.com&gt;"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-    <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/keyId"
-            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/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/APG/res/layout/select_public_key_activity.xml b/APG/res/layout/select_public_key_activity.xml
deleted file mode 100644
index 7e70d26a2..000000000
--- a/APG/res/layout/select_public_key_activity.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.SelectPublicKeyFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/APG/res/layout/select_secret_key_activity.xml b/APG/res/layout/select_secret_key_activity.xml
deleted file mode 100644
index 2a645ce19..000000000
--- a/APG/res/layout/select_secret_key_activity.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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_secret_key_fragment"
-        android:name="org.thialfihar.android.apg.ui.SelectSecretKeyFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/APG/res/layout/share_nfc_beam.xml b/APG/res/layout/share_nfc_beam.xml
deleted file mode 100644
index 59e8e0844..000000000
--- a/APG/res/layout/share_nfc_beam.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView
-        android:id="@+id/nfc_beam_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:text="" />
-
-</ScrollView>
\ No newline at end of file
diff --git a/APG/res/layout/sign_key_layout.xml b/APG/res/layout/sign_key_layout.xml
deleted file mode 100644
index 17be03b21..000000000
--- a/APG/res/layout/sign_key_layout.xml
+++ /dev/null
@@ -1,40 +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:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical">
-
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:orientation="horizontal">
-	</LinearLayout>
-	
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:orientation="horizontal">
-
-		<TextView android:id="@+id/textView1" android:layout_height="wrap_content"
-			android:text="@string/label_sendKey" android:textAppearance="?android:attr/textAppearanceMedium"
-			android:layout_width="wrap_content"></TextView>
-		<CheckBox android:text="" android:id="@+id/sendKey"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:checked="true"></CheckBox>
-	</LinearLayout>
-
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:orientation="horizontal">
-
-		<Spinner android:id="@+id/keyServer" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_weight="1" />
-	</LinearLayout>
-
-	<Button android:layout_height="wrap_content"
-		android:layout_width="wrap_content" android:text="@string/btn_sign"
-		android:id="@+id/sign"></Button>
-
-</LinearLayout>
-- 
cgit v1.2.3