From 7b42e56bf9dd1db0ed9175c3db928f1b0a48bcaf Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 10 Jul 2025 12:09:58 +0200 Subject: [PATCH] android: Consolidate custom themes LibreOfficeTheme.Base isn't used by itself, so no longer let LibreOfficeTheme derive from it, but derive from Theme.AppCompat.DayNight.NoActionBar directly. LibreOfficeTheme.Toolbar is equivalent, so drop it and switch all uses to LibreOfficeTheme instead. Change-Id: I9ad5ccb00bac94a20c17715780050fd8d300fa15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187625 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- android/source/res/layout/activity_document_browser.xml | 4 ++-- android/source/res/layout/activity_main.xml | 4 ++-- android/source/res/layout/toolbar_bottom.xml | 4 ++-- android/source/res/layout/toolbar_color_picker.xml | 4 ++-- android/source/res/values/themes.xml | 8 +------- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index 72b6e42b29b2..bb5e62cf7831 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -19,8 +19,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:elevation="3dp" - app:theme="@style/LibreOfficeTheme.Toolbar" - tools:theme="@style/LibreOfficeTheme.Toolbar" + app:theme="@style/LibreOfficeTheme" + tools:theme="@style/LibreOfficeTheme" app:popupTheme="@style/LibreOfficeTheme" tools:layout_constraintTop_creator="1" tools:layout_constraintRight_creator="1" diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index f2caccdf12c3..6734240d515e 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -28,8 +28,8 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:elevation="3dp" - app:theme="@style/LibreOfficeTheme.Toolbar" - tools:theme="@style/LibreOfficeTheme.Toolbar" + app:theme="@style/LibreOfficeTheme" + tools:theme="@style/LibreOfficeTheme" app:popupTheme="@style/LibreOfficeTheme" /> diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml index 172b215f5a1c..02690bbe4089 100644 --- a/android/source/res/layout/toolbar_bottom.xml +++ b/android/source/res/layout/toolbar_bottom.xml @@ -10,8 +10,8 @@ android:background="?attr/colorPrimary" android:elevation="3dp" android:orientation="vertical" - app:popupTheme="@style/LibreOfficeTheme.Toolbar" - app:theme="@style/LibreOfficeTheme.Toolbar" + app:popupTheme="@style/LibreOfficeTheme" + app:theme="@style/LibreOfficeTheme" tools:showIn="@layout/activity_main" app:layout_behavior="@string/bottom_sheet_behavior" app:behavior_hideable="true" diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/source/res/layout/toolbar_color_picker.xml index 0969d0e52e3d..3004e9c9f519 100644 --- a/android/source/res/layout/toolbar_color_picker.xml +++ b/android/source/res/layout/toolbar_color_picker.xml @@ -9,8 +9,8 @@ android:background="?attr/colorPrimary" android:elevation="3dp" android:orientation="vertical" - app:popupTheme="@style/LibreOfficeTheme.Toolbar" - app:theme="@style/LibreOfficeTheme.Toolbar" + app:popupTheme="@style/LibreOfficeTheme" + app:theme="@style/LibreOfficeTheme" tools:showIn="@layout/activity_main" app:layout_behavior="@string/bottom_sheet_behavior" app:behavior_hideable="true" diff --git a/android/source/res/values/themes.xml b/android/source/res/values/themes.xml index 99be869fbef7..a152d2ee8a1e 100644 --- a/android/source/res/values/themes.xml +++ b/android/source/res/values/themes.xml @@ -1,9 +1,6 @@ - + - -