From cf396919fc90765aa6ea905a10fcae991c2ec717 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 19 Sep 2017 17:14:30 -0700 Subject: [PATCH] Move 'moveTaskToBack' to Android back button default, make System.exit exit --- lime/_backend/native/NativeApplication.hx | 6 +++++- lime/system/System.hx | 13 ------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/lime/_backend/native/NativeApplication.hx b/lime/_backend/native/NativeApplication.hx index 0311eb05f..fef19a793 100644 --- a/lime/_backend/native/NativeApplication.hx +++ b/lime/_backend/native/NativeApplication.hx @@ -15,6 +15,7 @@ import lime.math.Rectangle; import lime.system.Clipboard; import lime.system.Display; import lime.system.DisplayMode; +import lime.system.JNI; import lime.system.Sensor; import lime.system.SensorType; import lime.system.System; @@ -377,7 +378,10 @@ class NativeApplication { if (keyCode == APP_CONTROL_BACK && modifier == KeyModifier.NONE && type == KEY_UP && !window.onKeyUp.canceled) { - System.exit (0); + var mainActivity = JNI.createStaticField ("org/haxe/extension/Extension", "mainActivity", "Landroid/app/Activity;"); + var moveTaskToBack = JNI.createMemberMethod ("android/app/Activity", "moveTaskToBack", "(Z)Z"); + + moveTaskToBack (mainActivity.get (), true); } diff --git a/lime/system/System.hx b/lime/system/System.hx index 5ec59bda9..641733c51 100644 --- a/lime/system/System.hx +++ b/lime/system/System.hx @@ -163,19 +163,6 @@ class System { public static function exit (code:Int):Void { - #if android - - if (code == 0) { - - var mainActivity = JNI.createStaticField ("org/haxe/extension/Extension", "mainActivity", "Landroid/app/Activity;"); - var moveTaskToBack = JNI.createMemberMethod ("android/app/Activity", "moveTaskToBack", "(Z)Z"); - - moveTaskToBack (mainActivity.get (), true); - - } - - #end - #if (sys && !macro) if (Application.current != null) {