diff options
author | segwon <segwon.han@samsung.com> | 2016-11-30 20:07:17 +0900 |
---|---|---|
committer | segwon <segwon.han@samsung.com> | 2016-11-30 20:09:17 +0900 |
commit | 3517ec52ef2495fd037c3d00c904bb3086c99661 (patch) | |
tree | 5bbc2ee0d193d41b8ec2bec82018ae48e7877aef | |
parent | 43be39aac532ae18af4ee4e820fcf6ceef3c6eeb (diff) | |
download | d2d-conv-setting-3517ec52ef2495fd037c3d00c904bb3086c99661.tar.gz d2d-conv-setting-3517ec52ef2495fd037c3d00c904bb3086c99661.tar.bz2 d2d-conv-setting-3517ec52ef2495fd037c3d00c904bb3086c99661.zip |
bug fix and add event state the APP_PAUSE, APP_RESUME, APP_TERMINATE.submit/tizen_3.0/20161130.105800accepted/tizen/3.0/mobile/20161201.074355
Signed-off-by: segwon <segwon.han@samsung.com>
Change-Id: I1e13fd374b00d7c6e7d77370db2f7794f9737801
-rw-r--r-- | inc/main.h | 5 | ||||
-rw-r--r-- | src/main.c | 6 | ||||
-rw-r--r-- | src/ui/setting_item_device_list.c | 13 |
3 files changed, 18 insertions, 6 deletions
@@ -44,7 +44,10 @@ typedef enum state { POWER_ON, DISCOVERY_START, DISCOVERY_STOP, - CHANGE_LANGUAGE + CHANGE_LANGUAGE, + APP_PAUSE, + APP_RESUME, + APP_TERMINATE } state_e; #define TITLE_TEXT dgettext(PACKAGE, "D2D_CONV_SETTING_M_TITLE_TEXT") @@ -48,17 +48,17 @@ static void app_control(app_control_h app_control, void *data) static void app_pause(void *data) { - // Empty + state_change_event(APP_PAUSE); } static void app_resume(void *data) { - // Empty + state_change_event(APP_RESUME); } static void app_terminate(void *data) { - // Empty + state_change_event(APP_TERMINATE); } int main(int argc, char *argv[]) diff --git a/src/ui/setting_item_device_list.c b/src/ui/setting_item_device_list.c index 85f6153..c22e9d8 100644 --- a/src/ui/setting_item_device_list.c +++ b/src/ui/setting_item_device_list.c @@ -170,13 +170,13 @@ static void gl_expanded_cb(void *data, Evas_Object *obj, void *event_info) } else if (!strcmp(ALLOWED_DEVICE_LIST_TEXT, type)) { for (index = 0; index <= permitted_devices_index; index++){ if (permitted_devices_info[index] != NULL) { - elm_genlist_item_append(list, device_item_builder, permitted_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, discovered_devices_info[index]); + elm_genlist_item_append(list, device_item_builder, permitted_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, permitted_devices_info[index]); } } } else if (!strcmp(DENIED_DEVICE_LIST_TEXT, type)) { for (index = 0; index <= denied_devices_index; index++){ if (denied_devices_info[index] != NULL) { - elm_genlist_item_append(list, device_item_builder, denied_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, discovered_devices_info[index]); + elm_genlist_item_append(list, device_item_builder, denied_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, denied_devices_info[index]); } } } @@ -350,6 +350,15 @@ static void state_change_event_listener (state_e state) case CHANGE_LANGUAGE : elm_genlist_realized_items_update(group_list_item); break; + case APP_PAUSE : + discovery_stop(); + break; + case APP_RESUME : + set_acl_device_list(); + break; + case APP_TERMINATE : + discovery_stop(); + break; default : break; } |