64 files changed, 108 insertions, 3 deletions

diff --git a/res/drawable-hdpi-finger-v4/btn_circle_disable.png b/res/drawable-hdpi-finger/btn_circle_disable.png
index ae063b545..ae063b545 100644
--- a/res/drawable-hdpi-finger-v4/btn_circle_disable.png
+++ b/res/drawable-hdpi-finger/btn_circle_disable.png
diff --git a/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png b/res/drawable-hdpi-finger/btn_circle_disable_focused.png
index 7a5d4fe4e..7a5d4fe4e 100644
--- a/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png
+++ b/res/drawable-hdpi-finger/btn_circle_disable_focused.png
diff --git a/res/drawable-hdpi-finger-v4/btn_circle_normal.png b/res/drawable-hdpi-finger/btn_circle_normal.png
index 5eda66883..5eda66883 100644
--- a/res/drawable-hdpi-finger-v4/btn_circle_normal.png
+++ b/res/drawable-hdpi-finger/btn_circle_normal.png
diff --git a/res/drawable-hdpi-finger-v4/btn_circle_pressed.png b/res/drawable-hdpi-finger/btn_circle_pressed.png
index 88848bac2..88848bac2 100644
--- a/res/drawable-hdpi-finger-v4/btn_circle_pressed.png
+++ b/res/drawable-hdpi-finger/btn_circle_pressed.png
diff --git a/res/drawable-hdpi-finger-v4/btn_circle_selected.png b/res/drawable-hdpi-finger/btn_circle_selected.png
index 74690705f..74690705f 100644
--- a/res/drawable-hdpi-finger-v4/btn_circle_selected.png
+++ b/res/drawable-hdpi-finger/btn_circle_selected.png
diff --git a/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png b/res/drawable-hdpi-finger/ic_btn_round_minus.png
index 27af3faf4..27af3faf4 100644
--- a/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png
+++ b/res/drawable-hdpi-finger/ic_btn_round_minus.png
diff --git a/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png b/res/drawable-hdpi-finger/ic_btn_round_plus.png
index b24168c32..b24168c32 100644
--- a/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png
+++ b/res/drawable-hdpi-finger/ic_btn_round_plus.png
diff --git a/res/drawable-hdpi-v4/icon.png b/res/drawable-hdpi-v4/icon.png
deleted file mode 100644
index 072f0a089..000000000
--- a/res/drawable-hdpi-v4/icon.png
+++ /dev/null
diff --git a/res/drawable-hdpi-v4/encrypted.png b/res/drawable-hdpi/encrypted.png
index 541781cd1..541781cd1 100644
--- a/res/drawable-hdpi-v4/encrypted.png
+++ b/res/drawable-hdpi/encrypted.png
diff --git a/res/drawable-hdpi-v4/encrypted_large.png b/res/drawable-hdpi/encrypted_large.png
index 209278377..209278377 100644
--- a/res/drawable-hdpi-v4/encrypted_large.png
+++ b/res/drawable-hdpi/encrypted_large.png
diff --git a/res/drawable-hdpi-v4/encrypted_small.png b/res/drawable-hdpi/encrypted_small.png
index 3ff8e9b97..3ff8e9b97 100644
--- a/res/drawable-hdpi-v4/encrypted_small.png
+++ b/res/drawable-hdpi/encrypted_small.png
diff --git a/res/drawable-hdpi-v4/ic_next.png b/res/drawable-hdpi/ic_next.png
index d71058055..d71058055 100644
--- a/res/drawable-hdpi-v4/ic_next.png
+++ b/res/drawable-hdpi/ic_next.png
diff --git a/res/drawable-hdpi-v4/ic_previous.png b/res/drawable-hdpi/ic_previous.png
index d610e4667..d610e4667 100644
--- a/res/drawable-hdpi-v4/ic_previous.png
+++ b/res/drawable-hdpi/ic_previous.png
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..d36080251
--- /dev/null
+++ b/res/drawable-hdpi/icon.png
diff --git a/res/drawable-hdpi-v4/key.png b/res/drawable-hdpi/key.png
index af4742ec0..af4742ec0 100644
--- a/res/drawable-hdpi-v4/key.png
+++ b/res/drawable-hdpi/key.png
diff --git a/res/drawable-hdpi-v4/key_large.png b/res/drawable-hdpi/key_large.png
index 590f7d5a4..590f7d5a4 100644
--- a/res/drawable-hdpi-v4/key_large.png
+++ b/res/drawable-hdpi/key_large.png
diff --git a/res/drawable-hdpi-v4/key_small.png b/res/drawable-hdpi/key_small.png
index 6966048a1..6966048a1 100644
--- a/res/drawable-hdpi-v4/key_small.png
+++ b/res/drawable-hdpi/key_small.png
diff --git a/res/drawable-hdpi-v4/overlay_error.png b/res/drawable-hdpi/overlay_error.png
index e6d7e60ba..e6d7e60ba 100644
--- a/res/drawable-hdpi-v4/overlay_error.png
+++ b/res/drawable-hdpi/overlay_error.png
diff --git a/res/drawable-hdpi-v4/overlay_ok.png b/res/drawable-hdpi/overlay_ok.png
index 0672f869d..0672f869d 100644
--- a/res/drawable-hdpi-v4/overlay_ok.png
+++ b/res/drawable-hdpi/overlay_ok.png
diff --git a/res/drawable-hdpi-v4/signed.png b/res/drawable-hdpi/signed.png
index ab9495e7b..ab9495e7b 100644
--- a/res/drawable-hdpi-v4/signed.png
+++ b/res/drawable-hdpi/signed.png
diff --git a/res/drawable-hdpi-v4/signed_large.png b/res/drawable-hdpi/signed_large.png
index c209f4167..c209f4167 100644
--- a/res/drawable-hdpi-v4/signed_large.png
+++ b/res/drawable-hdpi/signed_large.png
diff --git a/res/drawable-hdpi-v4/signed_small.png b/res/drawable-hdpi/signed_small.png
index 54c4906e8..54c4906e8 100644
--- a/res/drawable-hdpi-v4/signed_small.png
+++ b/res/drawable-hdpi/signed_small.png
diff --git a/res/drawable-ldpi-v4/icon.png b/res/drawable-ldpi-v4/icon.png
deleted file mode 100644
index e310c42e8..000000000
--- a/res/drawable-ldpi-v4/icon.png
+++ /dev/null
diff --git a/res/drawable-ldpi-v4/encrypted.png b/res/drawable-ldpi/encrypted.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/res/drawable-ldpi-v4/encrypted.png
+++ b/res/drawable-ldpi/encrypted.png
diff --git a/res/drawable-ldpi-v4/encrypted_large.png b/res/drawable-ldpi/encrypted_large.png
index 34c3d3f97..34c3d3f97 100644
--- a/res/drawable-ldpi-v4/encrypted_large.png
+++ b/res/drawable-ldpi/encrypted_large.png
diff --git a/res/drawable-ldpi-v4/encrypted_small.png b/res/drawable-ldpi/encrypted_small.png
index 5e7294a4b..5e7294a4b 100644
--- a/res/drawable-ldpi-v4/encrypted_small.png
+++ b/res/drawable-ldpi/encrypted_small.png
diff --git a/res/drawable-ldpi-v4/ic_next.png b/res/drawable-ldpi/ic_next.png
index 474ed8faa..474ed8faa 100644
--- a/res/drawable-ldpi-v4/ic_next.png
+++ b/res/drawable-ldpi/ic_next.png
diff --git a/res/drawable-ldpi-v4/ic_previous.png b/res/drawable-ldpi/ic_previous.png
index 6fd885e6b..6fd885e6b 100644
--- a/res/drawable-ldpi-v4/ic_previous.png
+++ b/res/drawable-ldpi/ic_previous.png
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
new file mode 100644
index 000000000..5b9c33f0c
--- /dev/null
+++ b/res/drawable-ldpi/icon.png
diff --git a/res/drawable-ldpi-v4/key.png b/res/drawable-ldpi/key.png
index c806b6041..c806b6041 100644
--- a/res/drawable-ldpi-v4/key.png
+++ b/res/drawable-ldpi/key.png
diff --git a/res/drawable-ldpi-v4/key_large.png b/res/drawable-ldpi/key_large.png
index aa499a5e1..aa499a5e1 100644
--- a/res/drawable-ldpi-v4/key_large.png
+++ b/res/drawable-ldpi/key_large.png
diff --git a/res/drawable-ldpi-v4/key_small.png b/res/drawable-ldpi/key_small.png
index 073b95029..073b95029 100644
--- a/res/drawable-ldpi-v4/key_small.png
+++ b/res/drawable-ldpi/key_small.png
diff --git a/res/drawable-ldpi-v4/overlay_error.png b/res/drawable-ldpi/overlay_error.png
index e5a88e18f..e5a88e18f 100644
--- a/res/drawable-ldpi-v4/overlay_error.png
+++ b/res/drawable-ldpi/overlay_error.png
diff --git a/res/drawable-ldpi-v4/overlay_ok.png b/res/drawable-ldpi/overlay_ok.png
index 63374d47f..63374d47f 100644
--- a/res/drawable-ldpi-v4/overlay_ok.png
+++ b/res/drawable-ldpi/overlay_ok.png
diff --git a/res/drawable-ldpi-v4/signed.png b/res/drawable-ldpi/signed.png
index 4202c3f97..4202c3f97 100644
--- a/res/drawable-ldpi-v4/signed.png
+++ b/res/drawable-ldpi/signed.png
diff --git a/res/drawable-ldpi-v4/signed_large.png b/res/drawable-ldpi/signed_large.png
index d2917644c..d2917644c 100644
--- a/res/drawable-ldpi-v4/signed_large.png
+++ b/res/drawable-ldpi/signed_large.png
diff --git a/res/drawable-ldpi-v4/signed_small.png b/res/drawable-ldpi/signed_small.png
index 19d45f8da..19d45f8da 100644
--- a/res/drawable-ldpi-v4/signed_small.png
+++ b/res/drawable-ldpi/signed_small.png
diff --git a/res/drawable-mdpi-finger-v4/btn_circle_disable.png b/res/drawable-mdpi-finger/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/res/drawable-mdpi-finger-v4/btn_circle_disable.png
+++ b/res/drawable-mdpi-finger/btn_circle_disable.png
diff --git a/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png b/res/drawable-mdpi-finger/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png
+++ b/res/drawable-mdpi-finger/btn_circle_disable_focused.png
diff --git a/res/drawable-mdpi-finger-v4/btn_circle_normal.png b/res/drawable-mdpi-finger/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/res/drawable-mdpi-finger-v4/btn_circle_normal.png
+++ b/res/drawable-mdpi-finger/btn_circle_normal.png
diff --git a/res/drawable-mdpi-finger-v4/btn_circle_pressed.png b/res/drawable-mdpi-finger/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/res/drawable-mdpi-finger-v4/btn_circle_pressed.png
+++ b/res/drawable-mdpi-finger/btn_circle_pressed.png
diff --git a/res/drawable-mdpi-finger-v4/btn_circle_selected.png b/res/drawable-mdpi-finger/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/res/drawable-mdpi-finger-v4/btn_circle_selected.png
+++ b/res/drawable-mdpi-finger/btn_circle_selected.png
diff --git a/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png b/res/drawable-mdpi-finger/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png
+++ b/res/drawable-mdpi-finger/ic_btn_round_minus.png
diff --git a/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png b/res/drawable-mdpi-finger/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png
+++ b/res/drawable-mdpi-finger/ic_btn_round_plus.png
diff --git a/res/drawable-mdpi-v4/icon.png b/res/drawable-mdpi-v4/icon.png
deleted file mode 100644
index 3c165f9bd..000000000
--- a/res/drawable-mdpi-v4/icon.png
+++ /dev/null
diff --git a/res/drawable-mdpi-v4/encrypted.png b/res/drawable-mdpi/encrypted.png
index 34c3d3f97..34c3d3f97 100644
--- a/res/drawable-mdpi-v4/encrypted.png
+++ b/res/drawable-mdpi/encrypted.png
diff --git a/res/drawable-mdpi-v4/encrypted_large.png b/res/drawable-mdpi/encrypted_large.png
index 541781cd1..541781cd1 100644
--- a/res/drawable-mdpi-v4/encrypted_large.png
+++ b/res/drawable-mdpi/encrypted_large.png
diff --git a/res/drawable-mdpi-v4/encrypted_small.png b/res/drawable-mdpi/encrypted_small.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/res/drawable-mdpi-v4/encrypted_small.png
+++ b/res/drawable-mdpi/encrypted_small.png
diff --git a/res/drawable-mdpi-v4/ic_next.png b/res/drawable-mdpi/ic_next.png
index 8271c1380..8271c1380 100644
--- a/res/drawable-mdpi-v4/ic_next.png
+++ b/res/drawable-mdpi/ic_next.png
diff --git a/res/drawable-mdpi-v4/ic_previous.png b/res/drawable-mdpi/ic_previous.png
index ef90db972..ef90db972 100644
--- a/res/drawable-mdpi-v4/ic_previous.png
+++ b/res/drawable-mdpi/ic_previous.png
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
new file mode 100644
index 000000000..fec2d62ce
--- /dev/null
+++ b/res/drawable-mdpi/icon.png
diff --git a/res/drawable-mdpi-v4/key.png b/res/drawable-mdpi/key.png
index aa499a5e1..aa499a5e1 100644
--- a/res/drawable-mdpi-v4/key.png
+++ b/res/drawable-mdpi/key.png
diff --git a/res/drawable-mdpi-v4/key_large.png b/res/drawable-mdpi/key_large.png
index af4742ec0..af4742ec0 100644
--- a/res/drawable-mdpi-v4/key_large.png
+++ b/res/drawable-mdpi/key_large.png
diff --git a/res/drawable-mdpi-v4/key_small.png b/res/drawable-mdpi/key_small.png
index c806b6041..c806b6041 100644
--- a/res/drawable-mdpi-v4/key_small.png
+++ b/res/drawable-mdpi/key_small.png
diff --git a/res/drawable-mdpi-v4/overlay_error.png b/res/drawable-mdpi/overlay_error.png
index 5fe017433..5fe017433 100644
--- a/res/drawable-mdpi-v4/overlay_error.png
+++ b/res/drawable-mdpi/overlay_error.png
diff --git a/res/drawable-mdpi-v4/overlay_ok.png b/res/drawable-mdpi/overlay_ok.png
index b4f332260..b4f332260 100644
--- a/res/drawable-mdpi-v4/overlay_ok.png
+++ b/res/drawable-mdpi/overlay_ok.png
diff --git a/res/drawable-mdpi-v4/signed.png b/res/drawable-mdpi/signed.png
index d2917644c..d2917644c 100644
--- a/res/drawable-mdpi-v4/signed.png
+++ b/res/drawable-mdpi/signed.png
diff --git a/res/drawable-mdpi-v4/signed_large.png b/res/drawable-mdpi/signed_large.png
index ab9495e7b..ab9495e7b 100644
--- a/res/drawable-mdpi-v4/signed_large.png
+++ b/res/drawable-mdpi/signed_large.png
diff --git a/res/drawable-mdpi-v4/signed_small.png b/res/drawable-mdpi/signed_small.png
index 4202c3f97..4202c3f97 100644
--- a/res/drawable-mdpi-v4/signed_small.png
+++ b/res/drawable-mdpi/signed_small.png
diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..ffeb8cdf3
--- /dev/null
+++ b/res/drawable-xhdpi/icon.png
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
deleted file mode 100644
index b4e4db40e..000000000
--- a/res/drawable/icon.png
+++ /dev/null
diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
new file mode 100644
index 000000000..0388f5c06
--- /dev/null
+++ b/res/layout/about_activity.xml
@@ -0,0 +1,97 @@
+<?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:paddingBottom="15dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        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:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/about_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@android:style/TextAppearance.Small" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:autoLink="web"
+            android:text="@string/about_url"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/about_description"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/about_license"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+<!--         <TextView -->
+<!--             android:layout_width="wrap_content" -->
+<!--             android:layout_height="wrap_content" -->
+<!--             android:layout_marginTop="8dp" -->
+<!--             android:text="@string/about_developer" -->
+<!--             android:textAppearance="@android:style/TextAppearance.Small" /> -->
+
+<!--         <TextView -->
+<!--             android:layout_width="wrap_content" -->
+<!--             android:layout_height="wrap_content" -->
+<!--             android:layout_marginTop="8dp" -->
+<!--             android:text="@string/about_icons" -->
+<!--             android:textAppearance="@android:style/TextAppearance.Small" /> -->
+
+<!--         <TextView -->
+<!--             android:layout_width="wrap_content" -->
+<!--             android:layout_height="wrap_content" -->
+<!--             android:layout_marginTop="8dp" -->
+<!--             android:text="@string/about_libs" -->
+<!--             android:textAppearance="@android:style/TextAppearance.Small" /> -->
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/values/static_strings.xml b/res/values/static_strings.xml
index 41adbfad7..c8a6a5026 100644
--- a/res/values/static_strings.xml
+++ b/res/values/static_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">APG Plus</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/res/values/strings.xml b/res/values/strings.xml
index 2e6386182..455b97717 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -46,7 +46,8 @@
     <string name="title_unknownSignatureKey">Unknown Signature Key</string>
     <string name="title_importFromQRCode">Import from QR Code</string>
     <string name="title_signKey">Sign Key</string>
-
+    <string name="title_about">About</string>
+    
     <!-- section_lowerCase: capitalized words, no punctuation -->
     <string name="section_userIds">User IDs</string>
     <string name="section_keys">Keys</string>
@@ -314,7 +315,13 @@
     <string name="fast">fast</string>
     <string name="slow">slow</string>
     <string name="very_slow">very slow</string>
-
+    
+    <!-- about -->
+   <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: ...</string>
+    
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
     <string name="text_help">Install K-9 Mail for the best integration, it supports APG for PGP/INLINE and lets you directly encrypt/decrypt emails.