Redefine universal-switch vconf keys.

Change-Id: Ibc7d9216bce5ccd508dd2e721b25abffbe71dc51

diff --git a/setting-accessibility/include/setting-accessibility.h b/setting-accessibility/include/setting-accessibility.h
index 7cd03dca4b5f882f7efb3e48247eebfa7f88df69..f019d3e8a8648ba9dc231d339e586afd7f1eac97 100755 (executable)
--- a/setting-accessibility/include/setting-accessibility.h
+++ b/setting-accessibility/include/setting-accessibility.h
@@ -30,8 +30,8 @@
 #include "setting-common-init.h"
 #include "setting-accessibility-universal-switch-dbus.h"
 
-#define VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH "db/setting/accessibility/universal-switch"
-#define VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE "db/setting/accessibility/universal-switch/scanning"
+#define VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_CONFIGURATION_SERVICE "db/setting/accessibility/universal-switch/configuration-service"
+#define VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE "db/setting/accessibility/universal-switch/interaction-service"
 
 #define VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_STATE "db/setting/accessibility/accessibility-launcher"
 #define VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH "db/setting/accessibility/accessibility-launcher/launch"

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-remove-switch.c b/setting-accessibility/src/setting-accessibility-universal-switch-remove-switch.c
index ad8c369d4faf19904ac6ba23161e77039c4c19ed..cfa3a5e6855bbca57aa84cc69e11f3f2fd98d693 100644 (file)
--- a/setting-accessibility/src/setting-accessibility-universal-switch-remove-switch.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-remove-switch.c
@@ -80,8 +80,8 @@ static void __remove_selected_switches_cb(void *data, Evas_Object *obj, void *ev
        ad->popup = NULL;
        elm_naviframe_item_pop(ad->md.naviframe);
 
-       if (disable_universal_switch && vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE, 0))
-               LOGE("Failed to set vconf key %s.", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE);
+       if (disable_universal_switch && vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, 0))
+               LOGE("Failed to set vconf key %s.", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE);
 }
 
 static void __confirm_removing_switches_create_popup(SettingAccessibility *ad)
@@ -91,9 +91,9 @@ static void __confirm_removing_switches_create_popup(SettingAccessibility *ad)
        elm_popup_orient_set(ad->popup, ELM_POPUP_ORIENT_CENTER);
        evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        int vconf_val;
-       int vconf_ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE, &vconf_val);
+       int vconf_ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, &vconf_val);
        retm_if(vconf_ret != 0,
-               "Failed to get vconf bool value VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE. Error: %d", vconf_ret);
+               "Failed to get vconf bool value VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE. Error: %d", vconf_ret);
 
        elm_object_part_text_set(ad->popup, "title,text", _(DEVOPTION_STR_ACCESSIBILITY_UNIVERSAL_SWITCH_DELETE_SWITCHES));
 

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch.c b/setting-accessibility/src/setting-accessibility-universal-switch.c
index 02aa8c44f0095f44fc37b68948dde1857bcb2512..469c0fe24a3a55cb95effc51e6fb06251b2874fd 100644 (file)
--- a/setting-accessibility/src/setting-accessibility-universal-switch.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch.c
@@ -96,8 +96,8 @@ static void __universal_switch_started(void * data)
 static void __start_universal_switch(SettingAccessibility *ad)
 {
        SETTING_TRACE_DEBUG("Starting universal-switch");
-       if (vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH, TRUE) != VCONF_OK) {
-               LOGE("Failed to set vconf key %s", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH);
+       if (vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_CONFIGURATION_SERVICE, TRUE) != VCONF_OK) {
+               LOGE("Failed to set vconf key %s", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_CONFIGURATION_SERVICE);
                return;
        }
 
@@ -109,8 +109,8 @@ static void __stop_universal_switch(SettingAccessibility *ad)
        setting_accessibility_universal_switch_dbus_config_shutdown(&ad->config);
 
        SETTING_TRACE_DEBUG("Stopping universal-switch");
-       if (vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH, FALSE) != VCONF_OK) {
-               LOGE("Failed to set vconf key %s", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH);
+       if (vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_CONFIGURATION_SERVICE, FALSE) != VCONF_OK) {
+               LOGE("Failed to set vconf key %s", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_CONFIGURATION_SERVICE);
        } else {
                SETTING_TRACE_DEBUG("universal-switch stopped");
        }
@@ -122,7 +122,7 @@ static Eina_Bool __naviframe_pop_cb(void *data, Elm_Object_Item *it)
        SETTING_TRACE_BEGIN;
        SettingAccessibility *ad = (SettingAccessibility *)data;
 
-       vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE, __universal_switch_vconf_key_change_cb);
+       vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, __universal_switch_vconf_key_change_cb);
        __stop_universal_switch(ad);
 
        ad->universal_switch_off_checkbox = NULL;
@@ -211,7 +211,7 @@ static void __universal_switch_vconf_key_update(int state, void *data)
 static bool __universal_switch_state_set(bool state)
 {
        SETTING_TRACE_BEGIN;
-       int ret = vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE, state);
+       int ret = vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, state);
        retvm_if(ret != VCONF_OK, false, "Failed to set Universal switch state.");
 
        SETTING_TRACE_END;
@@ -271,12 +271,12 @@ void setting_accessibility_universal_switch_page_create(SettingAccessibility *ad
        elm_object_style_set(genlist, "dialogue");
        elm_genlist_clear(genlist);
 
-       ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE, &state);
+       ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, &state);
        if (ret == VCONF_OK) {
-               ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE, __universal_switch_vconf_key_change_cb, ad);
-               warn_if(ret != VCONF_OK, "FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE)");
+               ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, __universal_switch_vconf_key_change_cb, ad);
+               warn_if(ret != VCONF_OK, "FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE)");
        } else {
-               SETTING_TRACE("FAIL: vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_STATE)");
+               SETTING_TRACE("FAIL: vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE)");
        }
 
        if (ad->launched_by_app_control) {