[atspi] emit highlight signal - screen reader reads at the highlight signal

   ***ctxpopup is not modified. Because dependent commits were not merged first.
      (dependency : 034a1d1fe2656c5a6fced6e70b786e0f795cec6a
      [genlist & ctxpopup] Merge tizen 2.4 genlist and ctxpopup for mobile & wearable profile support)

Change-Id: Ic43792b64125643ccd3252ae17298427cc02ed66

diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 2e5ae50..2ed1159 100644 (file)
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -5539,7 +5539,7 @@ _elm_gengrid_item_efl_access_component_highlight_clear(Eo *eo_it, Elm_Gen_Item *
    //
    elm_object_accessibility_highlight_set(EO_OBJ(it), EINA_FALSE);
    //TIZEN_ONLY(20170717) : expose highlight information on atspi
-   efl_access_active_descendant_changed_signal_emit(WIDGET(it), eo_it);
+   efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_FALSE);
    //
    //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item
    // If you call eo_do_super, then you do NOT have to call smart callback.
@@ -6067,7 +6067,7 @@ _elm_gengrid_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Gengrid_Data
         if (next_previous_item)
           {
              elm_object_accessibility_highlight_set(EO_OBJ(next_previous_item), EINA_TRUE);
-             efl_access_active_descendant_changed_signal_emit(obj, EO_OBJ(next_previous_item));
+             efl_access_state_changed_signal_emit(EO_OBJ(next_previous_item), EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
           }
      }
 }

diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index a5077bb..fe4c3fc 100644 (file)
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -9182,7 +9182,7 @@ _elm_genlist_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Genlist_Data
         if (next_previous_item)
           {
              elm_object_accessibility_highlight_set(EO_OBJ(next_previous_item), EINA_TRUE);
-             efl_access_active_descendant_changed_signal_emit(obj, EO_OBJ(next_previous_item));
+             efl_access_state_changed_signal_emit(EO_OBJ(next_previous_item), EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
           }
       }
 }
@@ -9258,7 +9258,9 @@ _elm_genlist_item_efl_access_component_highlight_clear(Eo *eo_it, Elm_Gen_Item *
   if (sd->atspi_item_to_highlight == it)
       sd->atspi_item_to_highlight = NULL;
 
-  efl_access_active_descendant_changed_signal_emit(WIDGET(it), eo_it);
+  ///TIZEN_ONLY(20170717) : expose highlight information on atspi
+  efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_HIGHLIGHTED, EINA_FALSE);
+  //
 
   ret = efl_access_component_highlight_clear(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
   //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item

diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 466eb6d..abfccf3 100644 (file)
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -1749,6 +1749,7 @@ _elm_index_efl_access_component_highlight_grab(Eo *obj EINA_UNUSED, Elm_Index_Da
    if (sd->bx[level])
      {
         elm_object_accessibility_highlight_set(sd->bx[level], EINA_TRUE);
+        efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
         return EINA_TRUE;
      }
    return EINA_FALSE;
@@ -1762,6 +1763,7 @@ _elm_index_efl_access_component_highlight_clear(Eo *obj EINA_UNUSED, Elm_Index_D
    if (sd->bx[level])
      {
         elm_object_accessibility_highlight_set(sd->bx[level], EINA_FALSE);
+        efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_FALSE);
         return EINA_TRUE;
      }
    return EINA_FALSE;
@@ -1814,6 +1816,7 @@ _elm_index_item_efl_access_component_highlight_grab(Eo *eo_it, Elm_Index_Item_Da
      elm_layout_text_set(obj, "elm.text", strdup(sd->letter));
    elm_layout_signal_emit(obj, "elm,indicator,state,active", "elm");
    elm_object_accessibility_highlight_set(eo_it, EINA_TRUE);
+   efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
    //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item
    // If you call eo_do_super, then you do NOT have to call smart callback.
    evas_object_smart_callback_call(obj, "atspi,highlighted", eo_it);
@@ -1827,6 +1830,7 @@ _elm_index_item_efl_access_component_highlight_clear(Eo *eo_it, Elm_Index_Item_D
    Evas_Object *obj = WIDGET(sd);
    elm_layout_signal_emit(obj, "elm,indicator,state,inactive", "elm");
    elm_object_accessibility_highlight_set(eo_it, EINA_FALSE);
+   efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_FALSE);
    //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item
    // If you call eo_do_super, then you do NOT have to call smart callback.
    evas_object_smart_callback_call(obj, "atspi,unhighlighted", eo_it);

diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 140ac11..a2a8320 100644 (file)
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -3425,7 +3425,7 @@ _elm_list_elm_interface_scrollable_content_pos_set(Eo *obj EINA_UNUSED, Elm_List
          if (next_previous_item)
            {
               elm_object_accessibility_highlight_set(EO_OBJ(next_previous_item), EINA_TRUE);
-              efl_access_active_descendant_changed_signal_emit(obj, EO_OBJ(next_previous_item));
+              efl_access_state_changed_signal_emit(EO_OBJ(next_previous_item), EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
            }
      }
 }

diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 7f8723c..b16f252 100644 (file)
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -3992,7 +3992,7 @@ _elm_toolbar_item_efl_access_component_highlight_clear(Eo *eo_it EINA_UNUSED, El
 {
    elm_object_accessibility_highlight_set(EO_OBJ(it), EINA_FALSE);
    // TIZEN_ONLY(20171114): atspi: expose highlight information on atspi
-   efl_access_active_descendant_changed_signal_emit(WIDGET(it), eo_it);
+   efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_HIGHLIGHTED, EINA_FALSE);
    //
    //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item
    // If you call eo_do_super, then you do NOT have to call smart callback.
@@ -4183,7 +4183,7 @@ _elm_toolbar_elm_interface_scrollable_content_pos_set(Eo *obj EINA_UNUSED, Elm_T
         if (next_previous_item)
           {
              elm_object_accessibility_highlight_set(EO_OBJ(next_previous_item), EINA_TRUE);
-             efl_access_active_descendant_changed_signal_emit(obj, EO_OBJ(next_previous_item));
+             efl_access_state_changed_signal_emit(EO_OBJ(next_previous_item), EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
           }
      }
 }