From: Nibha Sharma Date: Tue, 26 Feb 2019 06:27:10 +0000 (+0530) Subject: [TBT][widget,voluem][NonACR][Fixed widget instruction guide and volume testcase funct... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b78c45a26aac0571e5da8e4eb223b8856893aaf8;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][widget,voluem][NonACR][Fixed widget instruction guide and volume testcase functionality] Change-Id: I8f5fb8aea8e9d8b100628b5f9679b13ed9a265f4 Signed-off-by: Nibha Sharma --- 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 b3400bc..9d2bf98 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 34a4a55..36bea63 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/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c index d92f2cb..44a36b4 100644 --- a/tbtcoreapp/src/model/tbt-list.c +++ b/tbtcoreapp/src/model/tbt-list.c @@ -1731,7 +1731,7 @@ static tbt_info tbtapps[] = .parent = "WIDGET", .apptype = TBT_APP_WIDGET, .icon_name = "dummy", - .info = "1. Press button View Widget UI.
" + .info = "1. Press button Launch Widget.
" "2. A Widget UI written Hello widget will be shown", .result = 0, .required_features_count = 0 diff --git a/tbtcoreapp/src/view/tbt-sound-view.c b/tbtcoreapp/src/view/tbt-sound-view.c index 3b1f243..9113375 100644 --- 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"); @@ -393,9 +394,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); + } } } } @@ -425,6 +443,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); + } + } } } @@ -451,6 +477,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); + } + } } }