summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-27 19:23:22 +0200
committerSven Gothel <[email protected]>2013-08-27 19:23:22 +0200
commit32a0435414ef69640fc0816c7b7891535a6aec49 (patch)
tree3486395f65ff17afc23973155946563a7dd71615 /make
parentc7193c39b9cbb69ce089adabe8847537c83371a1 (diff)
AndroidManifests Launcher/Test: Add Camera features and permission
Diffstat (limited to 'make')
-rw-r--r--make/resources/android/AndroidManifest-Launcher.xml4
-rw-r--r--make/resources/android/AndroidManifest-Test.xml3
2 files changed, 5 insertions, 2 deletions
diff --git a/make/resources/android/AndroidManifest-Launcher.xml b/make/resources/android/AndroidManifest-Launcher.xml
index 1805496..fdac860 100644
--- a/make/resources/android/AndroidManifest-Launcher.xml
+++ b/make/resources/android/AndroidManifest-Launcher.xml
@@ -4,10 +4,12 @@
package="jogamp.android.launcher">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
- <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+ <uses-feature android:name="android.hardware.camera" android:required="false" />
+ <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<uses-permission android:name="android.permission.INTERNET" /> <!-- required for NV's PerfHud and I-Net data streaming -->
<!-- uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" / --> <!-- required for Android-Trace -->
+ <uses-permission android:name="android.permission.CAMERA" />
<uses-sdk android:minSdkVersion="9" />
diff --git a/make/resources/android/AndroidManifest-Test.xml b/make/resources/android/AndroidManifest-Test.xml
index 962eeb9..50750ae 100644
--- a/make/resources/android/AndroidManifest-Test.xml
+++ b/make/resources/android/AndroidManifest-Test.xml
@@ -4,7 +4,8 @@
package="com.jogamp.gluegen.test">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
- <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+ <uses-feature android:name="android.hardware.camera" android:required="false" />
+ <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<uses-library android:name="com.jogamp.common" android:required="true" />