android/source/lint-baseline.xml            |   19 ++++---------------
 android/source/res/layout/activity_main.xml |    2 --
 2 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit d3fc35043319b9718786866139dedae29331d52e
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jul 9 14:42:02 2025 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sun Aug 10 11:48:32 2025 +0200

    android lint: Always have Calc doc right of headers
    
    Address these 2 lint warnings which would otherwise
    trigger build errors in a WIP branch updating
    compileSdkVersion and targetSdkVersion to 36.
    
        <issue
            id="RtlHardcoded"
            message="Redundant attribute `layout_toRightOf`; already defining 
`layout_toEndOf` with `targetSdkVersion` 34"
            errorLine1="                    
android:layout_toRightOf=&quot;@+id/calc_header_top_left&quot;"
            errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
            <location
                file="res/layout/activity_main.xml"
                line="78"
                column="21"/>
        </issue>
    
        <issue
            id="RtlHardcoded"
            message="Redundant attribute `layout_toRightOf`; already defining 
`layout_toEndOf` with `targetSdkVersion` 34"
            errorLine1="                    
android:layout_toRightOf=&quot;@+id/calc_header_row&quot;"
            errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
            <location
                file="res/layout/activity_main.xml"
                line="94"
                column="21"/>
        </issue>
    
    Like the desktop version of LibreOffice, have the Calc doc
    always to the right of the headers, regardless of whether
    RTL or LTR is used, i.e. leave `android:layout_toRightOf` and
    drop the `layout_toEndOf` attribute.
    
    this triggers other lint warnings. Regenerate
    android/source/lint-baseline.xml to not fail the build
    on those.
    
    Change-Id: I4b3c1076d62a757164a3ae1953fe0c73ddc444c5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187574
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    (cherry picked from commit bda2ac31eeea60ca3e8a5b6057ee554df562f6d5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187717
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml
index 5888d2327d22..12594c48345e 100644
--- a/android/source/lint-baseline.xml
+++ b/android/source/lint-baseline.xml
@@ -111,17 +111,6 @@
             column="79"/>
     </issue>
 
-    <issue
-        id="GradleDependency"
-        message="A newer version of androidx.constraintlayout:constraintlayout 
than 2.2.0 is available: 2.2.1"
-        errorLine1="    implementation 
&apos;androidx.constraintlayout:constraintlayout:2.2.0&apos;"
-        errorLine2="                   
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="36"
-            column="20"/>
-    </issue>
-
     <issue
         id="GradleDependency"
         message="A newer version of `compileSdkVersion` than 34 is available: 
36"
@@ -1381,7 +1370,7 @@
         errorLine2="            
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/java/org/libreoffice/ui/LibreOfficeUIActivity.java"
-            line="408"
+            line="415"
             column="13"/>
     </issue>
 
@@ -2135,7 +2124,7 @@
 
     <issue
         id="RtlHardcoded"
-        message="Redundant attribute `layout_toRightOf`; already defining 
`layout_toEndOf` with `targetSdkVersion` 34"
+        message="Consider replacing `android:layout_toRightOf` with 
`android:layout_toEndOf=&quot;@+id/calc_header_top_left&quot;` to better 
support right-to-left layouts"
         errorLine1="                    
android:layout_toRightOf=&quot;@+id/calc_header_top_left&quot;"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2146,12 +2135,12 @@
 
     <issue
         id="RtlHardcoded"
-        message="Redundant attribute `layout_toRightOf`; already defining 
`layout_toEndOf` with `targetSdkVersion` 34"
+        message="Consider replacing `android:layout_toRightOf` with 
`android:layout_toEndOf=&quot;@+id/calc_header_row&quot;` to better support 
right-to-left layouts"
         errorLine1="                    
android:layout_toRightOf=&quot;@+id/calc_header_row&quot;"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/activity_main.xml"
-            line="94"
+            line="93"
             column="21"/>
     </issue>
 
diff --git a/android/source/res/layout/activity_main.xml 
b/android/source/res/layout/activity_main.xml
index e503cb90f0eb..f2caccdf12c3 100644
--- a/android/source/res/layout/activity_main.xml
+++ b/android/source/res/layout/activity_main.xml
@@ -76,7 +76,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/calc_header_height"
                     android:layout_toRightOf="@+id/calc_header_top_left"
-                    android:layout_toEndOf="@+id/calc_header_top_left"
                     android:visibility="gone"/>
 
                 <org.libreoffice.overlay.CalcHeadersView
@@ -92,7 +91,6 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical"
                     android:layout_toRightOf="@+id/calc_header_row"
-                    android:layout_toEndOf="@+id/calc_header_row"
                     android:layout_below="@+id/calc_header_column">
 
                     <org.mozilla.gecko.gfx.LayerView

Reply via email to