From f4ad65b8be0e1a423a8effd71ca94490eee68705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
Date: Sun, 23 Jan 2022 22:08:37 +0100
Subject: [PATCH] [android] Remove space for icons in Settings (#1924)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [android] Remove space for icons in Settings

Override the the iconSpaceReserved property specified in
https://cs.android.com/android/platform/superproject/+/android-12.0.0_r4:prebuilts/sdk/current/support/v7/preference/res/values-sw360dp-v13/values-sw360dp-v13.xml
as none of the Settings items has an icon; hence the space is wasted and
leads to the truncation of item names and descriptions.

Closes: #1872
Signed-off-by: Stefan Löffler <st.loeffler@gmail.com>

* [android] Add comment about iconSpaceReserved

Signed-off-by: Stefan Löffler <st.loeffler@gmail.com>
---
 .../values-sw360dp-v13/values-preference.xml  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 android/res/values-sw360dp-v13/values-preference.xml

diff --git a/android/res/values-sw360dp-v13/values-preference.xml b/android/res/values-sw360dp-v13/values-preference.xml
new file mode 100644
index 0000000000..e45b83c35d
--- /dev/null
+++ b/android/res/values-sw360dp-v13/values-preference.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Items in the Preferences can have space reserved for an icon. As none of the
+settings currently have associated icons, this leads to items that seem indented
+without purpose. This wastes space and can lead to truncation of the item names
+and descriptions. See https://github.com/organicmaps/organicmaps/issues/1872
+
+To rectify this, the iconSpaceReserved property needs to be set to false.
+According to https://developer.android.com/reference/android/preference/Preference#attr_android:iconSpaceReserved
+false should be the default. However, according to
+https://material.io/design/platform-guidance/android-settings.html this goes
+against the material design guidelines and the default was overridden to true in
+https://cs.android.com/android/platform/superproject/+/android-9.0.0_r1:prebuilts/sdk/current/support/v7/preference/res/values-sw360dp-v13/values-sw360dp-v13.xml
+This file sets the default value back to false (i.e. no space reserved for icons).
+
+See also the discussion at https://github.com/organicmaps/organicmaps/pull/1924
+-->
+<resources>
+  <bool name="config_materialPreferenceIconSpaceReserved">false</bool>
+</resources>