changing package name back

8 files changed, 18 insertions, 18 deletions

diff --git a/org_apg/res/layout/edit_key_key_item.xml b/org_apg/res/layout/edit_key_key_item.xml
index cf816c797..5556ec22e 100644
--- a/org_apg/res/layout/edit_key_key_item.xml
+++ b/org_apg/res/layout/edit_key_key_item.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<org.apg.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
+<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" >
@@ -131,4 +131,4 @@
         android:layout_height="1dip"
         android:background="?android:attr/listDivider" />
 
-</org.apg.ui.widget.KeyEditor>
\ No newline at end of file
+</org.thialfihar.android.apg.ui.widget.KeyEditor>
\ No newline at end of file
diff --git a/org_apg/res/layout/edit_key_section.xml b/org_apg/res/layout/edit_key_section.xml
index 333d0b753..e8f788f6d 100644
--- a/org_apg/res/layout/edit_key_section.xml
+++ b/org_apg/res/layout/edit_key_section.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<org.apg.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
+<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" >
@@ -54,4 +54,4 @@
         android:orientation="vertical"
         android:paddingBottom="6dip" />
 
-</org.apg.ui.widget.SectionView>
\ No newline at end of file
+</org.thialfihar.android.apg.ui.widget.SectionView>
\ No newline at end of file
diff --git a/org_apg/res/layout/edit_key_user_id_item.xml b/org_apg/res/layout/edit_key_user_id_item.xml
index 1961cf109..26a7304e0 100644
--- a/org_apg/res/layout/edit_key_user_id_item.xml
+++ b/org_apg/res/layout/edit_key_user_id_item.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<org.apg.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
+<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" >
@@ -104,4 +104,4 @@
         android:layout_height="1dip"
         android:background="?android:attr/listDivider" />
 
-</org.apg.ui.widget.UserIdEditor>
\ No newline at end of file
+</org.thialfihar.android.apg.ui.widget.UserIdEditor>
\ No newline at end of file
diff --git a/org_apg/res/layout/key_server_editor.xml b/org_apg/res/layout/key_server_editor.xml
index a02540c2c..e4c25b316 100644
--- a/org_apg/res/layout/key_server_editor.xml
+++ b/org_apg/res/layout/key_server_editor.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<org.apg.ui.widget.KeyServerEditor
+<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"
@@ -49,4 +49,4 @@
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"/>
 
-</org.apg.ui.widget.KeyServerEditor>
+</org.thialfihar.android.apg.ui.widget.KeyServerEditor>
diff --git a/org_apg/res/layout/main.xml b/org_apg/res/layout/main.xml
index 6f0a66a71..e4c509c70 100644
--- a/org_apg/res/layout/main.xml
+++ b/org_apg/res/layout/main.xml
@@ -20,7 +20,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <org.apg.ui.widget.DashboardLayout
+    <org.thialfihar.android.apg.ui.widget.DashboardLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" >
 
@@ -66,7 +66,7 @@
             android:drawableTop="@drawable/dashboard_help"
             android:onClick="helpOnClick"
             android:text="@string/dashboard_help" />
-    </org.apg.ui.widget.DashboardLayout>
+    </org.thialfihar.android.apg.ui.widget.DashboardLayout>
 
     <!-- <LinearLayout -->
     <!-- style="@android:style/ButtonBar" -->
diff --git a/org_apg/res/values/static_strings.xml b/org_apg/res/values/static_strings.xml
index c8a6a5026..c69cf8adf 100644
--- a/org_apg/res/values/static_strings.xml
+++ b/org_apg/res/values/static_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translate="false">APG+</string>
+    <string name="app_name" translate="false">APG</string>
     <string name="about_url" translate="false">https://github.com/dschuermann/apg</string>
 
 </resources>
\ No newline at end of file
diff --git a/org_apg/res/values/strings.xml b/org_apg/res/values/strings.xml
index 5499c2bc8..606e351b1 100644
--- a/org_apg/res/values/strings.xml
+++ b/org_apg/res/values/strings.xml
@@ -327,10 +327,10 @@
 
 
     <!-- about -->
-    <string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.\n\nAPG+ is a fork based on the original APG to introduce more features and a new user interface.</string>
+    <string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.</string>
     <string name="about_license">License: Apache License 2.0</string>
     <string name="about_version">Version:</string>
-    <string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (APG+ fork)</string>
+    <string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (New user interface)</string>
 
     <!-- Dashboard -->
     <string name="dashboard_manage_keys">Manage Keys</string>
diff --git a/org_apg/res/xml/apg_preferences.xml b/org_apg/res/xml/apg_preferences.xml
index f32c2d73f..778f51375 100644
--- a/org_apg/res/xml/apg_preferences.xml
+++ b/org_apg/res/xml/apg_preferences.xml
@@ -18,7 +18,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <PreferenceCategory android:title="@string/section_general" >
-        <org.apg.ui.widget.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:entries="@array/pass_phrase_cache_ttl_entries"
             android:entryValues="@array/pass_phrase_cache_ttl_values"
             android:key="passPhraseCacheTtl"
@@ -31,19 +31,19 @@
             android:title="@string/label_keyServers" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/section_defaults" >
-        <org.apg.ui.widget.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:key="defaultEncryptionAlgorithm"
             android:persistent="false"
             android:title="@string/label_encryptionAlgorithm" />
-        <org.apg.ui.widget.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:key="defaultHashAlgorithm"
             android:persistent="false"
             android:title="@string/label_hashAlgorithm" />
-        <org.apg.ui.widget.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:key="defaultMessageCompression"
             android:persistent="false"
             android:title="@string/label_messageCompression" />
-        <org.apg.ui.widget.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:key="defaultFileCompression"
             android:persistent="false"
             android:title="@string/label_fileCompression" />