From f70f7875e2a2e49f80470832ae97e73f171d6460 Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Mon, 3 Dec 2018 00:39:35 +0100
Subject: Update Android java code (#7820)

Targets SDK 26 as required by the playstore.
Fixes screen auto-rotation closing game.
Hides on-screen navigation bar if present.

Update gradlew.
Fix display aspect on 18+/:9 displays (like a Samsung Galaxy S9).
Remove small app icons, not required.
Fix xml in unpacking activity.
Support Android permission: On Android 6.0+ you need to manually give write
permission (as required by google).
Background during unpacking (just a demo for now).
Material Design: no more Android 2 interface.
Immersive mode (Android 4.4+ - hide NavBar for fullscreen mode).
---
 build/android/src/main/AndroidManifest.xml | 67 ++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 21 deletions(-)

(limited to 'build/android/src/main/AndroidManifest.xml')

diff --git a/build/android/src/main/AndroidManifest.xml b/build/android/src/main/AndroidManifest.xml
index df218fb33..7f61cda38 100644
--- a/build/android/src/main/AndroidManifest.xml
+++ b/build/android/src/main/AndroidManifest.xml
@@ -1,34 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="net.minetest.minetest"
-		android:installLocation="auto">
-	<uses-feature android:glEsVersion="0x00010000" android:required="true"/>
+	package="net.minetest.minetest"
+	android:installLocation="auto">
+
+	<uses-feature
+		android:glEsVersion="0x00010000"
+		android:required="true" />
+
 	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<application android:icon="@drawable/irr_icon"
+
+	<application
+		android:allowBackup="true"
+		android:icon="@mipmap/ic_launcher"
+		android:label="${project}"
+		android:resizeableActivity="false">
+
+		<meta-data
+			android:name="android.max_aspect"
+			android:value="2.1" />
+
+		<activity
+			android:name=".MainActivity"
+			android:configChanges="orientation|keyboardHidden|navigation|screenSize"
 			android:label="${project}"
-			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-			android:allowBackup="true">
-		<activity android:name=".MtNativeActivity"
-				android:label="${project}"
-				android:launchMode="singleTask"
-				android:configChanges="orientation|keyboard|keyboardHidden|navigation"
-				android:screenOrientation="sensorLandscape"
-				android:clearTaskOnLaunch="true">
+			android:launchMode="singleTask"
+			android:screenOrientation="sensorLandscape"
+			android:theme="@style/AppTheme">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
-			<meta-data android:name="android.app.lib_name" android:value="minetest" />
 		</activity>
-		<activity android:name=".MinetestTextEntry"
-				android:theme="@style/Theme.Transparent"
-				android:excludeFromRecents="true">
-		</activity>
-		<activity android:name=".MinetestAssetCopy"
-				android:theme="@style/Theme.Transparent"
-				android:excludeFromRecents="true">
+		<activity
+			android:name=".MtNativeActivity"
+			android:configChanges="orientation|keyboard|keyboardHidden|navigation|screenSize|smallestScreenSize"
+			android:hardwareAccelerated="true"
+			android:launchMode="singleTask"
+			android:screenOrientation="sensorLandscape"
+			android:theme="@style/AppTheme">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+			</intent-filter>
+			<meta-data
+				android:name="android.app.lib_name"
+				android:value="minetest" />
 		</activity>
+		<activity
+			android:name=".MinetestTextEntry"
+			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:theme="@style/Theme.Dialog"
+			android:windowSoftInputMode="stateAlwaysHidden"/>
+		<activity
+			android:name=".MinetestAssetCopy"
+			android:screenOrientation="sensorLandscape"
+			android:theme="@style/AppTheme"/>
 	</application>
 </manifest>
-- 
cgit v1.2.3