Fixed a bug in geo coordinate display, where we were always tacking on "deg N" and...

[zxing.git] / android / AndroidManifest.xml

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
old mode 100644 (file)
new mode 100755 (executable)
index 89bc0d2..3be7d3a
--- 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,16 +14,88 @@
  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.google.zxing.client.android">
-  <application android:icon="@drawable/icon">
-    <activity android:name="BarcodeReaderCaptureActivity" android:label="@string/app_name">
+          package="com.google.zxing.client.android"
+          android:versionName="2.4"
+          android:versionCode="9">
+  <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.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>
+    </activity>
+    <activity android:name="PreferencesActivity"
+              android:label="@string/preferences_name">
+    </activity>
+    <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 id="android.permission.READ_CONTACTS"/>
-  <uses-permission id="android.permission.WRITE_CONTACTS"/>
-</manifest> 
\ No newline at end of file
+  <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"/>
+</manifest>