android/source/lint-baseline.xml | 116 ++---------------------- android/source/res/layout/item_recent_files.xml | 1 android/source/res/layout/number_picker.xml | 4 android/source/res/layout/presentation_mode.xml | 5 - 4 files changed, 15 insertions(+), 111 deletions(-)
New commits: commit 4a985fae2303ba0ed266b14deeba92954ed8df2b Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jul 9 14:59:11 2025 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Mon Jul 14 19:06:39 2025 +0200 android lint: Drop redundant android:alignParent* attrs Address those lint warnings which would otherwise trigger build errors in a WIP branch updating compileSdkVersion and targetSdkVersion to 36. Regenerate android/source/lint-baseline.xml Change-Id: I0c3cbd10f6f177636a4960dd93674dde7c04b470 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187576 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit 56cc3fe11f66304502e2ffdf4400f1c74a51d0e7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187690 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml index 965e1ac48903..f0f46388adc4 100644 --- a/android/source/lint-baseline.xml +++ b/android/source/lint-baseline.xml @@ -1524,7 +1524,7 @@ errorLine2=" ~~~~~~~~~~~"> <location file="res/layout/presentation_mode.xml" - line="25" + line="24" column="10"/> </issue> @@ -2085,7 +2085,7 @@ errorLine2=" ~~~~~~"> <location file="res/layout/presentation_mode.xml" - line="34" + line="32" column="10"/> </issue> @@ -2144,39 +2144,6 @@ column="21"/> </issue> - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_alignParentRight`; already defining `layout_alignParentEnd` with `targetSdkVersion` 34" - errorLine1=" android:layout_alignParentRight="true"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/presentation_mode.xml" - line="21" - column="13"/> - </issue> - - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_alignParentRight`; already defining `layout_alignParentEnd` with `targetSdkVersion` 34" - errorLine1=" android:layout_alignParentRight="true"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/presentation_mode.xml" - line="31" - column="13"/> - </issue> - - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_alignParentLeft`; already defining `layout_alignParentStart` with `targetSdkVersion` 34" - errorLine1=" android:layout_alignParentLeft="true"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/presentation_mode.xml" - line="38" - column="13"/> - </issue> - <issue id="RtlHardcoded" message="Consider replacing `android:layout_alignParentLeft` with `android:layout_alignParentStart="true"` to better support right-to-left layouts" diff --git a/android/source/res/layout/presentation_mode.xml b/android/source/res/layout/presentation_mode.xml index ec1845ab68ab..7e39f88bcf1d 100644 --- a/android/source/res/layout/presentation_mode.xml +++ b/android/source/res/layout/presentation_mode.xml @@ -18,7 +18,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:src="@drawable/ic_search_direction_up" /> @@ -28,18 +27,16 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:src="@drawable/ic_search_direction_down" /> <Button android:id="@+id/slide_show_nav_back" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:text="@string/slideshow_action_back" /> </RelativeLayout> -</RelativeLayout> \ No newline at end of file +</RelativeLayout> commit 08e9c4bcff4880836f3a4c2eaa0de7a6a5c0ad1e Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jul 9 14:55:48 2025 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Mon Jul 14 19:06:26 2025 +0200 android lint: Drop redundant android:layout_margin{Left,Right} attrs Address those lint warnings which would otherwise trigger build errors in a WIP branch updating compileSdkVersion and targetSdkVersion to 36. Regenerate android/source/lint-baseline.xml Change-Id: I2f75a04898d38bf6661ba50bcdbe13677065f695 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187575 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins (cherry picked from commit dccae06f4f48afdaf007d3c9f20d18e5873548ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187689 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml index 12594c48345e..965e1ac48903 100644 --- a/android/source/lint-baseline.xml +++ b/android/source/lint-baseline.xml @@ -1920,7 +1920,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="30" + line="28" column="9"/> </issue> @@ -1931,7 +1931,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="64" + line="62" column="9"/> </issue> @@ -1942,7 +1942,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="95" + line="92" column="9"/> </issue> @@ -1953,7 +1953,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="126" + line="122" column="9"/> </issue> @@ -1997,7 +1997,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="16" + line="15" column="9"/> </issue> @@ -2008,7 +2008,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="32" + line="30" column="9"/> </issue> @@ -2019,7 +2019,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="45" + line="43" column="9"/> </issue> @@ -2030,7 +2030,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="60" + line="58" column="9"/> </issue> @@ -2041,7 +2041,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="77" + line="74" column="9"/> </issue> @@ -2052,7 +2052,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="90" + line="87" column="9"/> </issue> @@ -2063,7 +2063,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="108" + line="105" column="9"/> </issue> @@ -2074,7 +2074,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="res/layout/number_picker.xml" - line="122" + line="118" column="9"/> </issue> @@ -2144,61 +2144,6 @@ column="21"/> </issue> - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_marginRight`; already defining `layout_marginEnd` with `targetSdkVersion` 34" - errorLine1=" android:layout_marginRight="@dimen/file_icon_margin_end"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/item_recent_files.xml" - line="26" - column="9"/> - </issue> - - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_marginLeft`; already defining `layout_marginStart` with `targetSdkVersion` 34" - errorLine1=" android:layout_marginLeft="8dp"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/number_picker.xml" - line="14" - column="9"/> - </issue> - - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_marginRight`; already defining `layout_marginEnd` with `targetSdkVersion` 34" - errorLine1=" android:layout_marginRight="8dp"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/number_picker.xml" - line="27" - column="9"/> - </issue> - - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_marginLeft`; already defining `layout_marginStart` with `targetSdkVersion` 34" - errorLine1=" android:layout_marginLeft="8dp"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/number_picker.xml" - line="75" - column="9"/> - </issue> - - <issue - id="RtlHardcoded" - message="Redundant attribute `layout_marginRight`; already defining `layout_marginEnd` with `targetSdkVersion` 34" - errorLine1=" android:layout_marginRight="8dp"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="res/layout/number_picker.xml" - line="120" - column="9"/> - </issue> - <issue id="RtlHardcoded" message="Redundant attribute `layout_alignParentRight`; already defining `layout_alignParentEnd` with `targetSdkVersion` 34" diff --git a/android/source/res/layout/item_recent_files.xml b/android/source/res/layout/item_recent_files.xml index f13839b44b73..9b5a45d8e222 100644 --- a/android/source/res/layout/item_recent_files.xml +++ b/android/source/res/layout/item_recent_files.xml @@ -23,7 +23,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/file_icon_margin_end" - android:layout_marginRight="@dimen/file_icon_margin_end" android:adjustViewBounds="true" android:id="@+id/imageView" android:contentDescription="@string/file_icon_desc"/> diff --git a/android/source/res/layout/number_picker.xml b/android/source/res/layout/number_picker.xml index 32eea0e80a84..cb2064e5e611 100644 --- a/android/source/res/layout/number_picker.xml +++ b/android/source/res/layout/number_picker.xml @@ -11,7 +11,6 @@ android:layout_width="wrap_content" android:layout_height="30dp" android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:text="Rows:" android:gravity="center" @@ -24,7 +23,6 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:layout_marginTop="8dp" android:background="@drawable/image_button_background" android:clickable="true" @@ -72,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="30dp" android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" android:layout_marginTop="24dp" android:text="Columns:" android:gravity="center" @@ -117,7 +114,6 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:layout_marginTop="24dp" android:text="+" android:gravity="center"
