From a374d59abc415eee1866322176b7762158f48abd Mon Sep 17 00:00:00 2001
From: Ivan Solovev <ivan.solovev@qt.io>
Date: Thu, 10 Feb 2022 12:38:29 +0100
Subject: [PATCH] Android A11Y: Announce value together with element name when
 focused

Before this patch when we focus a new element, only its description
was announced.
For elements like Slider that means that if it had no accessible name
or description, its value would be announced (all is fine here).
But if the slider is defined like that:
 Slider {
     Accessible.name: "int slider"
     value: 5
     from: 0
     to: 20
     stepSize: 1
 }

only the name ("int slider") will be announced, but not the actual
value.

This patch fixes the logic of content description generation. If the
element has value, then it is added to the description and announced
as well.

Task-number: QTBUG-93396
Pick-to: 6.3 6.2 5.15
Change-Id: Ia8667149ebd867945c5f57d951fd6ade0f382598
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 .../platforms/android/androidjniaccessibility.cpp      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp
index 97d5692a47..cac106be3b 100644
--- a/src/plugins/platforms/android/androidjniaccessibility.cpp
+++ b/src/plugins/platforms/android/androidjniaccessibility.cpp
@@ -379,14 +379,18 @@ if (!clazz) { \
     {
         QString desc;
         if (iface && iface->isValid()) {
+            bool hasValue = false;
             desc = iface->text(QAccessible::Name);
             if (desc.isEmpty())
                 desc = iface->text(QAccessible::Description);
             if (desc.isEmpty()) {
                 desc = iface->text(QAccessible::Value);
-                if (desc.isEmpty()) {
-                    desc = textFromValue(iface);
-                }
+                hasValue = !desc.isEmpty();
+            }
+            if (!hasValue) {
+                if (!desc.isEmpty())
+                    desc.append(QChar(QChar::Space));
+                desc.append(textFromValue(iface));
             }
         }
         return desc;