aboutsummaryrefslogtreecommitdiff
path: root/dists/android
diff options
context:
space:
mode:
authorColin Snover2017-11-23 13:25:25 -0600
committerColin Snover2017-11-23 14:02:55 -0600
commit404657d80d9e21c31771bdeec9b58317ec3fd938 (patch)
treed8c8f98991400739395b854ce6eaae9b124b917e /dists/android
parent583c7cf622db1a6d168c7498ed0aef8c2162d26c (diff)
downloadscummvm-rg350-404657d80d9e21c31771bdeec9b58317ec3fd938.tar.gz
scummvm-rg350-404657d80d9e21c31771bdeec9b58317ec3fd938.tar.bz2
scummvm-rg350-404657d80d9e21c31771bdeec9b58317ec3fd938.zip
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.
Diffstat (limited to 'dists/android')
-rw-r--r--dists/android/AndroidManifest.xml10
-rw-r--r--dists/android/AndroidManifest.xml.in10
2 files changed, 4 insertions, 16 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index d49cd51695..3201fbee7e 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -39,6 +39,7 @@
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">
@@ -46,15 +47,8 @@
<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
index 957ec121a4..6cd7601f83 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -39,6 +39,7 @@
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">
@@ -46,15 +47,8 @@
<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>