X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2FAndroidManifest.xml;h=2c28e2cd314c683d1813e47881c5cba3308e1088;hb=6cd49fe778ca42ddbf0ae497dc207b0e08f0b4b8;hp=21e640fb3c36bc21abd2b9a87843332522b805f2;hpb=fdb26928e772c6664e1c8be807851c31a8340e55;p=zxing.git

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 21e640fb..2c28e2cd 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -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. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.22"
-          android:versionCode="48">
+          android:versionName="3.31"
+          android:versionCode="53">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>
@@ -95,6 +95,15 @@ 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">
+      <intent-filter>
+        <action android:name="com.google.zxing.client.android.WIFI_CONNECT"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
     <activity android:name=".share.ShareActivity"
               android:label="@string/share_name"
               android:screenOrientation="user">
@@ -132,4 +141,12 @@ versionName is 2.31, 2.4, or 3.0. -->
   <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>
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+
 </manifest>