ANDROID: Remove unnecessary additional activity

For an unknown reason, having a second activity for Android TV (Leanback) caused ScummVM to be broken on some Android devices. According to Android documentation, TV can be supported in the same activity as everything else, so merge the two together. Fixes Trac#10024.
scummvm · Nov 23, 2017 · 404657d · 404657d
1 parent 583c7cf
commit 404657d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
@@ -39,22 +39,16 @@
 			android:icon="@drawable/scummvm">
 		<activity android:name=".ScummVMActivity"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				android:banner="@drawable/leanback_icon"
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden|screenSize"
 				android:windowSoftInputMode="adjustResize">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
 				<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>
+			</intent-filter>
 		</activity>
 	</application>
 </manifest>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
@@ -39,22 +39,16 @@
 			android:icon="@drawable/scummvm">
 		<activity android:name=".ScummVMActivity"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				android:banner="@drawable/leanback_icon"
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden|screenSize"
 				android:windowSoftInputMode="adjustResize">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
 				<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>
+			</intent-filter>
 		</activity>
 	</application>
 </manifest>