diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2021-03-16 08:41:12 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-03-16 09:08:47 +0100 |
| commit | 985a9551f47aac55b60ef452869c2b411313ef11 (patch) | |
| tree | e9a0f9aa24f8144cd64a36cc643ee366203e3eb3 | |
| parent | 9281763642522aed1b7549d47de6d9834708e6fb (diff) | |
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
| -rw-r--r-- | android/source/build.gradle | 3 |
1 files changed, 2 insertions, 1 deletions
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' } } |