From: aman.jeph <aman.jeph@samsung.com>
Date: Fri, 4 Sep 2020 09:39:02 +0000 (+0530)
Subject: Fixed following issue in the changes
X-Git-Tag: submit/tizen/20200904.104403^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F243264%2F1;p=profile%2Fiot%2Fapps%2Fnative%2Fvideo-player.git

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 d941e85..c6ea1bf 100755
--- 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 ced4d6c..539d588 100755
--- 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 bbfe18b..dce12d1 100755
--- 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 dd78f5f..6622704 100755
--- 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 7b568a6..7c41621 100755
Binary files a/vp-main/shared/res/org.tizen.video-player.png and b/vp-main/shared/res/org.tizen.video-player.png differ