Merge cherrypicks of ['android-review.googlesource.com/2994194', 'android-review.googlesource.com/3001316'] into android-games-sdk-game-activity-release.

Change-Id: I1b513715888ccc40a3211557cd098e39fd66934e

4 files changed, 36 insertions, 7 deletions

diff --git a/VERSIONS b/VERSIONS
index e38a2a84..f6fe9afe 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -9,7 +9,7 @@ AGDK            NA                      NA                      2022.1.1 alpha01
 swappy          games-frame-pacing      games-frame-pacing      2.2.0    alpha01
 tuningfork      games-performance-tuner games-performance-tuner 2.0.0    beta01
 oboe            oboe                    None                    1.0.1    alpha01
-game_activity   games-activity          game-activity           3.0.0
-game_text_input games-text-input        game-text-input         3.0.0
+game_activity   games-activity          game-activity           3.0.1
+game_text_input games-text-input        game-text-input         3.0.1
 paddleboat      games-controller        games-controller        2.1.0    alpha01
 memory_advice   games-memory-advice     games-memory-advice     2.1.0    beta01
diff --git a/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h b/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
index d357eb9f..e8b7c7f8 100644
--- a/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
+++ b/game-activity/prefab-src/modules/game-activity/include/game-activity/GameActivity.h
@@ -46,7 +46,7 @@ extern "C" {
 
 #define GAMEACTIVITY_MAJOR_VERSION 3
 #define GAMEACTIVITY_MINOR_VERSION 0
-#define GAMEACTIVITY_BUGFIX_VERSION 0
+#define GAMEACTIVITY_BUGFIX_VERSION 1
 #define GAMEACTIVITY_PACKED_VERSION                            \
     ANDROID_GAMESDK_PACKED_VERSION(GAMEACTIVITY_MAJOR_VERSION, \
                                    GAMEACTIVITY_MINOR_VERSION, \
diff --git a/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h b/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
index 243bf4cc..1b0483a2 100644
--- a/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
+++ b/game-text-input/prefab-src/modules/game-text-input/include/game-text-input/gametextinput.h
@@ -35,7 +35,7 @@ extern "C" {
 
 #define GAMETEXTINPUT_MAJOR_VERSION 3
 #define GAMETEXTINPUT_MINOR_VERSION 0
-#define GAMETEXTINPUT_BUGFIX_VERSION 0
+#define GAMETEXTINPUT_BUGFIX_VERSION 1
 #define GAMETEXTINPUT_PACKED_VERSION                            \
     ANDROID_GAMESDK_PACKED_VERSION(GAMETEXTINPUT_MAJOR_VERSION, \
                                    GAMETEXTINPUT_MINOR_VERSION, \
diff --git a/game-text-input/src/main/java/com/google/androidgamesdk/gametextinput/InputConnection.java b/game-text-input/src/main/java/com/google/androidgamesdk/gametextinput/InputConnection.java
index 273b201f..469897bf 100644
--- a/game-text-input/src/main/java/com/google/androidgamesdk/gametextinput/InputConnection.java
+++ b/game-text-input/src/main/java/com/google/androidgamesdk/gametextinput/InputConnection.java
@@ -57,10 +57,39 @@ public class InputConnection
       KeyEvent.KEYCODE_BUTTON_THUMBR, KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_START,
       KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.KEYCODE_MEDIA_RECORD, KeyEvent.KEYCODE_BUTTON_Z,
       KeyEvent.KEYCODE_BUTTON_C,
+
       // End of common game controller button keycodes
-      KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_FORWARD_DEL,
+      KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_FORWARD_DEL, KeyEvent.KEYCODE_CTRL_RIGHT,
       KeyEvent.KEYCODE_SHIFT_LEFT, KeyEvent.KEYCODE_SHIFT_RIGHT, KeyEvent.KEYCODE_BACK,
-      KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE};
+      KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE,
+      KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.KEYCODE_ALT_RIGHT, KeyEvent.KEYCODE_CTRL_LEFT,
+      KeyEvent.KEYCODE_F1, KeyEvent.KEYCODE_F10, KeyEvent.KEYCODE_F11, KeyEvent.KEYCODE_F12,
+      KeyEvent.KEYCODE_F2, KeyEvent.KEYCODE_F3, KeyEvent.KEYCODE_F4, KeyEvent.KEYCODE_F5,
+      KeyEvent.KEYCODE_F6, KeyEvent.KEYCODE_F7, KeyEvent.KEYCODE_F8, KeyEvent.KEYCODE_F9,
+      KeyEvent.KEYCODE_INSERT, KeyEvent.KEYCODE_MOVE_HOME, KeyEvent.KEYCODE_MOVE_END,
+      KeyEvent.KEYCODE_PAGE_UP, KeyEvent.KEYCODE_PAGE_DOWN, KeyEvent.KEYCODE_UNKNOWN,
+      KeyEvent.KEYCODE_SEARCH,
+
+      // all media keys
+      KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,
+      KeyEvent.KEYCODE_MEDIA_STOP,
+      KeyEvent.KEYCODE_MEDIA_NEXT,
+      KeyEvent.KEYCODE_MEDIA_PREVIOUS,
+      KeyEvent.KEYCODE_MEDIA_REWIND,
+      KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,
+      KeyEvent.KEYCODE_MEDIA_PLAY,
+      KeyEvent.KEYCODE_MEDIA_PAUSE,
+      KeyEvent.KEYCODE_MEDIA_CLOSE,
+      KeyEvent.KEYCODE_MEDIA_EJECT,
+      KeyEvent.KEYCODE_MEDIA_RECORD,
+      KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK,
+      KeyEvent.KEYCODE_MEDIA_TOP_MENU,
+      KeyEvent.KEYCODE_TV_MEDIA_CONTEXT_MENU,
+      KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD,
+      KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD,
+      KeyEvent.KEYCODE_MEDIA_STEP_FORWARD,
+      KeyEvent.KEYCODE_MEDIA_STEP_BACKWARD,
+  };
   private final InputMethodManager imm;
   private final View targetView;
   private final Settings settings;
@@ -448,7 +477,7 @@ public class InputConnection
   }
 
   private boolean processKeyEvent(KeyEvent event) {
-    Log.d(TAG, "processKeyEvent");
+    Log.d(TAG, String.format("processKeyEvent(key=%d)", event.getKeyCode()));
 
     // Filter out Enter keys if multi-line mode is disabled.
     if ((settings.mEditorInfo.inputType & EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) == 0 &&