projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the ZXing Test default email address and bumped the version to 1.11.
[zxing.git]
/
androidtest
/
AndroidManifest.xml
diff --git
a/androidtest/AndroidManifest.xml
b/androidtest/AndroidManifest.xml
index
35846c2
..
686816c
100755
(executable)
--- a/
androidtest/AndroidManifest.xml
+++ b/
androidtest/AndroidManifest.xml
@@
-15,11
+15,16
@@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.zxing.client.androidtest">
+ package="com.google.zxing.client.androidtest"
+ android:versionName="1.11"
+ android:versionCode="3">
+ <uses-sdk android:minSdkVersion="3"/>
<application android:label="@string/app_name"
<application android:label="@string/app_name"
- android:icon="@drawable/icon">
+ android:icon="@drawable/icon"
+ android:debuggable="true">
<activity android:name="ZXingTestActivity"
<activity android:name="ZXingTestActivity"
- android:label="@string/app_name">
+ android:label="@string/app_name"
+ android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@
-28,6
+33,9
@@
<activity android:name="CameraTestActivity"
android:screenOrientation="landscape">
</activity>
<activity android:name="CameraTestActivity"
android:screenOrientation="landscape">
</activity>
+ <activity android:name="BenchmarkActivity"
+ android:label="@string/benchmark_name"
+ android:screenOrientation="portrait"/>
</application>
<uses-permission android:name="android.permission.CAMERA"/>
</manifest>
</application>
<uses-permission android:name="android.permission.CAMERA"/>
</manifest>