From 93087d3c4517263329b135ca963cbb1c5c8e26c8 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 21 Mar 2021 02:47:19 +1000
Subject: [PATCH] Android: Don't restart activities on keyboard change

---
 android/app/src/main/AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 679300ed5..d1181b437 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".EmulationActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:exported="true"
             android:immersive="true"
             android:label="@string/title_activity_emulation"
@@ -39,7 +39,7 @@
         </activity>
         <activity
             android:name=".SettingsActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:label="@string/title_activity_settings"
             android:parentActivityName=".MainActivity">
             <meta-data
@@ -48,7 +48,7 @@
         </activity>
         <activity
             android:name=".ControllerSettingsActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:label="@string/controller_mapping_activity_title"
             android:parentActivityName=".MainActivity">
             <meta-data
@@ -57,7 +57,7 @@
         </activity>
         <activity
             android:name=".GamePropertiesActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:label="@string/activity_game_properties"
             android:parentActivityName=".MainActivity">
             <meta-data
@@ -66,7 +66,7 @@
         </activity>
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>