From fe2b85befacc05f448bc828c021d96deab9ea2ed Mon Sep 17 00:00:00 2001
From: Alyssa Milburn <fuzzie@fuzzie.org>
Date: Thu, 3 Nov 2011 13:01:43 +0100
Subject: [PATCH] ANDROID: Target SDK 10, and support more device
 configurations.

This disables the required input configurations, disables the implied
requirement for a landscape display, and explicitly notes that we
support large screens. This makes the Market happy with showing the
package to as many devices as possible (but doesn't help otherwise, so
this is for the branch only).
---
 backends/platform/android/android.mk | 18 +++++++++---------
 dists/android/AndroidManifest.xml    | 15 +++++++++------
 dists/android/AndroidManifest.xml.in | 13 +++++++------
 dists/android/plugin-manifest.xml    |  6 +++---
 dists/android/plugin-manifest.xml.in |  6 +++---
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 2e8fd621526..c4094ce2e5f 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -49,11 +49,11 @@ JAVACFLAGS = -source 1.5 -target 1.5
 
 # This is a bit silly.  I want to compile against the 1.6 android.jar,
 # to make the compiler check that I don't use something that requires
-# a newer Android.  However, in order to use android:installLocation,
-# we need to give aapt a version >=8 android.jar - even though the
+# a newer Android.  However, in order to use android:xlargeScreens,
+# we need to give aapt a version >=10 android.jar - even though the
 # result will work ok on 1.5+.
 ANDROID_JAR = $(ANDROID_SDK)/platforms/android-4/android.jar
-ANDROID_JAR8 = $(ANDROID_SDK)/platforms/android-8/android.jar
+ANDROID_JAR10 = $(ANDROID_SDK)/platforms/android-10/android.jar
 
 PATH_BUILD = build.tmp
 PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
@@ -92,9 +92,9 @@ $(FILE_MANIFEST): $(FILE_MANIFEST_SRC)
 	@$(MKDIR) -p $(@D)
 	sed "s/@ANDROID_VERSIONCODE@/$(ANDROID_VERSIONCODE)/" < $< > $@
 
-$(SRC_GEN): $(FILE_MANIFEST) $(filter %.xml,$(RESOURCES)) $(ANDROID_JAR8)
+$(SRC_GEN): $(FILE_MANIFEST) $(filter %.xml,$(RESOURCES)) $(ANDROID_JAR10)
 	@$(MKDIR) -p $(PATH_GEN_TOP)
-	$(AAPT) package -m -J $(PATH_GEN_TOP) -M $< -S $(PATH_RESOURCES) -I $(ANDROID_JAR8)
+	$(AAPT) package -m -J $(PATH_GEN_TOP) -M $< -S $(PATH_RESOURCES) -I $(ANDROID_JAR10)
 
 $(PATH_CLASSES_MAIN)/%.class: $(PATH_GEN)/%.java $(SRC_GEN)
 	@$(MKDIR) -p $(@D)
@@ -127,13 +127,13 @@ $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png: $(PATH_RESOURCES)/drawable/scum
 	@$(MKDIR) -p $(@D)
 	$(CP) $< $@
 
-$(FILE_RESOURCES_MAIN): $(FILE_MANIFEST) $(RESOURCES) $(ANDROID_JAR8) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA)
+$(FILE_RESOURCES_MAIN): $(FILE_MANIFEST) $(RESOURCES) $(ANDROID_JAR10) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(PATH_BUILD_ASSETS)/
-	$(AAPT) package -f -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR8) -F $@
+	$(AAPT) package -f -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR10) -F $@
 
-$(PATH_BUILD)/%/$(FILE_RESOURCES): $(PATH_BUILD)/%/AndroidManifest.xml $(PATH_STAGE_PREFIX).%/res/values/strings.xml $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png plugins/lib%.so $(ANDROID_JAR8)
-	$(AAPT) package -f -M $< -S $(PATH_STAGE_PREFIX).$*/res -I $(ANDROID_JAR8) -F $@
+$(PATH_BUILD)/%/$(FILE_RESOURCES): $(PATH_BUILD)/%/AndroidManifest.xml $(PATH_STAGE_PREFIX).%/res/values/strings.xml $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png plugins/lib%.so $(ANDROID_JAR10)
+	$(AAPT) package -f -M $< -S $(PATH_STAGE_PREFIX).$*/res -I $(ANDROID_JAR10) -F $@
 
 # Package installer won't delete old libscummvm.so on upgrade so
 # replace it with a zero size file
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 9c0105d767b..d04f9c1afc2 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -9,9 +9,10 @@
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
-			want Android 2.2 (SDK 8) defaults and features. -->
+			want Android 2.3 (SDK 10) defaults and features. -->
 	<uses-sdk android:minSdkVersion="3"
-			android:targetSdkVersion="8"/>
+			android:targetSdkVersion="10"/>
+	<supports-screens android:xlargeScreens="true"/>
 
 	<application android:name=".ScummVMApplication"
 			android:label="@string/app_name"
@@ -47,15 +48,17 @@
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+	<uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
+
 	<!-- Always needs some sort of qwerty keyboard.
 			Can work with a D-pad / trackball -->
-	<uses-configuration android:reqFiveWayNav="true"
-			android:reqKeyboardType="qwerty"/>
+	<!-- <uses-configuration android:reqFiveWayNav="true"
+			android:reqKeyboardType="qwerty"/> -->
 
 	<!-- .. or touchscreen -->
-	<uses-configuration android:reqTouchScreen="finger"
+	<!-- <uses-configuration android:reqTouchScreen="finger"
 			android:reqKeyboardType="qwerty"/>
 
 	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
+			android:reqKeyboardType="qwerty"/> -->
 </manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 8f7887eaf50..1089da9d214 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -9,9 +9,10 @@
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
-			want Android 2.2 (SDK 8) defaults and features. -->
+			want Android 2.3 (SDK 10) defaults and features. -->
 	<uses-sdk android:minSdkVersion="3"
-			android:targetSdkVersion="8"/>
+			android:targetSdkVersion="10"/>
+	<supports-screens android:xlargeScreens="true"/>
 
 	<application android:name=".ScummVMApplication"
 			android:label="@string/app_name"
@@ -49,13 +50,13 @@
 
 	<!-- Always needs some sort of qwerty keyboard.
 			Can work with a D-pad / trackball -->
-	<uses-configuration android:reqFiveWayNav="true"
-			android:reqKeyboardType="qwerty"/>
+	<!-- <uses-configuration android:reqFiveWayNav="true"
+			android:reqKeyboardType="qwerty"/> -->
 
 	<!-- .. or touchscreen -->
-	<uses-configuration android:reqTouchScreen="finger"
+	<!-- <uses-configuration android:reqTouchScreen="finger"
 			android:reqKeyboardType="qwerty"/>
 
 	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
+			android:reqKeyboardType="qwerty"/> -->
 </manifest>
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index 3375bee81fd..cd9674cc026 100644
--- a/dists/android/plugin-manifest.xml
+++ b/dists/android/plugin-manifest.xml
@@ -7,7 +7,7 @@
 		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
+	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="10" />
 
 	<application android:label="@string/app_name"
 			android:description="@string/app_desc"
@@ -24,12 +24,12 @@
 	</application>
 
 	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
-	<uses-configuration android:reqFiveWayNav="true"
+	<!-- <uses-configuration android:reqFiveWayNav="true"
 			android:reqKeyboardType="qwerty"/>
 
 	<uses-configuration android:reqTouchScreen="finger"
 			android:reqKeyboardType="qwerty"/>
 
 	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
+			android:reqKeyboardType="qwerty"/> -->
 </manifest>
diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in
index 4b429097aec..897325d78a4 100644
--- a/dists/android/plugin-manifest.xml.in
+++ b/dists/android/plugin-manifest.xml.in
@@ -7,7 +7,7 @@
 		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
+	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="10" />
 
 	<application android:label="@string/app_name"
 			android:description="@string/app_desc"
@@ -24,12 +24,12 @@
 	</application>
 
 	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
-	<uses-configuration android:reqFiveWayNav="true"
+	<!-- <uses-configuration android:reqFiveWayNav="true"
 			android:reqKeyboardType="qwerty"/>
 
 	<uses-configuration android:reqTouchScreen="finger"
 			android:reqKeyboardType="qwerty"/>
 
 	<uses-configuration android:reqTouchScreen="stylus"
-			android:reqKeyboardType="qwerty"/>
+			android:reqKeyboardType="qwerty"/> -->
 </manifest>