diff options
| author | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
| commit | 3352601e0860584509adf2b76f993d03893ded4b (patch) | |
| tree | 974fccc8c0eb2f5ad9d4ffd741dfc35869ed67b5 /make/resources/android/AndroidManifest-jogl.xml | |
| parent | f51933f0ebe9ae030c26c066e59a728ce08b8559 (diff) | |
| parent | c67de337a8aaf52e36104c3f13e273aa19d21f1f (diff) | |
Merge branch 'master' into stash_glyphcache
Conflicts:
make/scripts/tests.sh
src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
src/jogl/classes/com/jogamp/graph/curve/Region.java
src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
src/jogl/classes/com/jogamp/graph/font/Font.java
src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
Diffstat (limited to 'make/resources/android/AndroidManifest-jogl.xml')
| -rw-r--r-- | make/resources/android/AndroidManifest-jogl.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml index 1c08cc484..1b6c46356 100644 --- a/make/resources/android/AndroidManifest-jogl.xml +++ b/make/resources/android/AndroidManifest-jogl.xml @@ -4,11 +4,12 @@ package="javax.media.opengl"> <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" /> - <uses-sdk android:minSdkVersion="9" /> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> <application android:icon="@drawable/icon" android:label="@string/app_name" @@ -19,8 +20,8 @@ android:finishOnTaskLaunch="true" android:launchMode="singleTop" android:configChanges="keyboardHidden|orientation" - android:label="@string/activity_v_name" - android:description="@string/activity_v_descr" + android:label="@string/activity_version_name" + android:description="@string/activity_version_descr" > <intent-filter> <action android:name="android.intent.action.MAIN" /> |