Made a new fix to turn off the Samsung Galaxy flash, and cut release 2.91.

[zxing.git] / android / AndroidManifest.xml

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 0d515c6..920bb4b 100755 (executable)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2008 Google Inc.
+ Copyright (C) 2008 ZXing authors
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -14,35 +14,111 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
+
+<!-- versionCode is a monotonically increasing integer. I'm starting it at 6 because v2.3 is the 6th
+version to be published. The next versionCode will be 7, regardless of whether the user-visible
+versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.barcodes">
-    <application android:icon="@drawable/ic_launcher_barcodes"
-              android:label="@string/app_name">
-    <activity android:name=".BarcodesCaptureActivity"
+          package="com.google.zxing.client.android"
+          android:versionName="2.91"
+          android:versionCode="26">
+  <uses-sdk android:minSdkVersion="3"/>
+  <application android:icon="@drawable/launcher_icon"
+               android:label="@string/app_name">
+    <activity android:name=".CaptureActivity"
               android:screenOrientation="landscape"
+              android:configChanges="orientation|keyboardHidden"
               android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN"/>
-            <category android:name="android.intent.category.LAUNCHER"/>
-        </intent-filter>
-        <intent-filter>
-            <action android:name="com.android.barcodes.SCAN"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="com.google.zxing.client.android.SCAN"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+      <intent-filter>
+        <!-- For compatibility only - do not use in new code, this will go away! -->
+        <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="BarcodesPreferenceActivity"
+    <activity android:name="PreferencesActivity"
               android:label="@string/preferences_name">
     </activity>
-    <activity android:name="BarcodesEncodeActivity"
-              android:screenOrientation="portrait">
-        <intent-filter>
-            <action android:name="com.android.barcodes.ENCODE"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
+    <activity android:name="EncodeActivity">
+      <intent-filter>
+        <action android:name="com.google.zxing.client.android.ENCODE"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+      <intent-filter>
+        <!-- For compatibility only - do not use in new code, this will go away! -->
+        <action android:name="com.android.barcodes.ENCODE"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+    <activity android:name="SearchBookContentsActivity"
+              android:label="@string/sbc_name"
+              android:screenOrientation="landscape"
+              android:configChanges="orientation|keyboardHidden">
+      <intent-filter>
+        <action android:name="com.google.zxing.client.android.SEARCH_BOOK_CONTENTS"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+      <intent-filter>
+        <!-- For compatibility only - do not use in new code, this will go away! -->
+        <action android:name="com.android.barcodes.SEARCH_BOOK_CONTENTS"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+    <activity android:name="ShareActivity"
+              android:label="@string/share_name"
+              android:screenOrientation="user">
+      <intent-filter>
+        <action android:name="com.google.zxing.client.android.SHARE"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+    <activity android:name="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"/>
+  </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="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
+  <uses-permission android:name="android.permission.VIBRATE"/>
 </manifest>