aboutsummaryrefslogtreecommitdiff
path: root/build/android/src
diff options
context:
space:
mode:
authorMaksim Gamarnik <MoNTE48@mail.ua>2016-05-14 23:35:56 +1000
committerCraig Robbins <kde.psych@gmail.com>2016-05-14 23:42:36 +1000
commitb906ed4e5902785ab6f15012666e344c98fabe14 (patch)
tree886939eb69edccb0881255fd95ac51ece4b52da0 /build/android/src
parentec15e35ad7effe54d04c0d34ead3bc63d0e311f1 (diff)
downloadminetest-b906ed4e5902785ab6f15012666e344c98fabe14.tar.gz
minetest-b906ed4e5902785ab6f15012666e344c98fabe14.tar.bz2
minetest-b906ed4e5902785ab6f15012666e344c98fabe14.zip
Fix locked hardware buttons on Android
Fixes #2122 Fixes #1454 Addendum (est31) According from its docs in android_native_app_glue.h (from the NDK), the onInputEvent should "Return 1 if you have handled the event, 0 for any default dispatching". Before, we always returned 1, meaning we blocked all hardware keys to be given to the OS. This broke the volume keys and has caused #2122 and #1454. Although it bases on lots of guesswork, it can probably safely be said that CGUIEnvironment::postEventFromUser returns true if the event was handled, and false if not. Therefore, set the status variable depending on what postEventFromUser returned.
Diffstat (limited to 'build/android/src')
-rw-r--r--build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java4
1 files changed, 4 insertions, 0 deletions
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 fc95a8379..3173a71f4 100644
--- a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
+++ b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
@@ -19,6 +19,10 @@ public class MtNativeActivity extends NativeActivity {
public void onDestroy() {
super.onDestroy();
}
+
+ @Override
+ public void onBackPressed() {
+ }
public void copyAssets() {