1 files changed, 7 insertions, 2 deletions

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 75aa5bdf409..06417017ae3 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -31,13 +31,15 @@
             android:targetSdkVersion="28"/>
 
   <application android:name="org.gnu.emacs.EmacsApplication"
-               android:label="GNU Emacs"
+               android:label="Emacs"
                android:hardwareAccelerated="true"
                android:supportsRtl="true"
                android:theme="@android:style/Theme"
                android:debuggable="true"
                android:extractNativeLibs="true">
-    <activity android:name="org.gnu.emacs.EmacsActivity">
+    <activity android:name="org.gnu.emacs.EmacsActivity"
+              android:launchMode="singleTop"
+              android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.DEFAULT" />
@@ -45,6 +47,9 @@
       </intent-filter>
     </activity>
 
+    <activity android:name="org.gnu.emacs.EmacsMultitaskActivity"
+              android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"/>
+
     <service android:name="org.gnu.emacs.EmacsService"
              android:directBootAware="false"
              android:enabled="true"