5 files changed, 117 insertions, 0 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
new file mode 100644
index 0000000000..55e3bf2f38
--- /dev/null
+++ b/dists/android/AndroidManifest.xml
@@ -0,0 +1,58 @@
+<?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"
+      android:installLocation="preferExternal">
+
+  <!-- This version is built against a cupcake (and newer?) ABI.
+       It works on Android 1.5 (SDK 3) and newer.
+    -->
+  <uses-sdk android:minSdkVersion="3"
+	    android:targetSdkVersion="8" />
+
+  <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"/>
+</manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
new file mode 100644
index 0000000000..26a94f957b
--- /dev/null
+++ b/dists/android/AndroidManifest.xml.in
@@ -0,0 +1,58 @@
+<?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@"
+      android:installLocation="preferExternal">
+
+  <!-- This version works on Android 1.5 (SDK 3) and newer, but we
+       want Android 2.2 (SDK 8) defaults and features.
+    -->
+  <uses-sdk android:minSdkVersion="3"
+	    android:targetSdkVersion="8" />
+
+  <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"/>
+</manifest>
diff --git a/dists/android/mkmanifest.pl b/dists/android/mkmanifest.pl
index 00d15f561e..62caa64a55 100644..100755
--- a/dists/android/mkmanifest.pl
+++ b/dists/android/mkmanifest.pl
@@ -105,6 +105,7 @@ sub print_manifest {
 	'package' => "org.inodes.gus.scummvm.plugin.$info->{name}",
 	[ANDROID, 'versionCode'] => $package_versionCode,
 	[ANDROID, 'versionName'] => $package_versionName,
+	[ANDROID, 'installLocation'] => 'preferExternal',
 	);
 
     $writer->startTag(
diff --git a/dists/android/res/drawable/scummvm.png b/dists/android/res/drawable/scummvm.png
new file mode 100644
index 0000000000..d48cf7f6e8
--- /dev/null
+++ b/dists/android/res/drawable/scummvm.png
diff --git a/dists/android/res/drawable/scummvm_big.png b/dists/android/res/drawable/scummvm_big.png
new file mode 100644
index 0000000000..2c7a8c932d
--- /dev/null
+++ b/dists/android/res/drawable/scummvm_big.png