mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Created v2.6 final, and added the ability for web apps to launch Barcode Scanner by linking to http://zxing.appspot.com/scan.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@885 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2009-03-11 19:35:23 +00:00
parent 17f20fbadf
commit 1038cfef62
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/AndroidManifest.xml
View file

@ -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. --> versionName is 2.31, 2.4, or 3.0. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="2.6b1" android:versionName="2.6"
android:versionCode="12"> android:versionCode="13">
<application android:icon="@drawable/launcher_icon" <application android:icon="@drawable/launcher_icon"
android:label="@string/app_name"> android:label="@string/app_name">
<activity android:name=".CaptureActivity" <activity android:name=".CaptureActivity"
@ -41,6 +41,13 @@ versionName is 2.31, 2.4, or 3.0. -->
<action android:name="com.android.barcodes.SCAN"/> <action android:name="com.android.barcodes.SCAN"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </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>
<activity android:name="PreferencesActivity" <activity android:name="PreferencesActivity"
android:label="@string/preferences_name"> android:label="@string/preferences_name">

1
android/assets/html/whatsnew.html
View file

@ -9,6 +9,7 @@
<li>Fixed a bug where some URLs would be misinterpreted as email addresses.</li> <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>Added support for uppercase URIs like TEL: and GEO:.</li>
<li>Prevented Barcode Scanner from crashing when launching an unhandled intent.</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> <li>Added the version to the about box.</li>
</ul> </ul>
</body> </body>