From abed55b1ea7f04a0a522d54e369d170a71045cd5 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Wed, 22 Nov 2023 09:27:45 +0100
Subject: tdf#158307 android a11y: Auto-detect toolbar height

Instead of hard-coding a toolbar height for the
cell address and formula bar in Calc, use
`android:layout_height="wrap_content"`, so the height
is determined based on the font size.
This avoids the text getting cut off when a large
font size has been selected in Android's accessibility
settings.

Change-Id: I9bfbe2b7a1db39ac11d9ed0ab15290f974782489
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159809
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 android/source/res/layout/activity_main.xml | 4 ++--
 android/source/res/values/dimens.xml        | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'android')

diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml
index bd444f9fe79f..c03f0c93aea9 100644
--- a/android/source/res/layout/activity_main.xml
+++ b/android/source/res/layout/activity_main.xml
@@ -42,7 +42,7 @@
                 <EditText
                     android:id="@+id/calc_address"
                     android:layout_width="@dimen/calc_address_bar_width"
-                    android:layout_height="@dimen/calc_toolbar_height"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:inputType="textNoSuggestions"
                     android:imeOptions="actionDone|actionGo"
@@ -51,7 +51,7 @@
                 <EditText
                     android:id="@+id/calc_formula"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/calc_toolbar_height"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:inputType="text"
                     android:imeOptions="actionDone|actionGo"
diff --git a/android/source/res/values/dimens.xml b/android/source/res/values/dimens.xml
index ca91a2f30a1f..8753fad07101 100644
--- a/android/source/res/values/dimens.xml
+++ b/android/source/res/values/dimens.xml
@@ -11,7 +11,6 @@
     <dimen name="toolbar_height">256dp</dimen>
     <dimen name="calc_header_width">48dp</dimen>
     <dimen name="calc_header_height">24dp</dimen>
-    <dimen name="calc_toolbar_height">40dp</dimen>
     <dimen name="calc_address_bar_width">96dp</dimen>
     <dimen name="new_doc_fab_tweak_top">-11dp</dimen>
     <dimen name="new_doc_fab_tweak_bottom">-7dp</dimen>
-- 
cgit