From 621afa83ca859c29efcf57beef5b21c918161e78 Mon Sep 17 00:00:00 2001
From: Michael Pavone <pavone@retrodev.com>
Date: Sun, 22 Nov 2015 14:43:51 -0800
Subject: Use immersive fullscreen when available. Updated manifest to
 theoretically support Android TV.

---
 Android.mk                                            |  2 +-
 android/AndroidManifest.xml                           | 19 +++++++++++++++----
 android/jni/Android.mk                                |  1 +
 android/project.properties                            |  2 +-
 android/src/com/retrodev/blastem/BlastEmActivity.java | 16 ++++++++++++++++
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index e0b2343..aa0f606 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	68kinst.c debug.c gst.c psg.c z80_to_x86.c backend.c io.c render_sdl.c \
 	tern.c backend_x86.c gdb_remote.c m68k_core.c romdb.c m68k_core_x86.c \
 	util.c wave.c blastem.c gen.c mem.c vdp.c ym2612.c config.c gen_x86.c \
-	terminal.c z80inst.c menu.c
+	terminal.c z80inst.c menu.c arena.c
 
 LOCAL_SHARED_LIBRARIES := SDL2
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4453401..ac123c7 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -19,9 +19,12 @@
     -->
     <application android:label="@string/app_name"
                  android:icon="@drawable/ic_launcher"
+				 android:banner="@drawable/ic_launcher"
                  android:allowBackup="true"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                 android:hardwareAccelerated="true" >
+                 android:hardwareAccelerated="true"
+				 android:isGame="true"
+				 android:debuggable="true">
         <activity android:name="BlastEmActivity"
                   android:label="@string/app_name"
                   android:configChanges="keyboardHidden|orientation"
@@ -29,16 +32,24 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+			<intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
     <!-- Android 4.1.1 -->
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
 
     <!-- OpenGL ES 2.0 -->
-    <uses-feature android:glEsVersion="0x00020000" /> 
+    <uses-feature android:glEsVersion="0x00020000" />
+	
+	<uses-feature android:name="android.hardware.gamepad" android:required="false" />
+	<uses-feature android:name="android.software.leanback" android:required="false" />
+	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
     <!-- Allow writing to external storage -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> 
 </manifest> 
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 5053e7d..8e68f8d 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -1 +1,2 @@
+APP_ABI=x86
 include $(call all-subdir-makefiles)
diff --git a/android/project.properties b/android/project.properties
index 9b84a6b..916037e 100644
--- a/android/project.properties
+++ b/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-23
diff --git a/android/src/com/retrodev/blastem/BlastEmActivity.java b/android/src/com/retrodev/blastem/BlastEmActivity.java
index 22a2bba..441e94a 100644
--- a/android/src/com/retrodev/blastem/BlastEmActivity.java
+++ b/android/src/com/retrodev/blastem/BlastEmActivity.java
@@ -1,6 +1,22 @@
 package com.retrodev.blastem;
 import org.libsdl.app.SDLActivity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+
 
 public class BlastEmActivity extends SDLActivity
 {
+	@Override
+    protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		//set immersive mode on devices that support it
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			View blah = mSurface;
+			blah.setSystemUiVisibility(
+				View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+			);
+		}
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3