[TBT][nfc,volume,widget][NonACR][TNEXT-18071,TNEXT-18072,TNEXT-18073,TNEXT-18068...

Change-Id: I6981dc27643e9a9e2e9d361ca1c30c804757ac61
Signed-off-by: Nibha Sharma <nibha.sharma@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 0d2c13776bb41c60ebc7ebf93e3dfea817568c87..70f443aba9522f2bce4e1c6d25cca7ad26577a1a 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 4efcd81147629a0ff3cfab33ab7d4728a052df29..4b8bdde22b7bdab931ff543b33579590aeebb8b8 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/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
old mode 100644 (file)
new mode 100755 (executable)
index 557a621..68ed4e7
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -1737,7 +1737,7 @@ static tbt_info tbtapps[] =
                        .parent = "WIDGET",
                        .apptype = TBT_APP_WIDGET,
                        .icon_name = "dummy",
-                       .info = "1.     Press button View Widget UI.<br/>"
+                       .info = "1.     Press button Launch Widget.<br/>"
                                        "2. A Widget UI written <b>Hello widget</b> will be shown",
                        .result = 0,
                        .required_features_count = 0

diff --git a/tbtcoreapp/src/view/tbt-nfc-view.c b/tbtcoreapp/src/view/tbt-nfc-view.c
index 763e19c6875cc4984462566913fca73b1dbceb72..4ed76c09ad7edc697be71edfd73edcd2d43ac9a1 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-nfc-view.c
+++ b/tbtcoreapp/src/view/tbt-nfc-view.c
@@ -690,12 +690,13 @@ void _nfc_tag_discovered_cb(nfc_discovered_type_e type, nfc_tag_h tag, void *use
                else    if(type == NFC_DISCOVERED_TYPE_DETACHED)
                {
                          DBG("NFC Discovery Detach");
-                         this->nfc_label = ui_utils_label_add(this->view->layout,  "NFC Discovery Detach");
-                               elm_object_part_content_set(this->view->layout, "nfc_text", this->nfc_label);
+                         ui_utils_label_set_text(this->nfc_label, "NFC Discovery Detach", "left");
+                         // this->nfc_label = ui_utils_label_add(this->view->layout,  "NFC Discovery Detach");
+                               // elm_object_part_content_set(this->view->layout, "nfc_text", this->nfc_label);
                                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);
                }
        }
 }
@@ -824,12 +825,13 @@ void _nfc_p2p_target_discovered_cb(nfc_discovered_type_e type, nfc_p2p_target_h
                else
                {
                                                        DBG("NFC Discovery Detach");
-                                                 this->nfc_label = ui_utils_label_add(this->view->layout,  "NFC Discovery Detach");
-                                                       elm_object_part_content_set(this->view->layout, "nfc_text", this->nfc_label);
+                                                       ui_utils_label_set_text(this->nfc_label, "NFC Discovery Detach", "left");
+                                                 // this->nfc_label = ui_utils_label_add(this->view->layout,  "NFC Discovery Detach");
+                                                       // elm_object_part_content_set(this->view->layout, "nfc_text", this->nfc_label);
                                                        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);
                }
 
 

diff --git a/tbtcoreapp/src/view/tbt-sound-view.c b/tbtcoreapp/src/view/tbt-sound-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 01774ac..5379600
--- a/tbtcoreapp/src/view/tbt-sound-view.c
+++ b/tbtcoreapp/src/view/tbt-sound-view.c
@@ -83,7 +83,7 @@ static Eina_Bool __progressbar_timer_cb(void *data);
 
 static bool was_playing;
 static sound_view *view;
-
+double pauseVolumeLevel;
 
 static Eina_Bool __progressbar_timer_cb(void *data)
 {
@@ -298,6 +298,7 @@ sound_view *sound_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Ite
        RETVM_IF(NULL == navi, NULL, "navi is null");
 
     sound_view *this = NULL;
+    pauseVolumeLevel = 0.0;
     int ret;
     this = calloc(1, sizeof(sound_view));
     RETVM_IF(!this, NULL, "calloc failed");
@@ -397,9 +398,26 @@ static void start_player(sound_view *this)
 
                if(((get_device_type() == DEVICE_WEARABLE_216_432)||(get_device_type() == DEVICE_WEARABLE_360_360)) && this->view->tbt_info->apptype == TBT_APP_SOUND_VOLUME){
                        if (this->progressbar_timer)
-                           ecore_timer_del(this->progressbar_timer);
+                       {
+                               if(pauseVolumeLevel == 0.0)
+                               {
+                                       ecore_timer_del(this->progressbar_timer);
+                                       double value = 0.0;
+                                       if(value == 1.0) value = 0.0;
+                                       value = value + 0.01;
+                                       elm_progressbar_value_set(this->volume_bar, value);
+                                       this->progressbar_timer = ecore_timer_add(0.1, __progressbar_timer_cb, this);
+                               }
+                               else
+                               {
+                                       elm_progressbar_value_set(this->volume_bar, pauseVolumeLevel);
+                                       this->progressbar_timer = ecore_timer_add(0.1, __progressbar_timer_cb, this);
+                               }
+                       }
                        else
+                       {
                                this->progressbar_timer = ecore_timer_add(0.1, __progressbar_timer_cb, this);
+                       }
                }
        }
 }
@@ -429,6 +447,14 @@ static void stop_player(sound_view *this)
             ret = player_set_display_visible(this->player, false);
             RETM_IF(PLAYER_ERROR_NONE!=ret, "player_set_display_visible failed:%s", get_player_error(ret));
         }
+        if(((get_device_type() == DEVICE_WEARABLE_216_432)||(get_device_type() == DEVICE_WEARABLE_360_360)) && this->view->tbt_info->apptype == TBT_APP_SOUND_VOLUME)
+        {
+            if (this->progressbar_timer)
+            {
+                 pauseVolumeLevel = 0.0;
+                 ecore_timer_del(this->progressbar_timer);
+            }
+        }
     }
 }
 
@@ -455,6 +481,14 @@ static void pause_player(sound_view *this)
             ret = player_pause(this->player);
             RETM_IF(PLAYER_ERROR_NONE!=ret, "player_pause failed:%s", get_player_error(ret));
         }
+        if(((get_device_type() == DEVICE_WEARABLE_216_432)||(get_device_type() == DEVICE_WEARABLE_360_360)) && this->view->tbt_info->apptype == TBT_APP_SOUND_VOLUME)
+        {
+            if (this->progressbar_timer)
+            {
+                 pauseVolumeLevel = elm_progressbar_value_get(view->volume_bar);
+                 ecore_timer_del(this->progressbar_timer);
+            }
+        }
     }
 }