[Accessibility] Scan direction and method synchronized with universal switch.

Closing of scan parameters ctxpopup in every case.

Change-Id: Iac7f61d3934483d4134acc4049a76f14b173664d

diff --git a/setting-accessibility/include/setting-accessibility.h b/setting-accessibility/include/setting-accessibility.h
index fe44e9a004cca410de78afbbd1eb941b85e66dc6..84d0b3b4e29538206bb7286d8d71afbeaad1e5e8 100755 (executable)
--- a/setting-accessibility/include/setting-accessibility.h
+++ b/setting-accessibility/include/setting-accessibility.h
@@ -209,8 +209,8 @@
 #define ACCESSIBILITY_UNIVERSAL_SWITCH_PLUS_ICON SETTING_ICON_PATH "/plus.png"
 
 
-typedef enum {SM_POINT = 0, SM_ROW} scan_method_t;
-typedef enum {SD_TOP_BOTTOM = 0, SD_BOTTOM_TOP} scan_dir_t;
+typedef enum {SM_POINT = 1, SM_ROW} scan_method_t;
+typedef enum {SD_TOP_BOTTOM = 1, SD_BOTTOM_TOP} scan_dir_t;
 typedef enum {MANAGE_GESTURES, MANAGE_ACTIONS, MANAGE_SETTINGS, MANAGE_RECENT_APPS,
        MANAGE_HOME_SCREEN, MANAGE_BACK, MANAGE_BUTTONS_AND_KEYS, MANAGE_CONTEXTUAL_MENU} manage_options_type_t;
 

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-settings.c b/setting-accessibility/src/setting-accessibility-universal-switch-settings.c
index f58bc61111e15163ecb8012ac74643e4a433a401..6f583472703af65568a6d7ac7be13853508217be 100755 (executable)
--- a/setting-accessibility/src/setting-accessibility-universal-switch-settings.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-settings.c
@@ -261,10 +261,10 @@ static void __ctxpopup_scan_method_click_cb(void *data, Evas_Object *obj, void *
                free(ad->universal_switch_scan_method->sub_desc);
                ad->universal_switch_scan_method->sub_desc = strdup(__get_scan_method_text(scan_method));
                elm_genlist_item_update(ad->universal_switch_scan_method->item);
-
-               __ctxpopup_del_cb(NULL, obj, event_info);
        }
 
+       __ctxpopup_del_cb(NULL, obj, event_info);
+
        SETTING_TRACE_END;
 }
 
@@ -282,10 +282,10 @@ static void __ctxpopup_scan_dir_click_cb(void *data, Evas_Object *obj, void *eve
                free(ad->universal_switch_scan_dir->sub_desc);
                ad->universal_switch_scan_dir->sub_desc = strdup(__get_scan_direction_text(scan_dir));
                elm_genlist_item_update(ad->universal_switch_scan_dir->item);
-
-               __ctxpopup_del_cb(NULL, obj, event_info);
        }
 
+       __ctxpopup_del_cb(NULL, obj, event_info);
+
        SETTING_TRACE_END;
 }