Fixed following issue in the changes

1. Added new icon for Video-Player [TIZENIOT-1915]
2. Selected tab issue [TIZENIOT-1909]
3. Playback speed popup design [TIZENIOT-1795]
4. Volume/Brightness gesture issue with quickpanle [TIZENIOT-1790]

Change-Id: I4c3ced1cbbc58dd5c41aaca9010e48cd30ba5db0
Signed-off-by: aman.jeph <aman.jeph@samsung.com>

diff --git a/packaging/org.tizen.videos.spec b/packaging/org.tizen.videos.spec
index d941e85bc231536b5c70589cfb596c466e896526..c6ea1bf8500ad898f4cc3295130fa240b5f3c3dc 100755 (executable)
--- a/packaging/org.tizen.videos.spec
+++ b/packaging/org.tizen.videos.spec
@@ -3,7 +3,7 @@ Summary:    video library & store
 Version:    1.0.40
 Release:    1
 Group:      Applications
-License:    Flora-1.1
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 
 %if "%{?tizen_profile_name}" == "wearable" || "%{?tizen_profile_name}" == "tv"
@@ -70,7 +70,7 @@ Description: chapter video manange app for video-player.
 %package -n org.tizen.video-player
 Summary:    video file video-player.
 Group:      Applications
-License:    Flora-1.1
+License:    Apache-2.0
 
 %description -n org.tizen.video-player
 

diff --git a/playview/src/feature/vp-play-speed.c b/playview/src/feature/vp-play-speed.c
index ced4d6c32c7c7a0f428bf160e26319a6cef622f3..539d588bc73ba87120e4ba47f441a49f45545419 100755 (executable)
--- a/playview/src/feature/vp-play-speed.c
+++ b/playview/src/feature/vp-play-speed.c
@@ -297,11 +297,12 @@ static void _vp_play_speed_update_text(PlaySpeedPopup * pPlaySpeedPopup)
        }
 
        char szValue[4] = { 0, };
-
-       snprintf(szValue, 4, "%0.1f", (double) pPlaySpeedPopup->fSpeedVal);
-       elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title",
-                                                        szValue);
-
+       if(pPlaySpeedPopup->fSpeedVal > 0.94999999 && pPlaySpeedPopup->fSpeedVal <= 1.05000001 ) {
+               elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title", "1");
+       } else {
+               snprintf(szValue, 4, "%0.1f", (double) pPlaySpeedPopup->fSpeedVal);
+               elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title", szValue);
+       }
 }
 
 /**
@@ -351,7 +352,7 @@ static Evas_Object *_vp_play_speed_popup_create_cancel_button(Evas_Object
 
        Evas_Object *pObj = NULL;
        pObj = elm_button_add(pParent);
-       elm_object_style_set(pObj, "popup_button/default");
+       elm_object_style_set(pObj, "border");
        elm_object_domain_translatable_text_set(pObj, VP_SYS_STR_PREFIX,
                                                                                        VP_PLAY_STRING_COM_CANCEL);
        elm_object_part_content_set(pParent, "button1", pObj);

diff --git a/src/view/mp-video-list-view-main.c b/src/view/mp-video-list-view-main.c
index bbfe18b595b7492c08437e2f5bd2d4ec541267d2..dce12d156e966474dc78b0f6979e4e00fb0fba3a 100755 (executable)
--- a/src/view/mp-video-list-view-main.c
+++ b/src/view/mp-video-list-view-main.c
@@ -1212,6 +1212,7 @@ Evas_Object* mp_list_view_create_toolbar(Evas_Object* naviframe)
        elm_object_style_set(toolbar, "tabbar");
        elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
        elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
+       elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
 
        g_pToolbarItemData.videos_item = elm_toolbar_item_append(toolbar, NULL, TOOLBAR_BUTTON_VIDEOS, toolbar_videos_item_cb, NULL);
        g_pToolbarItemData.folders_item = elm_toolbar_item_append(toolbar, NULL, TOOLBAR_BUTTOn_FOLDERS, toolbar_folders_item_cb, NULL);

diff --git a/vp-main/res/edje/custom/pv-custom-layout.edc b/vp-main/res/edje/custom/pv-custom-layout.edc
index dd78f5f21aa46704b5963d571345fadad16f87d7..6622704d0091fbba585cc461f7f006b39e5586ae 100755 (executable)
--- a/vp-main/res/edje/custom/pv-custom-layout.edc
+++ b/vp-main/res/edje/custom/pv-custom-layout.edc
@@ -33,7 +33,7 @@
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0; }
+                               rel1 { relative: 0.0 0.0; offset: 0 50; }
                                rel2 { relative: 1.0 1.0; }
                        }
                }

diff --git a/vp-main/shared/res/org.tizen.video-player.png b/vp-main/shared/res/org.tizen.video-player.png
index 7b568a6084fd0f1aa600e8aff7a33bc4365e2efc..7c41621bbda4c9371fcb01f3f82bd4392fa810ca 100755 (executable)
Binary files a/vp-main/shared/res/org.tizen.video-player.png and b/vp-main/shared/res/org.tizen.video-player.png differ