Android: build fixes & compat fixes

[oweals/minetest.git] / build / android / src / main / java / net.minetest.minetest / MtNativeActivity.java

diff --git a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
index 3173a71f4bbf6290e38f3987c614a294ea303a96..f49d078fe5c1025d80301c3b247a5cbb7307c166 100644 (file)
--- a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
+++ b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
@@ -2,28 +2,53 @@ package net.minetest.minetest;
 
 import android.app.NativeActivity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
+import android.view.View;
 import android.view.WindowManager;
 
 public class MtNativeActivity extends NativeActivity {
+
+       static {
+               System.loadLibrary("c++_shared");
+               System.loadLibrary("openal");
+               System.loadLibrary("ogg");
+               System.loadLibrary("vorbis");
+               System.loadLibrary("iconv");
+               System.loadLibrary("minetest");
+       }
+
+       private int m_MessagReturnCode;
+       private String m_MessageReturnValue;
+
+       public static native void putMessageBoxResult(String text);
+
        @Override
        public void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
+               getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
                m_MessagReturnCode = -1;
                m_MessageReturnValue = "";
-
        }
 
        @Override
-       public void onDestroy() {
-               super.onDestroy();
+       protected void onResume() {
+               super.onResume();
+               makeFullScreen();
        }
-       
-       @Override
-       public void onBackPressed() {
+
+       private void makeFullScreen() {
+               if (Build.VERSION.SDK_INT >= 19)
+                       this.getWindow().getDecorView().setSystemUiVisibility(
+                                       View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
        }
 
+       @Override
+       public void onWindowFocusChanged(boolean hasFocus) {
+               super.onWindowFocusChanged(hasFocus);
+               if (hasFocus)
+                       makeFullScreen();
+       }
 
        public void copyAssets() {
                Intent intent = new Intent(this, MinetestAssetCopy.class);
@@ -31,7 +56,7 @@ public class MtNativeActivity extends NativeActivity {
        }
 
        public void showDialog(String acceptButton, String hint, String current,
-                       int editType) {
+                                                  int editType) {
 
                Intent intent = new Intent(this, MinetestTextEntry.class);
                Bundle params = new Bundle();
@@ -42,11 +67,9 @@ public class MtNativeActivity extends NativeActivity {
                intent.putExtras(params);
                startActivityForResult(intent, 101);
                m_MessageReturnValue = "";
-               m_MessagReturnCode   = -1;
+               m_MessagReturnCode = -1;
        }
 
-       public static native void putMessageBoxResult(String text);
-
        /* ugly code to workaround putMessageBoxResult not beeing found */
        public int getDialogState() {
                return m_MessagReturnCode;
@@ -71,34 +94,15 @@ public class MtNativeActivity extends NativeActivity {
 
        @Override
        protected void onActivityResult(int requestCode, int resultCode,
-                       Intent data) {
+                                                                       Intent data) {
                if (requestCode == 101) {
                        if (resultCode == RESULT_OK) {
                                String text = data.getStringExtra("text");
                                m_MessagReturnCode = 0;
                                m_MessageReturnValue = text;
-                       }
-                       else {
+                       } else {
                                m_MessagReturnCode = 1;
                        }
                }
        }
-
-       static {
-               System.loadLibrary("openal");
-               System.loadLibrary("ogg");
-               System.loadLibrary("vorbis");
-               System.loadLibrary("ssl");
-               System.loadLibrary("crypto");
-               System.loadLibrary("gmp");
-               System.loadLibrary("iconv");
-
-               // We don't have to load libminetest.so ourselves,
-               // but if we do, we get nicer logcat errors when
-               // loading fails.
-               System.loadLibrary("minetest");
-       }
-
-       private int m_MessagReturnCode;
-       private String m_MessageReturnValue;
 }