[Libreoffice-commits] core.git: android/source

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 96af7614c205cbb43379d8b37fd02de7080175a0
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Mar 15 11:30:36 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Mar 15 14:01:31 2021 +0100

    tdf#141044 android: Update included .ui files
    
    ... according to changes in
    
        commit 51379fb3d46e5891bdaea0122bd62b0753663da3
        Date:   Thu Dec 3 15:54:45 2020 +0000
    
            weld writer's FrameControl MenuButtons
    
    and
    
        commit a39a3f1ad1e5e39b09ce474c0f4c0f9f4e174bbe
        Date:   Tue Feb 9 12:07:27 2021 +0000
    
            weld impress annotation window
    
    Change-Id: I635a6ce74844d08cafa8c50c090ba04b2aefc287
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112490
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 32de09f84749..ee297e1b44c6 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -186,14 +186,10 @@ task copyAssets(type: Copy) {
             include '*.data'
         }
     }
-    // documents with manual page break trigger attempt to read the ui file 'pagebreakmenu.ui'
-    // would trigger a css::container::NoSuchElementException with osl_File_E_NOENT
-    // if not present and since it is not caught would crash the app;
-    // 'annotationmenu.ui' required to handle documents containing comments,
-    // 'headerfootermenu.ui' when clicking inside header/footer of document
+    // include required .ui files
     into('config') {
         from "${liboInstdir}/share/config"
-        include '**/pagebreakmenu.ui', '**/annotationmenu.ui', '**/headerfootermenu.ui'
+        include '**/annotation.ui', '**/hfmenubutton.ui', '**/pbmenubutton.ui'
     }
 }