[tbtcoreapp][Non-ACR][Fixed TFIVE-14018,TFIVE-14017,TFIVE-14016]

Change-Id: I8cd2fdb5930498ba2eaf5e671a9e60b3c644449e
Signed-off-by: Awadhesh Singh <awadhesh1.s@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 9430ddae7b629d38a2e86f554d8c8e4192739007..46c85620100604f5460cd3c8763f99c12042beee 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 df10270cb7f14b7831f347cb32992ac52f1cf12a..4bd81fa58ec89fdf7a2858cf87cedc4e5b2c1ad8 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/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc
index b28b730490ba9c1fecaf43f5d128854056386029..91e13d3587328e64fe73a3032f708c90d8b5a303 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc
@@ -28,8 +28,8 @@ collections
                     state: "default" 0.0;
                     align: 0.0 0.0;
                     visible: 1;
-                    rel1 {relative: 0.0 0.0; }
-                    rel2 {relative: 0.50 0.10; }
+                    rel1 {relative: 0.0 0.2; }
+                    rel2 {relative: 0.80 0.10; }
                 }
             }
 
@@ -43,7 +43,7 @@ collections
                         relative: 0.0 0.10;
                     }
                     rel2{
-                        relative: 0.50 0.60;
+                        relative: 0.80 0.60;
                     }
                 }
             }
@@ -55,7 +55,7 @@ collections
                     state: "default" 0.0;
                     align: 0.0 0.0;
                     visible: 1;
-                    rel1 {relative: 0.50 0.0;}
+                    rel1 {relative: 0.80 0.0;}
                     rel2 {relative: 1.0 0.10; }
                 }
             }

diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index abf67ed49130ccdddb2f4e25afb44d17cda9c864..ba3a3afeffabdc85d10e646fe0d1cef4b6f39d73 100644 (file)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -912,9 +912,7 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_LOCAL_MPEG4,
                        .icon_name = "dummy",
                        .file_name = "video/sampleMPEG4.mp4",
-                       .info = "1. Press <b>Play</b> button to Play Mpeg4 video file"
-                                       "2.     Press Pause to pause the video."
-                                       "3.     Press Stop to stop the video.",
+                       .info = "1. Press <b>Play</b> button to Play Mpeg4 video file",
                        .result = 0
                },
        #endif
@@ -928,9 +926,7 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_LOCAL_H263,
                        .icon_name = "dummy",
                        .file_name = "video/sampleH263.3gp",
-                       .info = "1. Press <b>Play</b> button to Play H263 video file"
-                                       "2.     Press Pause to pause the video."
-                                       "3.     Press Stop to stop the video.",
+                       .info = "1. Press <b>Play</b> button to Play H263 video file",
                        .result = 0
                },
        #endif
@@ -944,9 +940,7 @@ static tbt_info tbtapps[] =
                        .apptype = TBT_APP_LOCAL_H264,
                        .icon_name = "dummy",
                        .file_name = "video/sampleH264.mp4",
-                       .info = "1. Press <b>Play</b> button to Play H264 video file"
-                                       "2.     Press Pause to pause the video."
-                                       "3.     Press Stop to stop the video.",
+                       .info = "1. Press <b>Play</b> button to Play H264 video file",
                        .result = 0
                },
        #endif

diff --git a/tbtcoreapp/src/view/tbt-nfc-view.c b/tbtcoreapp/src/view/tbt-nfc-view.c
index dea4bf91fc40c89538b87495f9779c78d645a134..dbf9cda0a5a352f6bcebcaefc89069cf5ef29a9f 100644 (file)
--- a/tbtcoreapp/src/view/tbt-nfc-view.c
+++ b/tbtcoreapp/src/view/tbt-nfc-view.c
@@ -116,18 +116,18 @@ nfc_view *nfc_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *i
     this->view = calloc(1, sizeof(common_view));
     RETVM_IF(!this->view, NULL, "calloc failed");
 
-//     if(tbt_info->apptype == TBT_APP_NFC_TAG)
-//     {
-               tbt_info->layout_group = "5_part_cnt_txt_cnt_btn_btn";
-               tbt_info->layout_file = get_edje_path("5_part_cnt_txt_cnt1.25_btn_btn.edj");
+       if(tbt_info->apptype == TBT_APP_NFC_TAG)
+       {
+               tbt_info->layout_group = "nfc_viewer_tag";
+               tbt_info->layout_file = get_edje_path("nfc_viewer.edj");
 
 
-//     }
-//     else if(tbt_info->apptype == TBT_APP_NFC_P2P)
-//     {
-//             tbt_info->layout_group = "nfc_viewer_p2p";
-//             tbt_info->layout_file = get_edje_path("nfc_viewer.edj");
-//     }
+       }
+       else if(tbt_info->apptype == TBT_APP_NFC_P2P)
+       {
+               tbt_info->layout_group = "nfc_viewer_p2p";
+               tbt_info->layout_file = get_edje_path("nfc_viewer.edj");
+       }
 
     common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
     RETVM_IF(!this->view, NULL, "view NULL after common_view_add");
@@ -151,12 +151,12 @@ nfc_view *nfc_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *i
 
        is_tab_1_clicked = true;
     this->nfc_label = ui_utils_label_add(this->view->layout, "NFC Read");
-       elm_object_part_content_set(this->view->layout, "1cnt_2txt", this->nfc_label);
+       elm_object_part_content_set(this->view->layout, "nfc_text", this->nfc_label);
 
        this->nfc_list = elm_list_add(this->view->layout);
        RETVM_IF(!this->nfc_list, NULL, "elm_list_add failed");
        evas_object_data_set(this->nfc_list, "nfc_view", this);
-       elm_object_part_content_set(this->view->layout, "1cnt_2txt_3cnt", this->nfc_list);
+       elm_object_part_content_set(this->view->layout, "nfc_list", this->nfc_list);
 
 
        initialize_nfc(this);