TizenRefApp-8948 [Screen Reader] Toast popups are not fully read

Change-Id: I342727d25d3dbd737b8eaa276a09da48c59ae82c
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-apps-common/inc/Ui/Toast.h b/lib-apps-common/inc/Ui/Toast.h
index c60c23bf49ae8c901136586a17fd9fba3be95480..b3a70dc8568cd049726200d2d0bebcafb0662186 100644 (file)
--- a/lib-apps-common/inc/Ui/Toast.h
+++ b/lib-apps-common/inc/Ui/Toast.h
@@ -46,6 +46,9 @@ namespace Ui
                 * @see Control::onCreate()
                 */
                virtual Evas_Object *onCreate(Evas_Object *parent) override;
+
+       private:
+               void onTimeout(Evas_Object *popup, void *eventInfo);
        };
 }
 

diff --git a/lib-apps-common/src/Ui/Toast.cpp b/lib-apps-common/src/Ui/Toast.cpp
index 188b01a812438de6a98a477969a57aadfcffb81f..5175487131d503ef9e90070818a29a00f9cc837e 100644 (file)
--- a/lib-apps-common/src/Ui/Toast.cpp
+++ b/lib-apps-common/src/Ui/Toast.cpp
@@ -16,6 +16,7 @@
 
 #include "Ui/Toast.h"
 #include "Ui/Window.h"
+#include "Utils/Callback.h"
 
 using namespace Ui;
 
@@ -41,11 +42,19 @@ Evas_Object *Toast::onCreate(Evas_Object *parent)
 {
        Evas_Object *popup = Popup::onCreate(findParent<Window>(parent)->getEvasObject());
        elm_object_style_set(popup, "toast/circle");
-       elm_popup_timeout_set(popup, 2.0);
-       evas_object_smart_callback_add(popup, "timeout",
-               [](void *data, Evas_Object *popup, void *) {
-                       elm_popup_dismiss(popup);
-               }, this);
+       if (!elm_atspi_bridge_utils_is_screen_reader_enabled()) {
+               elm_popup_timeout_set(popup, 2.0);
+               evas_object_smart_callback_add(popup, "timeout",
+                               makeCallback(&Toast::onTimeout), this);
+       } else {
+               evas_object_smart_callback_add(popup, "access,read,stop",
+                               makeCallback(&Toast::onTimeout), this);
+       }
 
        return popup;
 }
+
+void Toast::onTimeout(Evas_Object *popup, void *eventInfo)
+{
+       elm_popup_dismiss(popup);
+}