From: Amritanshu Pandia Date: Mon, 22 Oct 2018 05:24:49 +0000 (+0530) Subject: [TBT][NFC][NonACR][TFIVE-14896.Fixed edc parameter for UI view] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b300a84e95bcdf77650ca238024f90fba79c7107;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][NFC][NonACR][TFIVE-14896.Fixed edc parameter for UI view] Change-Id: I6cf95e37f8763d0a744128897c319c93114b7807 Signed-off-by: Amritanshu Pandia --- diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk index d82b4d2..b3400bc 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk index 0b94bcf..34a4a55 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ diff --git a/tbtcoreapp/src/view/tbt-nfc-view.c b/tbtcoreapp/src/view/tbt-nfc-view.c index dbf9cda..28e2150 100644 --- a/tbtcoreapp/src/view/tbt-nfc-view.c +++ b/tbtcoreapp/src/view/tbt-nfc-view.c @@ -144,6 +144,7 @@ nfc_view *nfc_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *i elm_object_item_part_content_set(nf_it, "tabbar", tabbar); #else tabbar = wearable_create_2_text_with_title_tabbar(nf, this); + elm_object_item_part_content_set(nf_it, "nfc_tabbar", tabbar); #endif @@ -689,7 +690,7 @@ void _nfc_tag_discovered_cb(nfc_discovered_type_e type, nfc_tag_h tag, void *use this->nfc_list = elm_list_add(this->view->layout); evas_object_data_set(this->nfc_list, "nfc_view", this); elm_object_part_content_set(this->view->layout, "nfc_list", this->nfc_list); - ui_utils_show_toast("NFC Discovery Detach", this->view->layout, 3); + // ui_utils_show_toast("NFC Discovery Detach", this->view->layout, 3); } } } @@ -823,7 +824,7 @@ void _nfc_p2p_target_discovered_cb(nfc_discovered_type_e type, nfc_p2p_target_h this->nfc_list = elm_list_add(this->view->layout); evas_object_data_set(this->nfc_list, "nfc_view", this); elm_object_part_content_set(this->view->layout, "nfc_list", this->nfc_list); - ui_utils_show_toast("NFC Discovery Detach", this->view->layout, 3); + //ui_utils_show_toast("NFC Discovery Detach", this->view->layout, 3); } @@ -1254,7 +1255,7 @@ static Evas_Object* wearable_create_2_text_with_title_tabbar(Evas_Object *parent elm_table_pack(table, btn1, 0, 0, 1, 1); elm_table_pack(table, btn2, 1, 0, 1, 1); - elm_object_part_content_set(this->view->layout, "1cnt", table); + elm_object_part_content_set(this->view->layout, "nfc_tabbar", table); return table; }