From 1a203537257c01eef5aed2235c8ead817c521a7e Mon Sep 17 00:00:00 2001
From: Shinwoo Kim <cinoo.kim@samsung.com>
Date: Mon, 22 Apr 2013 14:18:42 +0900
Subject: [PATCH] [access] make access object unfocusable, when accessibility
 is disabled

---
 legacy/elementary/ChangeLog            |  4 ++++
 legacy/elementary/NEWS                 |  1 +
 legacy/elementary/src/lib/elm_access.c | 11 ++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 8b36108910..8c00e7f9a6 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1268,3 +1268,7 @@
 2013-04-18  Shinwoo Kim
 
         * Add elm_access_action(), elm_access_action_cb_set()
+
+2013-04-22  Shinwoo Kim
+
+        * Make access object unfocusable when Aaccessibility is disabled.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index c8c9f5690d..54a9f057b6 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -211,6 +211,7 @@ Fixes:
    * Fix the calculation double type number.
    * Fix the policy is not changed when the theme is changed.
    * When entry is disabled, scrolling is also disabled.
+   * Make access object unfocusable when Aaccessibility is disabled.
 
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c
index d0b18008e8..1db4393171 100644
--- a/legacy/elementary/src/lib/elm_access.c
+++ b/legacy/elementary/src/lib/elm_access.c
@@ -32,7 +32,7 @@ _elm_access_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
 
-   elm_widget_can_focus_set(obj, EINA_TRUE);
+   elm_widget_can_focus_set(obj, _elm_config->access_mode);
 }
 
 static Eina_Bool
@@ -1293,6 +1293,14 @@ elm_access_external_info_get(const Evas_Object *obj)
    return _elm_access_text_get(ac, ELM_ACCESS_CONTEXT_INFO, obj);
 }
 
+static void
+_elm_access_smart_access(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+{
+   Eina_Bool is_access = va_arg(*list, int);
+
+   elm_widget_can_focus_set(obj, is_access);
+}
+
 static void
 _class_constructor(Eo_Class *klass)
 {
@@ -1303,6 +1311,7 @@ _class_constructor(Eo_Class *klass)
 
         EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_access_smart_on_focus),
         EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_access_smart_activate),
+        EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_access_smart_access),
 
         EO_OP_FUNC_SENTINEL
    };