projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On the way to deploy new verison, add favicon
[zxing.git]
/
androidtest
/
AndroidManifest.xml
diff --git
a/androidtest/AndroidManifest.xml
b/androidtest/AndroidManifest.xml
index
8bff0d5
..
1a5175a
100755
(executable)
--- a/
androidtest/AndroidManifest.xml
+++ b/
androidtest/AndroidManifest.xml
@@
-15,13
+15,23
@@
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.12"
+ android:versionCode="4">
+ <!-- We require Cupcake (Android 1.5) or later. -->
<uses-sdk android:minSdkVersion="3"/>
<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"/>
<application android:label="@string/app_name"
android:icon="@drawable/icon"
android:debuggable="true">
<activity android:name="ZXingTestActivity"
<application android:label="@string/app_name"
android:icon="@drawable/icon"
android:debuggable="true">
<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"/>
@@
-31,7
+41,8
@@
android:screenOrientation="landscape">
</activity>
<activity android:name="BenchmarkActivity"
android:screenOrientation="landscape">
</activity>
<activity android:name="BenchmarkActivity"
- android:label="@string/benchmark_name"/>
+ 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>