android/source/build.gradle | 4 +-
android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java | 16
++--------
configure.ac | 10
------
3 files changed, 6 insertions(+), 24 deletions(-)
New commits:
commit 6a2f179809ef3669e84663bdbfa52a7f6fc76114
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Apr 11 11:49:59 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 21 11:39:45 2022 +0200
android: Pass variable for "selected" param
... of the CalcHeaderCell ctor, to simplify this a bit.
Change-Id: I02ff00acccaec26de54534c6c021b9cd05f1d472
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132813
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 9c5facd726e3d5148d17ad547213afe0874ea910)
diff --git
a/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java
b/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java
index c099410cd240..98af7a9554e7 100644
--- a/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java
+++ b/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java
@@ -101,12 +101,8 @@ public class CalcHeadersView extends View {
bottom = -origin.y + zoom*mDimens.get(i);
if (top <= getHeight() && bottom >= 0) {
inRangeOfVisibleHeaders = true;
- if (mCellCursorRect != null && bottom >
mCellCursorRect.top - origin.y && top < mCellCursorRect.bottom - origin.y) {
- // if cell is within current selected portion
- new CalcHeaderCell(0f, top, getWidth(), bottom - top,
mLabels.get(i), true).onDraw(canvas);
- } else {
- new CalcHeaderCell(0f, top, getWidth(), bottom - top,
mLabels.get(i), false).onDraw(canvas);
- }
+ boolean isSelected = mCellCursorRect != null && bottom >
mCellCursorRect.top - origin.y && top < mCellCursorRect.bottom - origin.y;
+ new CalcHeaderCell(0f, top, getWidth(), bottom - top,
mLabels.get(i), isSelected).onDraw(canvas);
} else {
if (inRangeOfVisibleHeaders) {
break;
@@ -116,12 +112,8 @@ public class CalcHeadersView extends View {
left = -origin.x + zoom*mDimens.get(i-1);
right = -origin.x + zoom*mDimens.get(i);
if (left <= getWidth() && right >= 0) {
- if (mCellCursorRect != null && right >
mCellCursorRect.left - origin.x && left < mCellCursorRect.right - origin.x) {
- // if cell is within current selected portion
- new CalcHeaderCell(left, 0f, right - left,
getHeight(), mLabels.get(i), true).onDraw(canvas);
- } else {
- new CalcHeaderCell(left, 0f, right - left,
getHeight(), mLabels.get(i), false).onDraw(canvas);
- }
+ boolean isSelected = mCellCursorRect != null && right >
mCellCursorRect.left - origin.x && left < mCellCursorRect.right - origin.x;
+ new CalcHeaderCell(left, 0f, right - left, getHeight(),
mLabels.get(i), isSelected).onDraw(canvas);
} else {
if (inRangeOfVisibleHeaders) {
break;
commit e1931953516906e816ce3c35cda6561ec118742d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 21 08:18:18 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 21 11:39:22 2022 +0200
android: use mavenCentral instead of jcenter repository
From the `./gradlew --warning-mode all assembleStrippedUIEditingRelease`
output:
> > Configure project :
> The RepositoryHandler.jcenter() method has been deprecated. This is
> scheduled to be removed in Gradle 8.0. JFrog announced JCenter's sunset
> in February 2021. Use mavenCentral() instead. Consult the upgrading
> guide for further information:
>
https://docs.gradle.org/7.2/userguide/upgrading_version_6.html#jcenter_deprecation
> at
build_a6ed945jjgv6miyybz50fclhq$_run_closure1$_closure2.doCall(/home/michi/development/git/libreoffice-WORKTREE-for-android-x86/android/source/build.gradle:14)
> (Run with --stacktrace to get the full stack trace of this
deprecation warning.)
Change-Id: I5db84a9778b598d1e3459dd313aa05c229060368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133239
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit b6a237ad1f5957b9d32bca7e41aa4a2b3bed01fc)
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 43a22c3b31a8..80427b8b73b1 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -4,14 +4,14 @@ apply from: 'liboSettings.gradle'
allprojects {
repositories {
- jcenter()
+ mavenCentral()
google()
}
}
//build-time dependencies - android plugin for gradle
buildscript {
repositories {
- jcenter()
+ mavenCentral()
google()
}
dependencies {
commit 05d776834c1b338efc0d8a03f5bebef1a47f4fd1
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 21 07:52:20 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 21 11:39:16 2022 +0200
android: Drop obsolete build tools version check from configure.ac
`build.gradle` no longer contains a specific `buildToolsVersion`
since
commit a93770e6d0d2fcc5a2eefbed546acee055833fd4
Date: Fri Mar 6 12:16:24 2020 +0100
android: Update gradle
The previous version e.g. did not support building
Android App Bundles yet.
Drop explicit 'buildToolsVersion', as suggested in the warning
during build:
> WARNING: The specified Android SDK Build Tools version (27.0.3)
is ignored,
> as it is below the minimum supported version (28.0.3) for Android
Gradle
> Plugin 3.6.1.
> Android SDK Build Tools 28.0.3 will be used.
> To suppress this warning, remove "buildToolsVersion '27.0.3'"
from your build.gradle
> file, as each version of the Android Gradle Plugin now has a
default
> version of the build tools.
so the sed expression in configure.ac was evaluating to an empty
string and only the existence of `"$ANDROID_SDK_DIR/build-tools/`
was checked.
As mentioned in a93770e6d0d2fcc5a2eefbed546acee055833fd4,
each version of the Android Gradle Plugin now has a default
version of the build tools. It takes care of downloading and
installing that one as necessary.
Change-Id: Ic8528c5dc238dccb35ccf215945ef935e8c3a89c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133238
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit b548507896f9b1fef606e5d5329c6283436a592c)
diff --git a/configure.ac b/configure.ac
index 2766b69daf04..72e62295b86d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1204,16 +1204,6 @@ if test "$_os" = "Android" ; then
elif test ! -d "$ANDROID_SDK_DIR/platforms"; then
AC_MSG_ERROR([the --with-android-sdk option does not point to an
Android SDK])
fi
-
- BUILD_TOOLS_VERSION=`$SED -n -e 's/.*buildToolsVersion "\(.*\)"/\1/p'
$SRC_ROOT/android/source/build.gradle`
- if test ! -d "$ANDROID_SDK_DIR/build-tools/$BUILD_TOOLS_VERSION"; then
- AC_MSG_WARN([android build-tools $BUILD_TOOLS_VERSION not found -
install with
- $ANDROID_SDK_DIR/tools/android update sdk -u --all
--filter build-tools-$BUILD_TOOLS_VERSION
- or adjust change $SRC_ROOT/android/source/build.gradle
accordingly])
- add_warning "android build-tools $BUILD_TOOLS_VERSION not found -
install with"
- add_warning " $ANDROID_SDK_DIR/tools/android update sdk -u --all
--filter build-tools-$BUILD_TOOLS_VERSION"
- add_warning "or adjust $SRC_ROOT/android/source/build.gradle
accordingly"
- fi
fi
if test "$_os" = "AIX"; then
