fix non-working system buttons

Implement the following behaviour for key and motion events:
if user handler hasn't handled the event, pass it to the default Activity handler.

Bug: 259413138
Test: Build and run AGDK samples
Change-Id: Idfae68b490a0cc4bcd18dbfe2e5c6ed9bc7d179e

1 files changed, 20 insertions, 4 deletions

diff --git a/game-activity/src/main/java/com/google/androidgamesdk/GameActivity.java b/game-activity/src/main/java/com/google/androidgamesdk/GameActivity.java
index 00c28900..c657ee46 100644
--- a/game-activity/src/main/java/com/google/androidgamesdk/GameActivity.java
+++ b/game-activity/src/main/java/com/google/androidgamesdk/GameActivity.java
@@ -88,22 +88,38 @@ public class GameActivity
 
   @Override
   public boolean onTouchEvent(MotionEvent event) {
-    return onTouchEventNative(mNativeHandle, event);
+    if (onTouchEventNative(mNativeHandle, event)) {
+      return true;
+    } else {
+      return super.onTouchEvent(event);
+    }
   }
 
   @Override
   public boolean onGenericMotionEvent(MotionEvent event) {
-    return onTouchEventNative(mNativeHandle, event);
+    if (onTouchEventNative(mNativeHandle, event)) {
+      return true;
+    } else {
+      return super.onGenericMotionEvent(event);
+    }
   }
 
   @Override
   public boolean onKeyUp(final int keyCode, KeyEvent event) {
-    return onKeyUpNative(mNativeHandle, event);
+    if (onKeyUpNative(mNativeHandle, event)) {
+      return true;
+    } else {
+      return super.onKeyUp(keyCode, event);
+    }
   }
 
   @Override
   public boolean onKeyDown(final int keyCode, KeyEvent event) {
-    return onKeyDownNative(mNativeHandle, event);
+    if (onKeyDownNative(mNativeHandle, event)) {
+      return true;
+    } else {
+      return super.onKeyDown(keyCode, event);
+    }
   }
 
   // Called when the IME has changed the input