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.3"
- android:versionCode="6">
+ android:versionName="3.0 alpha2"
+ android:versionCode="33">
+ <!-- Allows this app to run on Cupcake devices. -->
+ <uses-sdk android:minSdkVersion="3"/>
+ <!-- Donut-specific flags which allow us to run on large and high dpi screens. -->
+ <supports-screens
+ android:largeScreens="true"
+ android:normalScreens="true"
+ android:smallScreens="true"
+ android:anyDensity="true"/>
<application android:icon="@drawable/launcher_icon"
android:label="@string/app_name">
<activity android:name=".CaptureActivity"
<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>
+ <!-- We also support a Google Product Search URL. -->
+ <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="www.google.com" android:path="/m/products/scan" />
+ </intent-filter>
+ <!-- And the UK version. -->
+ <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="www.google.co.uk" android:path="/m/products/scan" />
+ </intent-filter>
</activity>
- <activity android:name="PreferencesActivity"
+ <activity android:name=".PreferencesActivity"
android:label="@string/preferences_name">
</activity>
- <activity android:name="EncodeActivity">
+ <activity android:name=".encode.EncodeActivity">
<intent-filter>
<action android:name="com.google.zxing.client.android.ENCODE"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name="SearchBookContentsActivity"
+ <activity android:name=".book.SearchBookContentsActivity"
android:label="@string/sbc_name"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden">
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
- <activity android:name="ShareActivity"
+ <activity android:name=".share.ShareActivity"
android:label="@string/share_name"
android:screenOrientation="user">
<intent-filter>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
+ <activity android:name=".share.BookmarkPickerActivity"
+ android:label="@string/bookmark_picker_name">
+ <intent-filter>
+ <action android:name="android.intent.action.PICK"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
+ <activity android:name=".HelpActivity"
+ android:screenOrientation="user">
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ </activity>
</application>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
<uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.ACCESS_BROWSER_HISTORY_BOOKMARKS"/>
+ <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
</manifest>