[Libreoffice-commits] online.git: android/app

[Jan Holesovsky (via logerrit)]

 android/app/src/main/AndroidManifest.xml |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit cd8bc110d9e97a160304b46b3f7c9e44c437670c
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Feb 24 14:56:07 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Feb 24 18:52:20 2020 +0100

    android: Don't restart the app when the orientation changes.
    
    We handle the screen size change just fine, no need to restart
    everything.
    
    Change-Id: Ic272d1bbaa343c62c98fe1ca68239260779ed367
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89346
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 25109c11f..5d1f2b091 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,11 +23,15 @@
         android:supportsRtl="true"
         android:theme="@style/LibreOfficeTheme">
         <!-- SlideShow Activity -->
-        <activity android:name="org.libreoffice.androidlib.SlideShowActivity"
+        <activity
+            android:name="org.libreoffice.androidlib.SlideShowActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:screenOrientation="sensorLandscape"/>
+
         <!-- Document Browser Activity -->
         <activity
             android:name=".ui.LibreOfficeUIActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -42,7 +46,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="org.libreoffice.androidlib.LOActivity">
+
+        <!-- The main document editing Activity -->
+        <activity
+            android:name="org.libreoffice.androidlib.LOActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
@@ -108,12 +116,18 @@
                 <data android:mimeType="image/svg+xml" />
             </intent-filter>
         </activity>
+
+        <!-- The Activity to show license or notice -->
         <activity
             android:name=".ShowHTMLActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:label="@string/title_activity_show_html" />
+
+        <!-- The Settings Activity -->
         <activity
             android:name=".SettingsActivity"
             android:label="@string/app_name_settings"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:theme="@style/Theme.AppCompat.Light" />
 
         <provider