X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2FAndroidManifest.xml;h=18449af2f4269b817948b8b1538dd9a0852263e8;hb=1a4fcd85c3f67cf201e0b6b94f7f0f82327e6000;hp=39e985c03512f0fb5d8fbe48c2b505edb66137fc;hpb=a32f3ff2e59d643f06922346603a10113a9f6802;p=zxing.git

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 39e985c0..18449af2 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="2.6b1"
-          android:versionCode="12">
+          android:versionName="2.6"
+          android:versionCode="13">
   <application android:icon="@drawable/launcher_icon"
                android:label="@string/app_name">
     <activity android:name=".CaptureActivity"
@@ -41,6 +41,13 @@ versionName is 2.31, 2.4, or 3.0. -->
         <action android:name="com.android.barcodes.SCAN"/>
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
+      <!-- Allow web apps to launch Barcode Scanner by linking to http://zxing.appspot.com/scan. -->
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="http" android:host="zxing.appspot.com" android:path="/scan" />
+      </intent-filter>
     </activity>
     <activity android:name="PreferencesActivity"
               android:label="@string/preferences_name">