Android: Cleanup Manifest - remove commented out tags, don't require touchscreen ..

3 files changed, 12 insertions, 10 deletions

diff --git a/make/resources/android/AndroidManifest-Launcher.xml b/make/resources/android/AndroidManifest-Launcher.xml
index 28dc481..1805496 100644
--- a/make/resources/android/AndroidManifest-Launcher.xml
+++ b/make/resources/android/AndroidManifest-Launcher.xml
@@ -3,8 +3,11 @@
       sharedUserId="com.jogamp.Community" 
       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-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.WRITE_EXTERNAL_STORAGE" / --> <!-- required for Android-Trace -->
 
     <uses-sdk android:minSdkVersion="9" />
 
@@ -33,7 +36,6 @@
                   android:description="@string/activity_l_descr"
                   android:exported="true"
                   >
-                  <!-- android:configChanges="keyboardHidden|orientation|screenLayout|screenSize" -->
             <intent-filter>
                 <action android:name="org.jogamp.launcher.action.LAUNCH_ACTIVITY_NORMAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -49,12 +51,6 @@
                   android:exported="true"
                   android:theme="@style/Theme.Transparent"
                   >
-                  <!--
-                  android:configChanges="keyboardHidden|orientation|screenLayout|screenSize" 
-                  android:theme="@style/Theme.Transparent"
-                  android:theme="@android:style/Theme_NoDisplay"
-                  android:theme="@android:style/Theme.Translucent"
-                  -->
             <intent-filter>
                 <action android:name="org.jogamp.launcher.action.LAUNCH_ACTIVITY_TRANSPARENT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -69,7 +65,6 @@
                   android:description="@string/activity_l_descr"
                   android:exported="true"
                   >
-                  <!-- android:configChanges="keyboardHidden|orientation|screenLayout|screenSize" -->
             <intent-filter>
                 <action android:name="org.jogamp.launcher.action.LAUNCH_MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/make/resources/android/AndroidManifest-Runtime.xml b/make/resources/android/AndroidManifest-Runtime.xml
index 7f165f8..dc306b9 100644
--- a/make/resources/android/AndroidManifest-Runtime.xml
+++ b/make/resources/android/AndroidManifest-Runtime.xml
@@ -3,6 +3,9 @@
       sharedUserId="com.jogamp.Community" 
       package="com.jogamp.common">
 
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+
     <uses-sdk android:minSdkVersion="9" />
 
     <application android:icon="@drawable/icon" 
diff --git a/make/resources/android/AndroidManifest-Test.xml b/make/resources/android/AndroidManifest-Test.xml
index 6aec2f4..962eeb9 100644
--- a/make/resources/android/AndroidManifest-Test.xml
+++ b/make/resources/android/AndroidManifest-Test.xml
@@ -3,9 +3,13 @@
       sharedUserId="com.jogamp.Community" 
       package="com.jogamp.gluegen.test">
 
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet -->
+
     <uses-library android:name="com.jogamp.common" android:required="true" />
 
+    <uses-sdk android:minSdkVersion="9" />
+
     <application android:icon="@drawable/icon" 
                  android:label="@string/app_test_name"
                  android:description="@string/app_test_descr"