change tracking signal to "focused"

Adjust screen reader for tv profile, remove all highlight dependencies
from application code.

Change-Id: I5f4074f2ae1c127642234e54aebb0c0a0eaa1375

diff --git a/include/pivot_chooser.h b/include/pivot_chooser.h
index 164e84c..16af72e 100644 (file)
--- a/include/pivot_chooser.h
+++ b/include/pivot_chooser.h
@@ -4,7 +4,7 @@
 #include <atspi/atspi.h>
 
 /**
- * @brief Some heuristic choosing candidate to reacieve highlight.
+ * @brief Heuristic choosing first element of the UI.
  *
  * @param win Accessibility search tree object root.
  *

diff --git a/include/screen_reader.h b/include/screen_reader.h
index 177c20f..2202c16 100644 (file)
--- a/include/screen_reader.h
+++ b/include/screen_reader.h
@@ -12,10 +12,8 @@
 #define MAX_POS_REACHED ", end of text reached"
 #define MIN_POS_REACHED ", begin of text reached"
 
-#define HIGHLIGHT_SIG "highlighted"
 #define FOCUS_SIG "focused"
 
-#define HIGHLIGHT_CHANGED_SIG "object:state-changed:highlighted"
 #define FOCUS_CHANGED_SIG "object:state-changed:focused"
 #define VALUE_CHANGED_SIG "object:property-change:accessible-value"
 #define CARET_MOVED_SIG "object:text-caret-moved"

diff --git a/include/smart_notification.h b/include/smart_notification.h
index 85b027e..b98ecc6 100644 (file)
--- a/include/smart_notification.h
+++ b/include/smart_notification.h
@@ -5,7 +5,7 @@
  * @brief Type of notification events.
  *
  * @FOCUS_CHAIN_END_NOTIFICATION_EVENT emitted when
- * currnetly focued or highlighted widget is the last one
+ * currnetly focued widget is the last one
  * in focus chain for application current view.
  *
  * @REALIZED_ITEMS_NOTIFICATION_EVENT

diff --git a/packaging/org.tizen.smart-navigator.spec b/packaging/org.tizen.smart-navigator.spec
index 97073c4..819b7bb 100755 (executable)
--- a/packaging/org.tizen.smart-navigator.spec
+++ b/packaging/org.tizen.smart-navigator.spec
@@ -46,7 +46,7 @@ rm -rf %{buildroot}
 vconftool set -t string db/setting/accessibility/language "en_US" -u 5000 -s smart-navigator -f
 vconftool set -t int db/setting/accessibility/information_level 2 -u 5000 -s smart-navigator -f
 vconftool set -t int db/setting/accessibility/voice 1 -u 5000 -s smart-navigator -f
-vconftool set -t string db/setting/accessibility/tracking_signal "highlighted" -u 5000 -s smart-navigator -f
+vconftool set -t string db/setting/accessibility/tracking_signal "focused" -u 5000 -s smart-navigator -f
 
 %postun -p /sbin/ldconfig
 

diff --git a/src/screen_reader.c b/src/screen_reader.c
index ecc1007..e5065d5 100755 (executable)
--- a/src/screen_reader.c
+++ b/src/screen_reader.c
@@ -18,7 +18,7 @@ Service_Data service_data = {
                .language = "en_US",
                .voice_type = TTS_VOICE_TYPE_FEMALE,
                .reading_speed = 2,
-               .tracking_signal_name = HIGHLIGHT_CHANGED_SIG,
+               .tracking_signal_name = FOCUS_CHANGED_SIG,
 
 
                //Set by tts

diff --git a/src/screen_reader_spi.c b/src/screen_reader_spi.c
index 039f7f8..fd01edf 100644 (file)
--- a/src/screen_reader_spi.c
+++ b/src/screen_reader_spi.c
@@ -57,7 +57,7 @@ Eina_Bool double_click_timer_cb(void *data)
 }
 
 /**
-  * @brief Atspi tracking-signal callback passing current highlighted/focused
+  * @brief Atspi tracking-signal callback passing current focused
   * accessible description to TTS
   *
   * @param AtspiEvent instance
@@ -272,7 +272,7 @@ void spi_init(Service_Data *sd)
     gboolean ret1 = atspi_event_listener_register(sd->state_changed_listener, sd->tracking_signal_name, NULL);
     if(ret1 == false)
       {
-         DEBUG("FAILED TO REGISTER spi focus/highlight listener");
+         DEBUG("FAILED TO REGISTER spi focus listener");
       }
 
     gboolean ret2 = atspi_event_listener_register(sd->caret_moved_listener, CARET_MOVED_SIG, NULL);

diff --git a/src/screen_reader_vconf.c b/src/screen_reader_vconf.c
index 9b04af7..1f5f550 100644 (file)
--- a/src/screen_reader_vconf.c
+++ b/src/screen_reader_vconf.c
@@ -69,10 +69,7 @@ char *fold_tracker_signal(const char *signal_name)
        {
                return FOCUS_CHANGED_SIG;
        }
-       else
-       {
-               return HIGHLIGHT_CHANGED_SIG;
-       }
+        return NULL;
 }
 
 bool set_tracking_listener(Service_Data *sd, const char *signal_name)
@@ -109,7 +106,7 @@ bool set_tracking_listener(Service_Data *sd, const char *signal_name)
        gboolean ret1 = atspi_event_listener_register(sd->state_changed_listener, sd->tracking_signal_name, NULL);
        if(ret1 == false)
        {
-               DEBUG("FAILED TO REGISTER spi focus/highlight listener");
+               DEBUG("FAILED TO REGISTER spi focus listener");
                return false;
        }
        else
@@ -257,7 +254,7 @@ bool vconf_init(Service_Data *service_data)
        vconf_keylist_add_int(keys, "db/setting/accessibility/information_level", 2);
        vconf_keylist_add_str(keys, "db/setting/accessibility/language", "en_US");
        vconf_keylist_add_int(keys, "db/setting/accessibility/voice", 1);
-       vconf_keylist_add_str(keys, "db/setting/accessibility/tracking_signal", HIGHLIGHT_SIG);
+       vconf_keylist_add_str(keys, "db/setting/accessibility/tracking_signal", FOCUS_CHANGED_SIG);
     //-----------------------------------------------------------------------------------
        //vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, EINA_TRUE);