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 | 12 +-----------
5 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit 8bccbfb093166dbd705e36b9ad1ac2012b5c4c9c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jul 10 12:09:58 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sun Aug 10 11:49:23 2025 +0200
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 <m.wegh...@posteo.de>
Tested-by: Jenkins
(cherry picked from commit 7b42e56bf9dd1db0ed9175c3db928f1b0a48bcaf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187721
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
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" />
</com.google.android.material.appbar.AppBarLayout>
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 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools";>
- <style name="LibreOfficeTheme" parent="LibreOfficeTheme.Base"/>
-
- <style name="LibreOfficeTheme.Base"
parent="Theme.AppCompat.DayNight.NoActionBar">
- </style>
+ <style name="LibreOfficeTheme"
parent="Theme.AppCompat.DayNight.NoActionBar"/>
<style name="ListItemText">
<item name="android:gravity">center_vertical</item>
@@ -11,9 +8,6 @@
<item name="android:textSize">14sp</item>
</style>
- <style name="LibreOfficeTheme.Toolbar"
parent="Theme.AppCompat.DayNight.NoActionBar">
- </style>
-
<style name="NewDocumentTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
commit 82efed4dcd386b8d120055b2cd0909f717ac42cc
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jul 10 12:01:44 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sun Aug 10 11:49:11 2025 +0200
android: Drop unused LibreOfficeTheme.NavigationView
Unused since
commit a23bd42e9b2f6401c710ac95afcc3aa8f360d65c
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Apr 6 14:26:06 2021 +0200
android: Drop custom file abstraction + UI
Change-Id: I01da7a0f2c2a0f5b28262984048a0328de0e846b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187624
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit d93a9e5868d4c54fc17d8881e1c01eb048642c35)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187720
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/android/source/res/values/themes.xml
b/android/source/res/values/themes.xml
index bf815b5c659f..99be869fbef7 100644
--- a/android/source/res/values/themes.xml
+++ b/android/source/res/values/themes.xml
@@ -14,10 +14,6 @@
<style name="LibreOfficeTheme.Toolbar"
parent="Theme.AppCompat.DayNight.NoActionBar">
</style>
- <style name="LibreOfficeTheme.NavigationView">
- <item name="colorPrimary">@android:color/black</item>
- </style>
-
<style name="NewDocumentTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
