200 files changed, 26 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 2e423e1a3..a1fa2dab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,3 @@
-#Android generated
-bin
-gen
-obj
-libs/armeabi
-lint.xml
-local.properties
-
-#Eclipse
-.project
-.classpath
-.settings
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Maven
-target
-release.properties
-
-#Mac
-.DS_Store
\ No newline at end of file
+*.class
+*.apk
+.metadata
\ No newline at end of file
diff --git a/org_apg/.gitignore b/org_apg/.gitignore
new file mode 100644
index 000000000..2e423e1a3
--- /dev/null
+++ b/org_apg/.gitignore
@@ -0,0 +1,23 @@
+#Android generated
+bin
+gen
+obj
+libs/armeabi
+lint.xml
+local.properties
+
+#Eclipse
+.project
+.classpath
+.settings
+
+#IntelliJ IDEA
+.idea
+*.iml
+
+#Maven
+target
+release.properties
+
+#Mac
+.DS_Store
\ No newline at end of file
diff --git a/AndroidManifest.xml b/org_apg/AndroidManifest.xml
index 4ab346b7d..4ab346b7d 100644
--- a/AndroidManifest.xml
+++ b/org_apg/AndroidManifest.xml
diff --git a/build.xml b/org_apg/build.xml
index f05ca7cf7..f05ca7cf7 100644
--- a/build.xml
+++ b/org_apg/build.xml
diff --git a/libs/android-integration-supportv4.jar b/org_apg/libs/android-integration-supportv4.jar
index 4a7f1a39c..4a7f1a39c 100644
--- a/libs/android-integration-supportv4.jar
+++ b/org_apg/libs/android-integration-supportv4.jar
diff --git a/libs/android-support-v4.jar b/org_apg/libs/android-support-v4.jar
index d006198e6..d006198e6 100644
--- a/libs/android-support-v4.jar
+++ b/org_apg/libs/android-support-v4.jar
diff --git a/libs/bcprov-jdk16-146.jar b/org_apg/libs/bcprov-jdk16-146.jar
index 66cb1a73b..66cb1a73b 100644
--- a/libs/bcprov-jdk16-146.jar
+++ b/org_apg/libs/bcprov-jdk16-146.jar
diff --git a/pom.xml b/org_apg/pom.xml
index cadb2a38d..cadb2a38d 100644
--- a/pom.xml
+++ b/org_apg/pom.xml
diff --git a/project.properties b/org_apg/project.properties
index 8da376af8..8da376af8 100644
--- a/project.properties
+++ b/org_apg/project.properties
diff --git a/res/anim/push_left_in.xml b/org_apg/res/anim/push_left_in.xml
index 45fb4875a..45fb4875a 100644
--- a/res/anim/push_left_in.xml
+++ b/org_apg/res/anim/push_left_in.xml
diff --git a/res/anim/push_left_out.xml b/org_apg/res/anim/push_left_out.xml
index 845679f16..845679f16 100644
--- a/res/anim/push_left_out.xml
+++ b/org_apg/res/anim/push_left_out.xml
diff --git a/res/anim/push_right_in.xml b/org_apg/res/anim/push_right_in.xml
index 09a244406..09a244406 100644
--- a/res/anim/push_right_in.xml
+++ b/org_apg/res/anim/push_right_in.xml
diff --git a/res/anim/push_right_out.xml b/org_apg/res/anim/push_right_out.xml
index e8893a69a..e8893a69a 100644
--- a/res/anim/push_right_out.xml
+++ b/org_apg/res/anim/push_right_out.xml
diff --git a/res/drawable-finger/btn_circle.xml b/org_apg/res/drawable-finger/btn_circle.xml
index 6c3c7fc1a..6c3c7fc1a 100644
--- a/res/drawable-finger/btn_circle.xml
+++ b/org_apg/res/drawable-finger/btn_circle.xml
diff --git a/res/drawable-hdpi-finger/btn_circle_disable.png b/org_apg/res/drawable-hdpi-finger/btn_circle_disable.png
index ae063b545..ae063b545 100644
--- a/res/drawable-hdpi-finger/btn_circle_disable.png
+++ b/org_apg/res/drawable-hdpi-finger/btn_circle_disable.png
diff --git a/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png
index 7a5d4fe4e..7a5d4fe4e 100644
--- a/res/drawable-hdpi-finger/btn_circle_disable_focused.png
+++ b/org_apg/res/drawable-hdpi-finger/btn_circle_disable_focused.png
diff --git a/res/drawable-hdpi-finger/btn_circle_normal.png b/org_apg/res/drawable-hdpi-finger/btn_circle_normal.png
index 5eda66883..5eda66883 100644
--- a/res/drawable-hdpi-finger/btn_circle_normal.png
+++ b/org_apg/res/drawable-hdpi-finger/btn_circle_normal.png
diff --git a/res/drawable-hdpi-finger/btn_circle_pressed.png b/org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png
index 88848bac2..88848bac2 100644
--- a/res/drawable-hdpi-finger/btn_circle_pressed.png
+++ b/org_apg/res/drawable-hdpi-finger/btn_circle_pressed.png
diff --git a/res/drawable-hdpi-finger/btn_circle_selected.png b/org_apg/res/drawable-hdpi-finger/btn_circle_selected.png
index 74690705f..74690705f 100644
--- a/res/drawable-hdpi-finger/btn_circle_selected.png
+++ b/org_apg/res/drawable-hdpi-finger/btn_circle_selected.png
diff --git a/res/drawable-hdpi-finger/ic_btn_round_minus.png b/org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png
index 27af3faf4..27af3faf4 100644
--- a/res/drawable-hdpi-finger/ic_btn_round_minus.png
+++ b/org_apg/res/drawable-hdpi-finger/ic_btn_round_minus.png
diff --git a/res/drawable-hdpi-finger/ic_btn_round_plus.png b/org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png
index b24168c32..b24168c32 100644
--- a/res/drawable-hdpi-finger/ic_btn_round_plus.png
+++ b/org_apg/res/drawable-hdpi-finger/ic_btn_round_plus.png
diff --git a/res/drawable-hdpi/encrypted.png b/org_apg/res/drawable-hdpi/encrypted.png
index 541781cd1..541781cd1 100644
--- a/res/drawable-hdpi/encrypted.png
+++ b/org_apg/res/drawable-hdpi/encrypted.png
diff --git a/res/drawable-hdpi/encrypted_large.png b/org_apg/res/drawable-hdpi/encrypted_large.png
index 209278377..209278377 100644
--- a/res/drawable-hdpi/encrypted_large.png
+++ b/org_apg/res/drawable-hdpi/encrypted_large.png
diff --git a/res/drawable-hdpi/encrypted_small.png b/org_apg/res/drawable-hdpi/encrypted_small.png
index 3ff8e9b97..3ff8e9b97 100644
--- a/res/drawable-hdpi/encrypted_small.png
+++ b/org_apg/res/drawable-hdpi/encrypted_small.png
diff --git a/res/drawable-hdpi/ic_next.png b/org_apg/res/drawable-hdpi/ic_next.png
index d71058055..d71058055 100644
--- a/res/drawable-hdpi/ic_next.png
+++ b/org_apg/res/drawable-hdpi/ic_next.png
diff --git a/res/drawable-hdpi/ic_previous.png b/org_apg/res/drawable-hdpi/ic_previous.png
index d610e4667..d610e4667 100644
--- a/res/drawable-hdpi/ic_previous.png
+++ b/org_apg/res/drawable-hdpi/ic_previous.png
diff --git a/res/drawable-hdpi/icon.png b/org_apg/res/drawable-hdpi/icon.png
index d36080251..d36080251 100644
--- a/res/drawable-hdpi/icon.png
+++ b/org_apg/res/drawable-hdpi/icon.png
diff --git a/res/drawable-hdpi/key.png b/org_apg/res/drawable-hdpi/key.png
index af4742ec0..af4742ec0 100644
--- a/res/drawable-hdpi/key.png
+++ b/org_apg/res/drawable-hdpi/key.png
diff --git a/res/drawable-hdpi/key_large.png b/org_apg/res/drawable-hdpi/key_large.png
index 590f7d5a4..590f7d5a4 100644
--- a/res/drawable-hdpi/key_large.png
+++ b/org_apg/res/drawable-hdpi/key_large.png
diff --git a/res/drawable-hdpi/key_small.png b/org_apg/res/drawable-hdpi/key_small.png
index 6966048a1..6966048a1 100644
--- a/res/drawable-hdpi/key_small.png
+++ b/org_apg/res/drawable-hdpi/key_small.png
diff --git a/res/drawable-hdpi/overlay_error.png b/org_apg/res/drawable-hdpi/overlay_error.png
index e6d7e60ba..e6d7e60ba 100644
--- a/res/drawable-hdpi/overlay_error.png
+++ b/org_apg/res/drawable-hdpi/overlay_error.png
diff --git a/res/drawable-hdpi/overlay_ok.png b/org_apg/res/drawable-hdpi/overlay_ok.png
index 0672f869d..0672f869d 100644
--- a/res/drawable-hdpi/overlay_ok.png
+++ b/org_apg/res/drawable-hdpi/overlay_ok.png
diff --git a/res/drawable-hdpi/signed.png b/org_apg/res/drawable-hdpi/signed.png
index ab9495e7b..ab9495e7b 100644
--- a/res/drawable-hdpi/signed.png
+++ b/org_apg/res/drawable-hdpi/signed.png
diff --git a/res/drawable-hdpi/signed_large.png b/org_apg/res/drawable-hdpi/signed_large.png
index c209f4167..c209f4167 100644
--- a/res/drawable-hdpi/signed_large.png
+++ b/org_apg/res/drawable-hdpi/signed_large.png
diff --git a/res/drawable-hdpi/signed_small.png b/org_apg/res/drawable-hdpi/signed_small.png
index 54c4906e8..54c4906e8 100644
--- a/res/drawable-hdpi/signed_small.png
+++ b/org_apg/res/drawable-hdpi/signed_small.png
diff --git a/res/drawable-ldpi/encrypted.png b/org_apg/res/drawable-ldpi/encrypted.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/res/drawable-ldpi/encrypted.png
+++ b/org_apg/res/drawable-ldpi/encrypted.png
diff --git a/res/drawable-ldpi/encrypted_large.png b/org_apg/res/drawable-ldpi/encrypted_large.png
index 34c3d3f97..34c3d3f97 100644
--- a/res/drawable-ldpi/encrypted_large.png
+++ b/org_apg/res/drawable-ldpi/encrypted_large.png
diff --git a/res/drawable-ldpi/encrypted_small.png b/org_apg/res/drawable-ldpi/encrypted_small.png
index 5e7294a4b..5e7294a4b 100644
--- a/res/drawable-ldpi/encrypted_small.png
+++ b/org_apg/res/drawable-ldpi/encrypted_small.png
diff --git a/res/drawable-ldpi/ic_next.png b/org_apg/res/drawable-ldpi/ic_next.png
index 474ed8faa..474ed8faa 100644
--- a/res/drawable-ldpi/ic_next.png
+++ b/org_apg/res/drawable-ldpi/ic_next.png
diff --git a/res/drawable-ldpi/ic_previous.png b/org_apg/res/drawable-ldpi/ic_previous.png
index 6fd885e6b..6fd885e6b 100644
--- a/res/drawable-ldpi/ic_previous.png
+++ b/org_apg/res/drawable-ldpi/ic_previous.png
diff --git a/res/drawable-ldpi/icon.png b/org_apg/res/drawable-ldpi/icon.png
index 5b9c33f0c..5b9c33f0c 100644
--- a/res/drawable-ldpi/icon.png
+++ b/org_apg/res/drawable-ldpi/icon.png
diff --git a/res/drawable-ldpi/key.png b/org_apg/res/drawable-ldpi/key.png
index c806b6041..c806b6041 100644
--- a/res/drawable-ldpi/key.png
+++ b/org_apg/res/drawable-ldpi/key.png
diff --git a/res/drawable-ldpi/key_large.png b/org_apg/res/drawable-ldpi/key_large.png
index aa499a5e1..aa499a5e1 100644
--- a/res/drawable-ldpi/key_large.png
+++ b/org_apg/res/drawable-ldpi/key_large.png
diff --git a/res/drawable-ldpi/key_small.png b/org_apg/res/drawable-ldpi/key_small.png
index 073b95029..073b95029 100644
--- a/res/drawable-ldpi/key_small.png
+++ b/org_apg/res/drawable-ldpi/key_small.png
diff --git a/res/drawable-ldpi/overlay_error.png b/org_apg/res/drawable-ldpi/overlay_error.png
index e5a88e18f..e5a88e18f 100644
--- a/res/drawable-ldpi/overlay_error.png
+++ b/org_apg/res/drawable-ldpi/overlay_error.png
diff --git a/res/drawable-ldpi/overlay_ok.png b/org_apg/res/drawable-ldpi/overlay_ok.png
index 63374d47f..63374d47f 100644
--- a/res/drawable-ldpi/overlay_ok.png
+++ b/org_apg/res/drawable-ldpi/overlay_ok.png
diff --git a/res/drawable-ldpi/signed.png b/org_apg/res/drawable-ldpi/signed.png
index 4202c3f97..4202c3f97 100644
--- a/res/drawable-ldpi/signed.png
+++ b/org_apg/res/drawable-ldpi/signed.png
diff --git a/res/drawable-ldpi/signed_large.png b/org_apg/res/drawable-ldpi/signed_large.png
index d2917644c..d2917644c 100644
--- a/res/drawable-ldpi/signed_large.png
+++ b/org_apg/res/drawable-ldpi/signed_large.png
diff --git a/res/drawable-ldpi/signed_small.png b/org_apg/res/drawable-ldpi/signed_small.png
index 19d45f8da..19d45f8da 100644
--- a/res/drawable-ldpi/signed_small.png
+++ b/org_apg/res/drawable-ldpi/signed_small.png
diff --git a/res/drawable-mdpi-finger/btn_circle_disable.png b/org_apg/res/drawable-mdpi-finger/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/res/drawable-mdpi-finger/btn_circle_disable.png
+++ b/org_apg/res/drawable-mdpi-finger/btn_circle_disable.png
diff --git a/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/res/drawable-mdpi-finger/btn_circle_disable_focused.png
+++ b/org_apg/res/drawable-mdpi-finger/btn_circle_disable_focused.png
diff --git a/res/drawable-mdpi-finger/btn_circle_normal.png b/org_apg/res/drawable-mdpi-finger/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/res/drawable-mdpi-finger/btn_circle_normal.png
+++ b/org_apg/res/drawable-mdpi-finger/btn_circle_normal.png
diff --git a/res/drawable-mdpi-finger/btn_circle_pressed.png b/org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/res/drawable-mdpi-finger/btn_circle_pressed.png
+++ b/org_apg/res/drawable-mdpi-finger/btn_circle_pressed.png
diff --git a/res/drawable-mdpi-finger/btn_circle_selected.png b/org_apg/res/drawable-mdpi-finger/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/res/drawable-mdpi-finger/btn_circle_selected.png
+++ b/org_apg/res/drawable-mdpi-finger/btn_circle_selected.png
diff --git a/res/drawable-mdpi-finger/ic_btn_round_minus.png b/org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/res/drawable-mdpi-finger/ic_btn_round_minus.png
+++ b/org_apg/res/drawable-mdpi-finger/ic_btn_round_minus.png
diff --git a/res/drawable-mdpi-finger/ic_btn_round_plus.png b/org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/res/drawable-mdpi-finger/ic_btn_round_plus.png
+++ b/org_apg/res/drawable-mdpi-finger/ic_btn_round_plus.png
diff --git a/res/drawable-mdpi/encrypted.png b/org_apg/res/drawable-mdpi/encrypted.png
index 34c3d3f97..34c3d3f97 100644
--- a/res/drawable-mdpi/encrypted.png
+++ b/org_apg/res/drawable-mdpi/encrypted.png
diff --git a/res/drawable-mdpi/encrypted_large.png b/org_apg/res/drawable-mdpi/encrypted_large.png
index 541781cd1..541781cd1 100644
--- a/res/drawable-mdpi/encrypted_large.png
+++ b/org_apg/res/drawable-mdpi/encrypted_large.png
diff --git a/res/drawable-mdpi/encrypted_small.png b/org_apg/res/drawable-mdpi/encrypted_small.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/res/drawable-mdpi/encrypted_small.png
+++ b/org_apg/res/drawable-mdpi/encrypted_small.png
diff --git a/res/drawable-mdpi/ic_next.png b/org_apg/res/drawable-mdpi/ic_next.png
index 8271c1380..8271c1380 100644
--- a/res/drawable-mdpi/ic_next.png
+++ b/org_apg/res/drawable-mdpi/ic_next.png
diff --git a/res/drawable-mdpi/ic_previous.png b/org_apg/res/drawable-mdpi/ic_previous.png
index ef90db972..ef90db972 100644
--- a/res/drawable-mdpi/ic_previous.png
+++ b/org_apg/res/drawable-mdpi/ic_previous.png
diff --git a/res/drawable-mdpi/icon.png b/org_apg/res/drawable-mdpi/icon.png
index fec2d62ce..fec2d62ce 100644
--- a/res/drawable-mdpi/icon.png
+++ b/org_apg/res/drawable-mdpi/icon.png
diff --git a/res/drawable-mdpi/key.png b/org_apg/res/drawable-mdpi/key.png
index aa499a5e1..aa499a5e1 100644
--- a/res/drawable-mdpi/key.png
+++ b/org_apg/res/drawable-mdpi/key.png
diff --git a/res/drawable-mdpi/key_large.png b/org_apg/res/drawable-mdpi/key_large.png
index af4742ec0..af4742ec0 100644
--- a/res/drawable-mdpi/key_large.png
+++ b/org_apg/res/drawable-mdpi/key_large.png
diff --git a/res/drawable-mdpi/key_small.png b/org_apg/res/drawable-mdpi/key_small.png
index c806b6041..c806b6041 100644
--- a/res/drawable-mdpi/key_small.png
+++ b/org_apg/res/drawable-mdpi/key_small.png
diff --git a/res/drawable-mdpi/overlay_error.png b/org_apg/res/drawable-mdpi/overlay_error.png
index 5fe017433..5fe017433 100644
--- a/res/drawable-mdpi/overlay_error.png
+++ b/org_apg/res/drawable-mdpi/overlay_error.png
diff --git a/res/drawable-mdpi/overlay_ok.png b/org_apg/res/drawable-mdpi/overlay_ok.png
index b4f332260..b4f332260 100644
--- a/res/drawable-mdpi/overlay_ok.png
+++ b/org_apg/res/drawable-mdpi/overlay_ok.png
diff --git a/res/drawable-mdpi/signed.png b/org_apg/res/drawable-mdpi/signed.png
index d2917644c..d2917644c 100644
--- a/res/drawable-mdpi/signed.png
+++ b/org_apg/res/drawable-mdpi/signed.png
diff --git a/res/drawable-mdpi/signed_large.png b/org_apg/res/drawable-mdpi/signed_large.png
index ab9495e7b..ab9495e7b 100644
--- a/res/drawable-mdpi/signed_large.png
+++ b/org_apg/res/drawable-mdpi/signed_large.png
diff --git a/res/drawable-mdpi/signed_small.png b/org_apg/res/drawable-mdpi/signed_small.png
index 4202c3f97..4202c3f97 100644
--- a/res/drawable-mdpi/signed_small.png
+++ b/org_apg/res/drawable-mdpi/signed_small.png
diff --git a/res/drawable-xhdpi/icon.png b/org_apg/res/drawable-xhdpi/icon.png
index ffeb8cdf3..ffeb8cdf3 100644
--- a/res/drawable-xhdpi/icon.png
+++ b/org_apg/res/drawable-xhdpi/icon.png
diff --git a/res/drawable/btn_circle_disable.png b/org_apg/res/drawable/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/res/drawable/btn_circle_disable.png
+++ b/org_apg/res/drawable/btn_circle_disable.png
diff --git a/res/drawable/btn_circle_disable_focused.png b/org_apg/res/drawable/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/res/drawable/btn_circle_disable_focused.png
+++ b/org_apg/res/drawable/btn_circle_disable_focused.png
diff --git a/res/drawable/btn_circle_normal.png b/org_apg/res/drawable/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/res/drawable/btn_circle_normal.png
+++ b/org_apg/res/drawable/btn_circle_normal.png
diff --git a/res/drawable/btn_circle_pressed.png b/org_apg/res/drawable/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/res/drawable/btn_circle_pressed.png
+++ b/org_apg/res/drawable/btn_circle_pressed.png
diff --git a/res/drawable/btn_circle_selected.png b/org_apg/res/drawable/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/res/drawable/btn_circle_selected.png
+++ b/org_apg/res/drawable/btn_circle_selected.png
diff --git a/res/drawable/encrypted.png b/org_apg/res/drawable/encrypted.png
index 2783804bc..2783804bc 100644
--- a/res/drawable/encrypted.png
+++ b/org_apg/res/drawable/encrypted.png
diff --git a/res/drawable/encrypted_large.png b/org_apg/res/drawable/encrypted_large.png
index 6d7c616a4..6d7c616a4 100644
--- a/res/drawable/encrypted_large.png
+++ b/org_apg/res/drawable/encrypted_large.png
diff --git a/res/drawable/encrypted_small.png b/org_apg/res/drawable/encrypted_small.png
index 7f4ab803f..7f4ab803f 100644
--- a/res/drawable/encrypted_small.png
+++ b/org_apg/res/drawable/encrypted_small.png
diff --git a/res/drawable/ic_btn_round_minus.png b/org_apg/res/drawable/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/res/drawable/ic_btn_round_minus.png
+++ b/org_apg/res/drawable/ic_btn_round_minus.png
diff --git a/res/drawable/ic_btn_round_plus.png b/org_apg/res/drawable/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/res/drawable/ic_btn_round_plus.png
+++ b/org_apg/res/drawable/ic_btn_round_plus.png
diff --git a/res/drawable/ic_launcher_folder.png b/org_apg/res/drawable/ic_launcher_folder.png
index ed31ba580..ed31ba580 100644
--- a/res/drawable/ic_launcher_folder.png
+++ b/org_apg/res/drawable/ic_launcher_folder.png
diff --git a/res/drawable/ic_launcher_folder_small.png b/org_apg/res/drawable/ic_launcher_folder_small.png
index 5df8d60f0..5df8d60f0 100644
--- a/res/drawable/ic_launcher_folder_small.png
+++ b/org_apg/res/drawable/ic_launcher_folder_small.png
diff --git a/res/drawable/ic_next.png b/org_apg/res/drawable/ic_next.png
index 8271c1380..8271c1380 100644
--- a/res/drawable/ic_next.png
+++ b/org_apg/res/drawable/ic_next.png
diff --git a/res/drawable/ic_previous.png b/org_apg/res/drawable/ic_previous.png
index ef90db972..ef90db972 100644
--- a/res/drawable/ic_previous.png
+++ b/org_apg/res/drawable/ic_previous.png
diff --git a/res/drawable/key.png b/org_apg/res/drawable/key.png
index de7e72524..de7e72524 100644
--- a/res/drawable/key.png
+++ b/org_apg/res/drawable/key.png
diff --git a/res/drawable/key_large.png b/org_apg/res/drawable/key_large.png
index 6f18c0240..6f18c0240 100644
--- a/res/drawable/key_large.png
+++ b/org_apg/res/drawable/key_large.png
diff --git a/res/drawable/key_small.png b/org_apg/res/drawable/key_small.png
index 121803508..121803508 100644
--- a/res/drawable/key_small.png
+++ b/org_apg/res/drawable/key_small.png
diff --git a/res/drawable/overlay_error.png b/org_apg/res/drawable/overlay_error.png
index 2372de59e..2372de59e 100644
--- a/res/drawable/overlay_error.png
+++ b/org_apg/res/drawable/overlay_error.png
diff --git a/res/drawable/overlay_ok.png b/org_apg/res/drawable/overlay_ok.png
index 2f0005898..2f0005898 100644
--- a/res/drawable/overlay_ok.png
+++ b/org_apg/res/drawable/overlay_ok.png
diff --git a/res/drawable/signed.png b/org_apg/res/drawable/signed.png
index 490e94fbd..490e94fbd 100644
--- a/res/drawable/signed.png
+++ b/org_apg/res/drawable/signed.png
diff --git a/res/drawable/signed_large.png b/org_apg/res/drawable/signed_large.png
index 92e64dc51..92e64dc51 100644
--- a/res/drawable/signed_large.png
+++ b/org_apg/res/drawable/signed_large.png
diff --git a/res/drawable/signed_small.png b/org_apg/res/drawable/signed_small.png
index 590220281..590220281 100644
--- a/res/drawable/signed_small.png
+++ b/org_apg/res/drawable/signed_small.png
diff --git a/res/layout/about_activity.xml b/org_apg/res/layout/about_activity.xml
index a85439ee1..a85439ee1 100644
--- a/res/layout/about_activity.xml
+++ b/org_apg/res/layout/about_activity.xml
diff --git a/res/layout/account_item.xml b/org_apg/res/layout/account_item.xml
index 0aa76719a..0aa76719a 100644
--- a/res/layout/account_item.xml
+++ b/org_apg/res/layout/account_item.xml
diff --git a/res/layout/add_account_dialog.xml b/org_apg/res/layout/add_account_dialog.xml
index d44ce9766..d44ce9766 100644
--- a/res/layout/add_account_dialog.xml
+++ b/org_apg/res/layout/add_account_dialog.xml
diff --git a/res/layout/create_key.xml b/org_apg/res/layout/create_key.xml
index d8ccc73ec..d8ccc73ec 100644
--- a/res/layout/create_key.xml
+++ b/org_apg/res/layout/create_key.xml
diff --git a/res/layout/decrypt.xml b/org_apg/res/layout/decrypt.xml
index 8bfa76f01..8bfa76f01 100644
--- a/res/layout/decrypt.xml
+++ b/org_apg/res/layout/decrypt.xml
diff --git a/res/layout/edit_key.xml b/org_apg/res/layout/edit_key.xml
index 88be75d86..88be75d86 100644
--- a/res/layout/edit_key.xml
+++ b/org_apg/res/layout/edit_key.xml
diff --git a/res/layout/edit_key_key_item.xml b/org_apg/res/layout/edit_key_key_item.xml
index 850879f64..850879f64 100644
--- a/res/layout/edit_key_key_item.xml
+++ b/org_apg/res/layout/edit_key_key_item.xml
diff --git a/res/layout/edit_key_section.xml b/org_apg/res/layout/edit_key_section.xml
index d14748d4b..d14748d4b 100644
--- a/res/layout/edit_key_section.xml
+++ b/org_apg/res/layout/edit_key_section.xml
diff --git a/res/layout/edit_key_user_id_item.xml b/org_apg/res/layout/edit_key_user_id_item.xml
index 6e7b552dd..6e7b552dd 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/org_apg/res/layout/edit_key_user_id_item.xml
diff --git a/res/layout/encrypt.xml b/org_apg/res/layout/encrypt.xml
index 68808c8bf..68808c8bf 100644
--- a/res/layout/encrypt.xml
+++ b/org_apg/res/layout/encrypt.xml
diff --git a/res/layout/file_dialog.xml b/org_apg/res/layout/file_dialog.xml
index bc5a2a214..bc5a2a214 100644
--- a/res/layout/file_dialog.xml
+++ b/org_apg/res/layout/file_dialog.xml
diff --git a/res/layout/filter_info.xml b/org_apg/res/layout/filter_info.xml
index 9fef6548e..9fef6548e 100644
--- a/res/layout/filter_info.xml
+++ b/org_apg/res/layout/filter_info.xml
diff --git a/res/layout/general.xml b/org_apg/res/layout/general.xml
index c6702efac..c6702efac 100644
--- a/res/layout/general.xml
+++ b/org_apg/res/layout/general.xml
diff --git a/res/layout/info.xml b/org_apg/res/layout/info.xml
index 2507029c4..2507029c4 100644
--- a/res/layout/info.xml
+++ b/org_apg/res/layout/info.xml
diff --git a/res/layout/key_list.xml b/org_apg/res/layout/key_list.xml
index ac07801ab..ac07801ab 100644
--- a/res/layout/key_list.xml
+++ b/org_apg/res/layout/key_list.xml
diff --git a/res/layout/key_list_child_item_master_key.xml b/org_apg/res/layout/key_list_child_item_master_key.xml
index 998ba256f..998ba256f 100644
--- a/res/layout/key_list_child_item_master_key.xml
+++ b/org_apg/res/layout/key_list_child_item_master_key.xml
diff --git a/res/layout/key_list_child_item_sub_key.xml b/org_apg/res/layout/key_list_child_item_sub_key.xml
index ac7c217a6..ac7c217a6 100644
--- a/res/layout/key_list_child_item_sub_key.xml
+++ b/org_apg/res/layout/key_list_child_item_sub_key.xml
diff --git a/res/layout/key_list_child_item_user_id.xml b/org_apg/res/layout/key_list_child_item_user_id.xml
index 598dcef22..598dcef22 100644
--- a/res/layout/key_list_child_item_user_id.xml
+++ b/org_apg/res/layout/key_list_child_item_user_id.xml
diff --git a/res/layout/key_list_group_item.xml b/org_apg/res/layout/key_list_group_item.xml
index 35d0ab367..35d0ab367 100644
--- a/res/layout/key_list_group_item.xml
+++ b/org_apg/res/layout/key_list_group_item.xml
diff --git a/res/layout/key_server_editor.xml b/org_apg/res/layout/key_server_editor.xml
index a02540c2c..a02540c2c 100644
--- a/res/layout/key_server_editor.xml
+++ b/org_apg/res/layout/key_server_editor.xml
diff --git a/res/layout/key_server_export_layout.xml b/org_apg/res/layout/key_server_export_layout.xml
index b2270417d..b2270417d 100644
--- a/res/layout/key_server_export_layout.xml
+++ b/org_apg/res/layout/key_server_export_layout.xml
diff --git a/res/layout/key_server_preference.xml b/org_apg/res/layout/key_server_preference.xml
index 2f5645f62..2f5645f62 100644
--- a/res/layout/key_server_preference.xml
+++ b/org_apg/res/layout/key_server_preference.xml
diff --git a/res/layout/key_server_query_layout.xml b/org_apg/res/layout/key_server_query_layout.xml
index 6af4f3644..6af4f3644 100644
--- a/res/layout/key_server_query_layout.xml
+++ b/org_apg/res/layout/key_server_query_layout.xml
diff --git a/res/layout/key_server_query_result_item.xml b/org_apg/res/layout/key_server_query_result_item.xml
index 29c8b88f4..29c8b88f4 100644
--- a/res/layout/key_server_query_result_item.xml
+++ b/org_apg/res/layout/key_server_query_result_item.xml
diff --git a/res/layout/key_server_query_result_user_id.xml b/org_apg/res/layout/key_server_query_result_user_id.xml
index 9d3a4a1ab..9d3a4a1ab 100644
--- a/res/layout/key_server_query_result_user_id.xml
+++ b/org_apg/res/layout/key_server_query_result_user_id.xml
diff --git a/res/layout/mailbox_message_item.xml b/org_apg/res/layout/mailbox_message_item.xml
index 05a267fb6..05a267fb6 100644
--- a/res/layout/mailbox_message_item.xml
+++ b/org_apg/res/layout/mailbox_message_item.xml
diff --git a/res/layout/main.xml b/org_apg/res/layout/main.xml
index 803b2abe9..803b2abe9 100644
--- a/res/layout/main.xml
+++ b/org_apg/res/layout/main.xml
diff --git a/res/layout/pass_phrase.xml b/org_apg/res/layout/pass_phrase.xml
index d66ffca07..d66ffca07 100644
--- a/res/layout/pass_phrase.xml
+++ b/org_apg/res/layout/pass_phrase.xml
diff --git a/res/layout/select_public_key.xml b/org_apg/res/layout/select_public_key.xml
index 9ce35a7a8..9ce35a7a8 100644
--- a/res/layout/select_public_key.xml
+++ b/org_apg/res/layout/select_public_key.xml
diff --git a/res/layout/select_public_key_item.xml b/org_apg/res/layout/select_public_key_item.xml
index beca23176..beca23176 100644
--- a/res/layout/select_public_key_item.xml
+++ b/org_apg/res/layout/select_public_key_item.xml
diff --git a/res/layout/select_secret_key.xml b/org_apg/res/layout/select_secret_key.xml
index feabc6160..feabc6160 100644
--- a/res/layout/select_secret_key.xml
+++ b/org_apg/res/layout/select_secret_key.xml
diff --git a/res/layout/select_secret_key_item.xml b/org_apg/res/layout/select_secret_key_item.xml
index 022545152..022545152 100644
--- a/res/layout/select_secret_key_item.xml
+++ b/org_apg/res/layout/select_secret_key_item.xml
diff --git a/res/layout/sign_key_layout.xml b/org_apg/res/layout/sign_key_layout.xml
index 17be03b21..17be03b21 100644
--- a/res/layout/sign_key_layout.xml
+++ b/org_apg/res/layout/sign_key_layout.xml
diff --git a/res/values-da/strings.xml b/org_apg/res/values-da/strings.xml
index 418372fb9..418372fb9 100644
--- a/res/values-da/strings.xml
+++ b/org_apg/res/values-da/strings.xml
diff --git a/res/values-de/strings.xml b/org_apg/res/values-de/strings.xml
index 732d58b0a..732d58b0a 100644
--- a/res/values-de/strings.xml
+++ b/org_apg/res/values-de/strings.xml
diff --git a/res/values-es/strings.xml b/org_apg/res/values-es/strings.xml
index a2faf56d9..a2faf56d9 100644
--- a/res/values-es/strings.xml
+++ b/org_apg/res/values-es/strings.xml
diff --git a/res/values-it/strings.xml b/org_apg/res/values-it/strings.xml
index 21a6d3486..21a6d3486 100644
--- a/res/values-it/strings.xml
+++ b/org_apg/res/values-it/strings.xml
diff --git a/res/values-no/strings.xml b/org_apg/res/values-no/strings.xml
index 825701f38..825701f38 100644
--- a/res/values-no/strings.xml
+++ b/org_apg/res/values-no/strings.xml
diff --git a/res/values-pt/strings.xml b/org_apg/res/values-pt/strings.xml
index 76e0cb244..76e0cb244 100644
--- a/res/values-pt/strings.xml
+++ b/org_apg/res/values-pt/strings.xml
diff --git a/res/values-sl/strings.xml b/org_apg/res/values-sl/strings.xml
index 576d6e56b..576d6e56b 100644
--- a/res/values-sl/strings.xml
+++ b/org_apg/res/values-sl/strings.xml
diff --git a/res/values-zh/strings.xml b/org_apg/res/values-zh/strings.xml
index 8fa3d23fc..8fa3d23fc 100644
--- a/res/values-zh/strings.xml
+++ b/org_apg/res/values-zh/strings.xml
diff --git a/res/values/arrays.xml b/org_apg/res/values/arrays.xml
index 25a4e66df..25a4e66df 100644
--- a/res/values/arrays.xml
+++ b/org_apg/res/values/arrays.xml
diff --git a/res/values/static_strings.xml b/org_apg/res/values/static_strings.xml
index c8a6a5026..c8a6a5026 100644
--- a/res/values/static_strings.xml
+++ b/org_apg/res/values/static_strings.xml
diff --git a/res/values/strings.xml b/org_apg/res/values/strings.xml
index 4cfc99df8..4cfc99df8 100644
--- a/res/values/strings.xml
+++ b/org_apg/res/values/strings.xml
diff --git a/res/values/styles.xml b/org_apg/res/values/styles.xml
index 2a2a69341..2a2a69341 100644
--- a/res/values/styles.xml
+++ b/org_apg/res/values/styles.xml
diff --git a/res/xml/apg_preferences.xml b/org_apg/res/xml/apg_preferences.xml
index 7c0dd2206..7c0dd2206 100644
--- a/res/xml/apg_preferences.xml
+++ b/org_apg/res/xml/apg_preferences.xml
diff --git a/res/xml/searchable_public_keys.xml b/org_apg/res/xml/searchable_public_keys.xml
index e9602b121..e9602b121 100644
--- a/res/xml/searchable_public_keys.xml
+++ b/org_apg/res/xml/searchable_public_keys.xml
diff --git a/res/xml/searchable_secret_keys.xml b/org_apg/res/xml/searchable_secret_keys.xml
index a7e8873d6..a7e8873d6 100644
--- a/res/xml/searchable_secret_keys.xml
+++ b/org_apg/res/xml/searchable_secret_keys.xml
diff --git a/src/org/apg/Apg.java b/org_apg/src/org/apg/Apg.java
index 2bfdb31e6..2bfdb31e6 100644
--- a/src/org/apg/Apg.java
+++ b/org_apg/src/org/apg/Apg.java
diff --git a/src/org/apg/ApgService.java b/org_apg/src/org/apg/ApgService.java
index 82e85371d..82e85371d 100644
--- a/src/org/apg/ApgService.java
+++ b/org_apg/src/org/apg/ApgService.java
diff --git a/src/org/apg/AskForSecretKeyPassPhrase.java b/org_apg/src/org/apg/AskForSecretKeyPassPhrase.java
index ebed75667..ebed75667 100644
--- a/src/org/apg/AskForSecretKeyPassPhrase.java
+++ b/org_apg/src/org/apg/AskForSecretKeyPassPhrase.java
diff --git a/src/org/apg/CachedPassPhrase.java b/org_apg/src/org/apg/CachedPassPhrase.java
index 2d67a300d..2d67a300d 100644
--- a/src/org/apg/CachedPassPhrase.java
+++ b/org_apg/src/org/apg/CachedPassPhrase.java
diff --git a/src/org/apg/Constants.java b/org_apg/src/org/apg/Constants.java
index 9669d4b0d..9669d4b0d 100644
--- a/src/org/apg/Constants.java
+++ b/org_apg/src/org/apg/Constants.java
diff --git a/src/org/apg/DataDestination.java b/org_apg/src/org/apg/DataDestination.java
index 509670e69..509670e69 100644
--- a/src/org/apg/DataDestination.java
+++ b/org_apg/src/org/apg/DataDestination.java
diff --git a/src/org/apg/DataSource.java b/org_apg/src/org/apg/DataSource.java
index 340afa9f8..340afa9f8 100644
--- a/src/org/apg/DataSource.java
+++ b/org_apg/src/org/apg/DataSource.java
diff --git a/src/org/apg/FileDialog.java b/org_apg/src/org/apg/FileDialog.java
index 6ad498b90..6ad498b90 100644
--- a/src/org/apg/FileDialog.java
+++ b/org_apg/src/org/apg/FileDialog.java
diff --git a/src/org/apg/HkpKeyServer.java b/org_apg/src/org/apg/HkpKeyServer.java
index 294a60cb2..294a60cb2 100644
--- a/src/org/apg/HkpKeyServer.java
+++ b/org_apg/src/org/apg/HkpKeyServer.java
diff --git a/src/org/apg/IApgService.aidl b/org_apg/src/org/apg/IApgService.aidl
index 8101bd2a4..8101bd2a4 100644
--- a/src/org/apg/IApgService.aidl
+++ b/org_apg/src/org/apg/IApgService.aidl
diff --git a/src/org/apg/Id.java b/org_apg/src/org/apg/Id.java
index adcad0534..adcad0534 100644
--- a/src/org/apg/Id.java
+++ b/org_apg/src/org/apg/Id.java
diff --git a/src/org/apg/InputData.java b/org_apg/src/org/apg/InputData.java
index ae5b51fe4..ae5b51fe4 100644
--- a/src/org/apg/InputData.java
+++ b/org_apg/src/org/apg/InputData.java
diff --git a/src/org/apg/KeyServer.java b/org_apg/src/org/apg/KeyServer.java
index 32158454f..32158454f 100644
--- a/src/org/apg/KeyServer.java
+++ b/org_apg/src/org/apg/KeyServer.java
diff --git a/src/org/apg/PausableThread.java b/org_apg/src/org/apg/PausableThread.java
index 87258d36c..87258d36c 100644
--- a/src/org/apg/PausableThread.java
+++ b/org_apg/src/org/apg/PausableThread.java
diff --git a/src/org/apg/PositionAwareInputStream.java b/org_apg/src/org/apg/PositionAwareInputStream.java
index c59459670..c59459670 100644
--- a/src/org/apg/PositionAwareInputStream.java
+++ b/org_apg/src/org/apg/PositionAwareInputStream.java
diff --git a/src/org/apg/Preferences.java b/org_apg/src/org/apg/Preferences.java
index f4800e064..f4800e064 100644
--- a/src/org/apg/Preferences.java
+++ b/org_apg/src/org/apg/Preferences.java
diff --git a/src/org/apg/Primes.java b/org_apg/src/org/apg/Primes.java
index 1fd6482b2..1fd6482b2 100644
--- a/src/org/apg/Primes.java
+++ b/org_apg/src/org/apg/Primes.java
diff --git a/src/org/apg/ProgressDialogUpdater.java b/org_apg/src/org/apg/ProgressDialogUpdater.java
index 043cca906..043cca906 100644
--- a/src/org/apg/ProgressDialogUpdater.java
+++ b/org_apg/src/org/apg/ProgressDialogUpdater.java
diff --git a/src/org/apg/Service.java b/org_apg/src/org/apg/Service.java
index 24c4daa11..24c4daa11 100644
--- a/src/org/apg/Service.java
+++ b/org_apg/src/org/apg/Service.java
diff --git a/src/org/apg/provider/Accounts.java b/org_apg/src/org/apg/provider/Accounts.java
index b95f079df..b95f079df 100644
--- a/src/org/apg/provider/Accounts.java
+++ b/org_apg/src/org/apg/provider/Accounts.java
diff --git a/src/org/apg/provider/ApgServiceBlobDatabase.java b/org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java
index 70b9cd64f..70b9cd64f 100644
--- a/src/org/apg/provider/ApgServiceBlobDatabase.java
+++ b/org_apg/src/org/apg/provider/ApgServiceBlobDatabase.java
diff --git a/src/org/apg/provider/ApgServiceBlobProvider.java b/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
index f2d5377a4..f2d5377a4 100644
--- a/src/org/apg/provider/ApgServiceBlobProvider.java
+++ b/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
diff --git a/src/org/apg/provider/DataProvider.java b/org_apg/src/org/apg/provider/DataProvider.java
index a97851e58..a97851e58 100644
--- a/src/org/apg/provider/DataProvider.java
+++ b/org_apg/src/org/apg/provider/DataProvider.java
diff --git a/src/org/apg/provider/Database.java b/org_apg/src/org/apg/provider/Database.java
index 8b1aaa9e7..8b1aaa9e7 100644
--- a/src/org/apg/provider/Database.java
+++ b/org_apg/src/org/apg/provider/Database.java
diff --git a/src/org/apg/provider/KeyRings.java b/org_apg/src/org/apg/provider/KeyRings.java
index 304afd24f..304afd24f 100644
--- a/src/org/apg/provider/KeyRings.java
+++ b/org_apg/src/org/apg/provider/KeyRings.java
diff --git a/src/org/apg/provider/Keys.java b/org_apg/src/org/apg/provider/Keys.java
index 63eaee54f..63eaee54f 100644
--- a/src/org/apg/provider/Keys.java
+++ b/org_apg/src/org/apg/provider/Keys.java
diff --git a/src/org/apg/provider/UserIds.java b/org_apg/src/org/apg/provider/UserIds.java
index e8ddc677d..e8ddc677d 100644
--- a/src/org/apg/provider/UserIds.java
+++ b/org_apg/src/org/apg/provider/UserIds.java
diff --git a/src/org/apg/ui/AboutActivity.java b/org_apg/src/org/apg/ui/AboutActivity.java
index 308a1e06e..308a1e06e 100644
--- a/src/org/apg/ui/AboutActivity.java
+++ b/org_apg/src/org/apg/ui/AboutActivity.java
diff --git a/src/org/apg/ui/BaseActivity.java b/org_apg/src/org/apg/ui/BaseActivity.java
index 9b5039a5d..9b5039a5d 100644
--- a/src/org/apg/ui/BaseActivity.java
+++ b/org_apg/src/org/apg/ui/BaseActivity.java
diff --git a/src/org/apg/ui/DecryptActivity.java b/org_apg/src/org/apg/ui/DecryptActivity.java
index cb58dfb09..cb58dfb09 100644
--- a/src/org/apg/ui/DecryptActivity.java
+++ b/org_apg/src/org/apg/ui/DecryptActivity.java
diff --git a/src/org/apg/ui/EditKeyActivity.java b/org_apg/src/org/apg/ui/EditKeyActivity.java
index c3945d4ed..c3945d4ed 100644
--- a/src/org/apg/ui/EditKeyActivity.java
+++ b/org_apg/src/org/apg/ui/EditKeyActivity.java
diff --git a/src/org/apg/ui/EncryptActivity.java b/org_apg/src/org/apg/ui/EncryptActivity.java
index e5892a4d5..e5892a4d5 100644
--- a/src/org/apg/ui/EncryptActivity.java
+++ b/org_apg/src/org/apg/ui/EncryptActivity.java
diff --git a/src/org/apg/ui/GeneralActivity.java b/org_apg/src/org/apg/ui/GeneralActivity.java
index d70694630..d70694630 100644
--- a/src/org/apg/ui/GeneralActivity.java
+++ b/org_apg/src/org/apg/ui/GeneralActivity.java
diff --git a/src/org/apg/ui/ImportFromQRCodeActivity.java b/org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java
index 593c841df..593c841df 100644
--- a/src/org/apg/ui/ImportFromQRCodeActivity.java
+++ b/org_apg/src/org/apg/ui/ImportFromQRCodeActivity.java
diff --git a/src/org/apg/ui/KeyListActivity.java b/org_apg/src/org/apg/ui/KeyListActivity.java
index 6c76f02bc..6c76f02bc 100644
--- a/src/org/apg/ui/KeyListActivity.java
+++ b/org_apg/src/org/apg/ui/KeyListActivity.java
diff --git a/src/org/apg/ui/KeyServerPreferenceActivity.java b/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
index 85d31779a..85d31779a 100644
--- a/src/org/apg/ui/KeyServerPreferenceActivity.java
+++ b/org_apg/src/org/apg/ui/KeyServerPreferenceActivity.java
diff --git a/src/org/apg/ui/KeyServerQueryActivity.java b/org_apg/src/org/apg/ui/KeyServerQueryActivity.java
index 606acb575..606acb575 100644
--- a/src/org/apg/ui/KeyServerQueryActivity.java
+++ b/org_apg/src/org/apg/ui/KeyServerQueryActivity.java
diff --git a/src/org/apg/ui/MailListActivity.java b/org_apg/src/org/apg/ui/MailListActivity.java
index ad1d08068..ad1d08068 100644
--- a/src/org/apg/ui/MailListActivity.java
+++ b/org_apg/src/org/apg/ui/MailListActivity.java
diff --git a/src/org/apg/ui/MainActivity.java b/org_apg/src/org/apg/ui/MainActivity.java
index 8c985c2ac..8c985c2ac 100644
--- a/src/org/apg/ui/MainActivity.java
+++ b/org_apg/src/org/apg/ui/MainActivity.java
diff --git a/src/org/apg/ui/PreferencesActivity.java b/org_apg/src/org/apg/ui/PreferencesActivity.java
index 421c9cc39..421c9cc39 100644
--- a/src/org/apg/ui/PreferencesActivity.java
+++ b/org_apg/src/org/apg/ui/PreferencesActivity.java
diff --git a/src/org/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
index 81a79ce33..81a79ce33 100644
--- a/src/org/apg/ui/PublicKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
diff --git a/src/org/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
index a5d351bc6..a5d351bc6 100644
--- a/src/org/apg/ui/SecretKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
diff --git a/src/org/apg/ui/SelectPublicKeyListActivity.java b/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
index 5216e7a3d..5216e7a3d 100644
--- a/src/org/apg/ui/SelectPublicKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SelectPublicKeyListActivity.java
diff --git a/src/org/apg/ui/SelectPublicKeyListAdapter.java b/org_apg/src/org/apg/ui/SelectPublicKeyListAdapter.java
index b2f49f74a..b2f49f74a 100644
--- a/src/org/apg/ui/SelectPublicKeyListAdapter.java
+++ b/org_apg/src/org/apg/ui/SelectPublicKeyListAdapter.java
diff --git a/src/org/apg/ui/SelectSecretKeyListActivity.java b/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
index 191a0ecc7..191a0ecc7 100644
--- a/src/org/apg/ui/SelectSecretKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SelectSecretKeyListActivity.java
diff --git a/src/org/apg/ui/SelectSecretKeyListAdapter.java b/org_apg/src/org/apg/ui/SelectSecretKeyListAdapter.java
index 1a7734245..1a7734245 100644
--- a/src/org/apg/ui/SelectSecretKeyListAdapter.java
+++ b/org_apg/src/org/apg/ui/SelectSecretKeyListAdapter.java
diff --git a/src/org/apg/ui/SendKeyActivity.java b/org_apg/src/org/apg/ui/SendKeyActivity.java
index c44e87469..c44e87469 100644
--- a/src/org/apg/ui/SendKeyActivity.java
+++ b/org_apg/src/org/apg/ui/SendKeyActivity.java
diff --git a/src/org/apg/ui/SignKeyActivity.java b/org_apg/src/org/apg/ui/SignKeyActivity.java
index ab145c921..ab145c921 100644
--- a/src/org/apg/ui/SignKeyActivity.java
+++ b/org_apg/src/org/apg/ui/SignKeyActivity.java
diff --git a/src/org/apg/ui/widget/Editor.java b/org_apg/src/org/apg/ui/widget/Editor.java
index be95ad656..be95ad656 100644
--- a/src/org/apg/ui/widget/Editor.java
+++ b/org_apg/src/org/apg/ui/widget/Editor.java
diff --git a/src/org/apg/ui/widget/IntegerListPreference.java b/org_apg/src/org/apg/ui/widget/IntegerListPreference.java
index fa411a786..fa411a786 100644
--- a/src/org/apg/ui/widget/IntegerListPreference.java
+++ b/org_apg/src/org/apg/ui/widget/IntegerListPreference.java
diff --git a/src/org/apg/ui/widget/KeyEditor.java b/org_apg/src/org/apg/ui/widget/KeyEditor.java
index ef98f794a..ef98f794a 100644
--- a/src/org/apg/ui/widget/KeyEditor.java
+++ b/org_apg/src/org/apg/ui/widget/KeyEditor.java
diff --git a/src/org/apg/ui/widget/KeyServerEditor.java b/org_apg/src/org/apg/ui/widget/KeyServerEditor.java
index 3d8634c76..3d8634c76 100644
--- a/src/org/apg/ui/widget/KeyServerEditor.java
+++ b/org_apg/src/org/apg/ui/widget/KeyServerEditor.java
diff --git a/src/org/apg/ui/widget/SectionView.java b/org_apg/src/org/apg/ui/widget/SectionView.java
index 220699124..220699124 100644
--- a/src/org/apg/ui/widget/SectionView.java
+++ b/org_apg/src/org/apg/ui/widget/SectionView.java
diff --git a/src/org/apg/ui/widget/UserIdEditor.java b/org_apg/src/org/apg/ui/widget/UserIdEditor.java
index b154803cf..b154803cf 100644
--- a/src/org/apg/ui/widget/UserIdEditor.java
+++ b/org_apg/src/org/apg/ui/widget/UserIdEditor.java
diff --git a/src/org/apg/util/ApgCon.java b/org_apg/src/org/apg/util/ApgCon.java
index 73ee66ad9..73ee66ad9 100644
--- a/src/org/apg/util/ApgCon.java
+++ b/org_apg/src/org/apg/util/ApgCon.java
diff --git a/src/org/apg/util/ApgConInterface.java b/org_apg/src/org/apg/util/ApgConInterface.java
index 2b66164f1..2b66164f1 100644
--- a/src/org/apg/util/ApgConInterface.java
+++ b/org_apg/src/org/apg/util/ApgConInterface.java
diff --git a/src/org/apg/util/Choice.java b/org_apg/src/org/apg/util/Choice.java
index 1dbd9b215..1dbd9b215 100644
--- a/src/org/apg/util/Choice.java
+++ b/org_apg/src/org/apg/util/Choice.java
diff --git a/src/org/apg/util/Compatibility.java b/org_apg/src/org/apg/util/Compatibility.java
index 10b3c7f6b..10b3c7f6b 100644
--- a/src/org/apg/util/Compatibility.java
+++ b/org_apg/src/org/apg/util/Compatibility.java
diff --git a/src/org/apg/util/IterableIterator.java b/org_apg/src/org/apg/util/IterableIterator.java
index be6632ac0..be6632ac0 100644
--- a/src/org/apg/util/IterableIterator.java
+++ b/org_apg/src/org/apg/util/IterableIterator.java