1. Set up all strings in res/*/strings.xml rather than as string

[zxing.git] / android / AndroidManifest.xml

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 0356432..a59471c 100755 (executable)
--- 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.3 beta 1"
-          android:versionCode="49">
+          android:versionName="3.32 beta 1"
+          android:versionCode="54">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>
@@ -95,6 +95,16 @@ 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">
+<!--Do not broadcast this intent-->
+<!--      <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">
@@ -133,4 +143,11 @@ versionName is 2.31, 2.4, or 3.0. -->
   <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>