X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2FAndroidManifest.xml;h=e0ec014df3366e066d981d1d19de61e214290cb2;hb=a270c99c5a5675b7e0071d843915103088ff88ad;hp=1976321e2b867ba2b28ada0cf15a59bbbcb35a8b;hpb=e2971abf4449cc5552a7c2aebab07c81522b03b8;p=zxing.git

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1976321e..e0ec014d 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,16 +20,22 @@ 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="3.01"
-          android:versionCode="39">
-  <!-- We require Cupcake (Android 1.5) or later. -->
-  <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"/>
+          android:versionName="3.4 beta 2"
+          android:versionCode="56"
+          android:installLocation="auto">
+  <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
+  <uses-sdk android:minSdkVersion="3"
+            android:targetSdkVersion="4"/>
+  <!-- Donut-specific flags which allow us to run on any dpi screens. -->
+  <supports-screens android:largeScreens="true"
+                    android:normalScreens="true"
+                    android:smallScreens="true"
+                    android:anyDensity="true"/>
+  <!-- For Donut and above we must specify that we use the camera, but intentionally omit the
+  autofocus feature in order for the app to appear in Market for non-AF devices. While it's true
+  that 1D barcodes will not be scannable, QR Codes will work. Ideally we'd show users a message
+  to this effect on first launch. -->
+  <uses-feature android:name="android.hardware.camera"/>
   <application android:icon="@drawable/launcher_icon"
                android:label="@string/app_name">
     <activity android:name=".CaptureActivity"
@@ -90,6 +96,11 @@ versionName is 2.31, 2.4, or 3.0. -->
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </activity>
+    <activity android:name=".wifi.WifiActivity"
+              android:label="@string/wa_name"
+              android:screenOrientation="landscape"
+              android:configChanges="orientation|keyboardHidden">
+    </activity>
     <activity android:name=".share.ShareActivity"
               android:label="@string/share_name"
               android:screenOrientation="user">
@@ -105,6 +116,13 @@ versionName is 2.31, 2.4, or 3.0. -->
         <category android:name="android.intent.category.DEFAULT"/>
       </intent-filter>
     </activity>
+    <activity android:name=".share.AppPickerActivity"
+              android:label="@string/app_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>
@@ -119,4 +137,14 @@ versionName is 2.31, 2.4, or 3.0. -->
   <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"/>
+  <uses-permission android:name="android.permission.FLASHLIGHT"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+  <!-- Wifi related  -->
+  <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+
 </manifest>