[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-1+backports' - android/source

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 985a9551f47aac55b60ef452869c2b411313ef11
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Mar 16 08:41:12 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Mar 16 09:08:47 2021 +0100

    tdf#141052 android: Include 'tabviewbar.ui'
    
    ... which has been added in
    
        commit e00fd78e6e454491014f03370e14efa5ebc2eefe
        Date:   Thu Oct 22 19:41:17 2020 +0100
    
            weld impress TabBarControl
    
    and is now needed by Impress in Android Viewer
    as well.
    
    Change-Id: I7fd89fa78a277d9da2121a47765107166ada1fd3
    
    [Note: This is a partial cherry-pick/backport of
    pending Gerrit change
    https://gerrit.libreoffice.org/c/core/+/112557 ;
    only of the two commits mentioned in that one's
    commit message is already contained in 7-1 branch
    as well, so just one .ui file needs to be added
    here.]
    
     Conflicts:
            android/source/build.gradle
    
    Change-Id: I084655679eced073eed9db009cbbc598fce43eeb

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 32de09f84749..637a0495ff2d 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -193,7 +193,8 @@ task copyAssets(type: Copy) {
     // 'headerfootermenu.ui' when clicking inside header/footer of document
     into('config') {
         from "${liboInstdir}/share/config"
-        include '**/pagebreakmenu.ui', '**/annotationmenu.ui', '**/headerfootermenu.ui'
+        include '**/pagebreakmenu.ui', '**/annotationmenu.ui', '**/headerfootermenu.ui',
+                '**/tabviewbar.ui'
     }
 }