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

[Jan Holesovsky (via logerrit)]

 android/app/src/main/AndroidManifest.xml       |    1 -
 android/app/src/main/res/values-v28/themes.xml |    6 ------
 2 files changed, 7 deletions(-)

New commits:
commit 29eb7ffe92861023982557d96fe8e8cc50974d2a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Feb 11 10:00:59 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Feb 11 10:24:12 2020 +0100

    android: The full-screen presentations shouldn't show the cut-outs.
    
    They could hide something important in the presentation :-)
    
    At the same time, I believe it will fix the following crash on older
    devices, because we did not have the FullScreenStyle for pre-v28:
    
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: FATAL EXCEPTION: main
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: Process: com.collabora.libreoffice.snapshot, PID: 30480
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: java.lang.RuntimeException: Unable to start activity ComponentInfo{com.collabora.libreoffice.snapshot/org.libreoffice.androidlib.SlideShowActivity}: java.lang.IllegalStateException: You need to use a Theme.AppCompat theme (or descendant) with this activity.
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2821)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2899)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.ActivityThread.-wrap11(Unknown Source:0)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1625)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:106)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6558)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:469)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:826)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: Caused by: java.lang.IllegalStateException: You need to use a Theme.AppCompat theme (or descendant) with this activity.
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at androidx.appcompat.app.AppCompatDelegateImpl.createSubDecor(AppCompatDelegateImpl.java:555)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at androidx.appcompat.app.AppCompatDelegateImpl.ensureSubDecor(AppCompatDelegateImpl.java:518)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at androidx.appcompat.app.AppCompatDelegateImpl.setContentView(AppCompatDelegateImpl.java:466)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at androidx.appcompat.app.AppCompatActivity.setContentView(AppCompatActivity.java:141)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at org.libreoffice.androidlib.SlideShowActivity.onCreate(SlideShowActivity.java:36)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.Activity.performCreate(Activity.java:7256)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.Activity.performCreate(Activity.java:7247)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1215)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2774)
    02-10 23:11:23.179 10189 30480 30480 E AndroidRuntime: ... 9 more
    
    Change-Id: I756cc99658c24573381b48985835db515b930965
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88430
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8a501c8a0..5ef3a0873 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -24,7 +24,6 @@
         android:theme="@style/LibreOfficeTheme">
         <!-- SlideShow Activity -->
         <activity android:name="org.libreoffice.androidlib.SlideShowActivity"
-            android:theme="@style/FullScreenStyle"
             android:screenOrientation="sensorLandscape"/>
         <!-- Document Browser Activity -->
         <activity
diff --git a/android/app/src/main/res/values-v28/themes.xml b/android/app/src/main/res/values-v28/themes.xml
deleted file mode 100644
index a2b6cdb3b..000000000
--- a/android/app/src/main/res/values-v28/themes.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="FullScreenStyle" parent="LibreOfficeTheme">
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-</resources>
\ No newline at end of file