Add a few files mistakenly left out of initial Android patch :(

svn-id: r49502

2 files changed, 139 insertions, 0 deletions

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
new file mode 100644
index 0000000000..9eb1d995f0
--- /dev/null
+++ b/dists/android/AndroidManifest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>             <!-- -*- xml -*- -->
+<!-- NB: android:versionCode needs to be bumped for formal releases -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.inodes.gus.scummvm"
+      android:versionCode="6" android:versionName="1.2.0svn">
+
+  <!-- This version is built against a cupcake (and newer?) ABI.
+       It works on Android 1.5 (SDK 3) and Android 1.6 (SDK 4).
+       Native libraries changed around in Android 2.0 (SDK 5) so we
+       don't work on that yet.
+    -->
+  <uses-sdk android:minSdkVersion="3"
+	    android:maxSdkVersion="4"
+	    android:targetSdkVersion="4" />
+
+  <application android:name=".ScummVMApplication"
+    android:label="@string/app_name"
+    android:description="@string/app_desc"
+    android:icon="@drawable/scummvm"
+    android:persistent="true">
+    <activity android:name=".ScummVMActivity"
+      android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+      android:screenOrientation="landscape"
+      android:configChanges="orientation|keyboardHidden"
+      android:windowSoftInputMode="adjustResize">
+      <intent-filter>
+	<action android:name="android.intent.action.MAIN" />
+      </intent-filter>
+    </activity>
+    <activity android:name=".Unpacker"
+      android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+      android:screenOrientation="landscape"
+      android:configChanges="orientation|keyboardHidden">
+      <meta-data android:name="org.inodes.gus.unpacker.nextActivity"
+		 android:value="org.inodes.gus.scummvm/.ScummVMActivity" />
+      <intent-filter>
+	<action android:name="android.intent.action.MAIN" />
+	<category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name=".TestActivity"
+	      android:label="AAATestActivity"
+      android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+      android:screenOrientation="landscape"
+      android:configChanges="orientation|keyboardHidden"
+      android:windowSoftInputMode="adjustResize">
+      <intent-filter>
+	<action android:name="android.intent.action.MAIN" />
+	<category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+  <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+	      android:label="@string/scummvm_perm_plugin_label"
+	      android:description="@string/scummvm_perm_plugin_desc"
+	      android:protectionLevel="signature" />
+
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+
+  <!-- Always needs some sort of qwerty keyboard.
+       Can work with a D-pad / trackball -->
+  <uses-configuration android:reqFiveWayNav="true"
+		      android:reqKeyboardType="qwerty"/>
+  <!-- .. or touchscreen -->
+  <uses-configuration android:reqTouchScreen="finger"
+		      android:reqKeyboardType="qwerty"/>
+  <uses-configuration android:reqTouchScreen="stylus"
+		      android:reqKeyboardType="qwerty"/>
+
+  <!-- Can't really be used on a "small" screen, at least until we add
+       zooming support (and even then it won't be great) -->
+  <supports-screens android:smallScreens="false" />
+</manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
new file mode 100644
index 0000000000..a7fd283f01
--- /dev/null
+++ b/dists/android/AndroidManifest.xml.in
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>             <!-- -*- xml -*- -->
+<!-- NB: android:versionCode needs to be bumped for formal releases -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.inodes.gus.scummvm"
+      android:versionCode="6" android:versionName="@VERSION@">
+
+  <!-- This version is built against a cupcake (and newer?) ABI.
+       It works on Android 1.5 (SDK 3) and Android 1.6 (SDK 4).
+       Native libraries changed around in Android 2.0 (SDK 5) so we
+       don't work on that yet.
+    -->
+  <uses-sdk android:minSdkVersion="3"
+	    android:maxSdkVersion="4"
+	    android:targetSdkVersion="4" />
+
+  <application android:name=".ScummVMApplication"
+    android:label="@string/app_name"
+    android:description="@string/app_desc"
+    android:icon="@drawable/scummvm"
+    android:persistent="true">
+    <activity android:name=".ScummVMActivity"
+      android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+      android:screenOrientation="landscape"
+      android:configChanges="orientation|keyboardHidden"
+      android:windowSoftInputMode="adjustResize">
+      <intent-filter>
+	<action android:name="android.intent.action.MAIN" />
+      </intent-filter>
+    </activity>
+    <activity android:name=".Unpacker"
+      android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+      android:screenOrientation="landscape"
+      android:configChanges="orientation|keyboardHidden">
+      <meta-data android:name="org.inodes.gus.unpacker.nextActivity"
+		 android:value="org.inodes.gus.scummvm/.ScummVMActivity" />
+      <intent-filter>
+	<action android:name="android.intent.action.MAIN" />
+	<category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+  <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+	      android:label="@string/scummvm_perm_plugin_label"
+	      android:description="@string/scummvm_perm_plugin_desc"
+	      android:protectionLevel="signature" />
+
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+
+  <!-- Always needs some sort of qwerty keyboard.
+       Can work with a D-pad / trackball -->
+  <uses-configuration android:reqFiveWayNav="true"
+		      android:reqKeyboardType="qwerty"/>
+  <!-- .. or touchscreen -->
+  <uses-configuration android:reqTouchScreen="finger"
+		      android:reqKeyboardType="qwerty"/>
+  <uses-configuration android:reqTouchScreen="stylus"
+		      android:reqKeyboardType="qwerty"/>
+
+  <!-- Can't really be used on a "small" screen, at least until we add
+       zooming support (and even then it won't be great) -->
+  <supports-screens android:smallScreens="false" />
+</manifest>