[TBT][NFC][NonACR][TFIVE-14896.Fixed edc parameter for UI view]

Change-Id: I6cf95e37f8763d0a744128897c319c93114b7807
Signed-off-by: Amritanshu Pandia <a.pandia1@samsung.com>

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 d82b4d25ea1e2a696eecee260d2cdca70dbe1bb8..b3400bc4a37f534d4738e013ad588bd381ceda10 100755 (executable)
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 0b94bcf98017cb8da3bf973762ade07de45f6d75..34a4a55f555a9fffd0f7b78124f737b5e987d9ad 100755 (executable)
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 dbf9cda0a5a352f6bcebcaefc89069cf5ef29a9f..28e215055812439c3aae905777b017bb32d5562d 100644 (file)
--- 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;
 
 }