android/source/AndroidManifest.xml | 1 -
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 +-------
6 files changed, 9 insertions(+), 16 deletions(-)
New commits:
commit 42ee4ef3a33d22cfea24d0e1956677c2a4068c2f
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jul 10 12:14:18 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jul 11 07:09:19 2025 +0200
android: Use same theme for SettingsActivity
Don't use another theme for the SettingsActivity
than for the rest of the app.
I don't see any big visual change when opening
the activity at least in an API 36 (Android 16)
AVD anyway (with an additional
local revert of commit 9d1e76f7da12353afc3d9479d3b2ecddbb2a71e6
to prevent a deadlock when opening documents that is unrelated
to this change here)
and this will simplify maintenance and
adding support for targetSdkVersion 35 where edge-to-edge
is enabled by default [1].
[1]
https://developer.android.com/about/versions/15/behavior-changes-15#window-insets
Change-Id: I1e5dccfefe930d34a8b315df04a6f07f050a5b54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187626
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/android/source/AndroidManifest.xml
b/android/source/AndroidManifest.xml
index 899a117f429d..93eae60f97d8 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -92,7 +92,6 @@
<activity
android:name=".SettingsActivity"
- android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar"
android:label="@string/app_name_settings">
</activity>
commit 7b42e56bf9dd1db0ed9175c3db928f1b0a48bcaf
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jul 10 12:09:58 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jul 11 07:09:06 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
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>
