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 2c28e2c..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.31"
-          android:versionCode="53">
+          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"/>
@@ -99,10 +99,11 @@ versionName is 2.31, 2.4, or 3.0. -->
               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>
+<!--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"