new icon and readme

LICENSE

@@ -11,9 +11,8 @@ The following open source projects are used in APG:
 Images:
 
   * icon.svg
-    modified version of GnuPG Logo (not)
+    modified version of kgpg_key2_kopete.svgz
-    http://openclipart.org/detail/15078/gnupg-logo-(not)-by-mrbordello
+    GPL
-    Public Domain
 
   * dashboard_manage_keys.svg, dashboard_my_keys.svg, key.svg
     http://rrze-icon-set.berlios.de/

README.md

@@ -13,7 +13,7 @@ Fork APG+ and do a merge request. I will merge your changes back into the main p
 1. New -> Android Project -> Create project from existing source, choose com_actionbarsherlock 
 2. New -> Android Project -> Create project from existing source, choose org_apg
 3. Add com_actionbarsherlock as Android Lib (Properties of org_apg -> Android -> Library -> add)
-4. Add Java libs (Properties of org_apg -> Java Build Path -> Libraries -> add all libraries from libs folder in org_apg)
+4. Optional (As of Android Tools r17 the libraries are automatically added from the libs folder): Add Java libs (Properties of org_apg -> Java Build Path -> Libraries -> add all libraries from libs folder in org_apg)
 5. Now APG+ can be build
 
 # Build using Ant
@@ -37,7 +37,7 @@ The Libraries are provided in the git repository.
 * ActionBarSherlock to provide an ActionBar for Android < 3.0
 * Spongy Castle as the main Crypto Lib
 * android-support-v4.jar: Compatibility Lib
-* android-integration-supportv4.jar: Barcode Scanner Integration
+* barcodescanner-android-integration-supportv4.jar: Barcode Scanner Integration
 
 # Build XZing Integration Library
 

org_apg/AndroidManifest.xml

@@ -124,7 +124,8 @@
             android:name=".ui.EncryptActivity"
             android:configChanges="keyboardHidden|orientation|keyboard"
             android:label="@string/title_encrypt"
-            android:uiOptions="splitActionBarWhenNarrow" >
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:windowSoftInputMode="stateHidden" >
             <intent-filter>
                 <action android:name="org.apg.intent.ENCRYPT" />
                 <action android:name="org.apg.intent.ENCRYPT_FILE" />
@@ -140,7 +141,8 @@
             android:name=".ui.DecryptActivity"
             android:configChanges="keyboardHidden|orientation|keyboard"
             android:label="@string/title_decrypt"
-            android:uiOptions="splitActionBarWhenNarrow" >
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:windowSoftInputMode="stateHidden" >
             <intent-filter>
                 <action android:name="org.apg.intent.DECRYPT" />
                 <action android:name="org.apg.intent.DECRYPT_FILE" />

org_apg/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="MainActivity" default="help">
+<project name="APG" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into

org_apg_integration_demo/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="BaseActivity" default="help">
+<project name="APG Integration Demo" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into

org_apg_integration_lib/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org_apg_integration_lib" default="help">
+<project name="apg_integration_lib" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into