From 1a4fcd85c3f67cf201e0b6b94f7f0f82327e6000 Mon Sep 17 00:00:00 2001
From: dswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Wed, 11 Mar 2009 19:35:23 +0000
Subject: [PATCH] Created v2.6 final, and added the ability for web apps to
 launch Barcode Scanner by linking to http://zxing.appspot.com/scan.

git-svn-id: http://zxing.googlecode.com/svn/trunk@885 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/AndroidManifest.xml       | 11 +++++++++--
 android/assets/html/whatsnew.html |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

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">
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 36fcae31..0b39b2f2 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -9,6 +9,7 @@
   <li>Fixed a bug where some URLs would be misinterpreted as email addresses.</li>
   <li>Added support for uppercase URIs like TEL: and GEO:.</li>
   <li>Prevented Barcode Scanner from crashing when launching an unhandled intent.</li>
+  <li>Web apps can now launch Barcode Scanner by creating a hyperlink to <i>http://zxing.appspot.com/scan</i>.</li>
   <li>Added the version to the about box.</li>
 </ul>
 </body>
-- 
2.20.1