cleanup, add SCAN_QR_CODE intent

2012-12-14 19:16:10 +01:00
parent be4e3a10b0
commit a9d80902f4
9 changed files with 41 additions and 26 deletions
--- a/APG/AndroidManifest.xml
+++ b/APG/AndroidManifest.xml
@@ -338,7 +338,13 @@
        <activity
            android:name=".ui.ImportFromQRCodeActivity"
            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_importFromQRCode" />
+            android:label="@string/title_importFromQRCode" >
+            <intent-filter>
+                <action android:name="org.thialfihar.android.apg.intent.SCAN_QR_CODE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
        <activity
            android:name=".ui.HelpActivity"
            android:label="@string/title_help" />