From b6e04c541e2bb0dc994bc51e6f9cfd766e2ffe9e Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 5 Jul 2016 14:22:35 +0900 Subject: [PATCH] Fix the UI issue for timeout radio button Change-Id: Ib1d700073f4546c76771db5bf985f01d103bffb6 Signed-off-by: DoHyun Pyun --- src/libraries/bt-callback.c | 8 ++++---- src/libraries/bt-util.c | 2 +- src/ui/bt-main-view.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libraries/bt-callback.c b/src/libraries/bt-callback.c index 4adf0c9..a973d58 100644 --- a/src/libraries/bt-callback.c +++ b/src/libraries/bt-callback.c @@ -205,7 +205,7 @@ static void __bt_cb_disable(int result, void *data) if (ugd->visibility_timeout != BT_ALWAYS_ON) { ugd->visibility_timeout = 0; - ugd->selected_radio = 0; + ugd->selected_radio = 1; } evas_object_del(ugd->scan_btn); @@ -505,7 +505,7 @@ static gboolean __bt_cb_visible_timeout_cb(gpointer user_data) ugd->timeout_id = 0; ugd->visibility_timeout = 0; ugd->remain_time = 0; - ugd->selected_radio = 0; + ugd->selected_radio = 1; elm_genlist_realized_items_update(ugd->main_genlist); @@ -629,11 +629,11 @@ BT_DBG(""); if (visibility_mode == BT_ADAPTER_VISIBILITY_MODE_NON_DISCOVERABLE) { ugd->visible = FALSE; ugd->visibility_timeout = 0; - ugd->selected_radio = 0; + ugd->selected_radio = 1; } else if (visibility_mode == BT_ADAPTER_VISIBILITY_MODE_GENERAL_DISCOVERABLE) { ugd->visible = TRUE; ugd->visibility_timeout = -1; - ugd->selected_radio = 4; + ugd->selected_radio = 5; } else { /* BT_ADAPTER_VISIBILITY_MODE_LIMITED_DISCOVERABLE */ /* Need to add the code for getting timeout */ diff --git a/src/libraries/bt-util.c b/src/libraries/bt-util.c index eb74ab8..538377f 100644 --- a/src/libraries/bt-util.c +++ b/src/libraries/bt-util.c @@ -293,7 +293,7 @@ int _bt_util_get_timeout_index(int timeout) index = 5; break; default: - index = 0; + index = 1; break; } diff --git a/src/ui/bt-main-view.c b/src/ui/bt-main-view.c index d5c5608..1531afd 100644 --- a/src/ui/bt-main-view.c +++ b/src/ui/bt-main-view.c @@ -468,7 +468,7 @@ static gboolean __bt_main_visible_timeout_cb(gpointer user_data) ugd->timeout_id = 0; ugd->visibility_timeout = 0; ugd->remain_time = 0; - ugd->selected_radio = 0; + ugd->selected_radio = 1; elm_genlist_realized_items_update(ugd->main_genlist); @@ -593,6 +593,7 @@ static Evas_Object *__bt_main_timeout_value_icon_get(void *data, btn = elm_radio_add(obj); elm_radio_state_value_set(btn, item->index); elm_radio_group_add(btn, ugd->radio_main); + elm_radio_value_set(ugd->radio_main, ugd->selected_radio); #ifdef KIRAN_ACCESSIBILITY elm_access_object_unregister(btn); -- 2.7.4