From 497859ad90ba1f7e89295f4221f546637c3bd17f Mon Sep 17 00:00:00 2001
From: Matthew Garrett
Date: Sun, 22 May 2016 14:07:20 -0700
Subject: ANDROID: Add support for Leanback Launcher on Android TV

Android TV needs some modifications to the manifest and a new icon in order
for apps to appear in the launcher.
---
 backends/platform/android/android.mk               |   1 +
 dists/android/AndroidManifest.xml                  |  16 ++++++++++++++++
 dists/android/AndroidManifest.xml.in               |  16 ++++++++++++++++
 dists/android/res/drawable-xhdpi/leanback_icon.png | Bin 0 -> 25962 bytes
 4 files changed, 33 insertions(+)
 create mode 100644 dists/android/res/drawable-xhdpi/leanback_icon.png

diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index e11ad0724e..68a2a34ae1 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -20,6 +20,7 @@ RESOURCES = \
 	$(PATH_BUILD_RES)/layout/main.xml \
 	$(PATH_BUILD_RES)/drawable/scummvm.png \
 	$(PATH_BUILD_RES)/drawable/scummvm_big.png \
+	$(PATH_BUILD_RES)/drawable-xhdpi/leanback_icon.png \
 	$(PATH_BUILD_RES)/drawable-xhdpi/ouya_icon.png
 
 DIST_ANDROID_MK = $(PATH_DIST)/jni/Android.mk
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index d605d9b3cc..14161668fe 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -15,6 +15,7 @@
 	<application
 			android:label="@string/app_name"
 			android:description="@string/app_desc"
+			android:isGame="true"
 			android:icon="@drawable/scummvm">
 		<activity android:name=".ScummVMActivity"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
@@ -27,6 +28,14 @@
 				<category android:name="tv.ouya.intent.category.GAME"/>
 			</intent-filter>
 		</activity>
+		<activity android:name=".ScummVMActivity"
+			  	android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				android:banner="@drawable/leanback_icon">
+		  <intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+		  </intent-filter>
+		</activity>
 	</application>
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -42,4 +51,11 @@
 
 	<uses-configuration android:reqTouchScreen="stylus"
 			android:reqKeyboardType="qwerty"/>
+
+	<uses-feature android:name="android.hardware.touchscreen"
+		        android:required="false" />
+
+	<uses-feature android:name="android.software.leanback"
+		        android:required="false" />
+
 </manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index d90e282e3d..de2f2d905e 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -15,6 +15,7 @@
 	<application
 			android:label="@string/app_name"
 			android:description="@string/app_desc"
+			android:isGame="true"
 			android:icon="@drawable/scummvm">
 		<activity android:name=".ScummVMActivity"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
@@ -27,6 +28,14 @@
 				<category android:name="tv.ouya.intent.category.GAME"/>
 			</intent-filter>
 		</activity>
+		<activity android:name=".ScummVMActivity"
+				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				android:banner="@drawable/leanback_icon">
+		  <intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+		  </intent-filter>
+		</activity>
 	</application>
 
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -42,4 +51,11 @@
 
 	<uses-configuration android:reqTouchScreen="stylus"
 			android:reqKeyboardType="qwerty"/>
+
+	<uses-feature android:name="android.hardware.touchscreen"
+		        android:required="false" />
+
+	<uses-feature android:name="android.software.leanback"
+		        android:required="false" />
+
 </manifest>
diff --git a/dists/android/res/drawable-xhdpi/leanback_icon.png b/dists/android/res/drawable-xhdpi/leanback_icon.png
new file mode 100644
index 0000000000..28a7196b7f
Binary files /dev/null and b/dists/android/res/drawable-xhdpi/leanback_icon.png differ
-- 
cgit v1.2.3