N_SE-43052

Change-Id: Ic764365aee7c4573de3ec79e99bdd088d0ae077c

diff --git a/res/screen-size-normal/IDL_MAIN_FORM.xml b/res/screen-size-normal/IDL_MAIN_FORM.xml
index afb533a..f42e9c9 100644 (file)
--- a/res/screen-size-normal/IDL_MAIN_FORM.xml
+++ b/res/screen-size-normal/IDL_MAIN_FORM.xml
@@ -35,13 +35,13 @@
         <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="108.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="12.0" marginLeft="0.0" marginRight="27.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_BUTTON_PLAY" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108.0" x="439.0" y="110.0"/>
     </Button>
     <Label id="IDC_LABEL_CURRENTTIME" parent="IDC_PANEL_CONTROLLER">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="00:00:00" textColor="#FFFFFF" textSize="23.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="30.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="130.0" x="26.0" y="170.0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="00:00:00" textColor="#FFFFFF" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="30.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="140.0" x="26.0" y="170.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="30.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="34.0" marginRight="0.0" marginTop="30.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL_CONTROLLER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="130.0" x="34.0" y="30.0"/>
     </Label>
     <Label id="IDC_LABEL_FULLTIME" parent="IDC_PANEL_CONTROLLER">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="00:00:00" textColor="#FFFFFF" textSize="23.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="30.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="130.0" x="564.0" y="170.0"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="00:00:00" textColor="#FFFFFF" textSize="28.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="30.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="140.0" x="564.0" y="170.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="30.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="34.0" marginTop="30.0" mode="Landscape" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_CONTROLLER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="130.0" x="1116.0" y="30.0"/>
     </Label>
     <Slider id="IDC_SLIDER" parent="IDC_PANEL_CONTROLLER">

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 1fbc7df..db970c0
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -69,7 +69,6 @@ static const int MULTI_CONTENT_COUNT = 2;
 
 static const int MESSAGEBOX_DISPLAY_TIME_3_SEC = 3000;
 
-static const int SLIDER_TEXT_FONT_SIZE = 28;
 static const wchar_t* INIT_TIME = L"00:00:00";
 
 static const RequestId REQUEST_UPDATE_WIRED_ACCESSORY_AND_SPEAKER_MENU = 111;
@@ -462,12 +461,10 @@ VideoPlayerForm::InitializeController(void)
        __pCurrenTimeLabel = static_cast<Label*>(__pControllerPanel->GetControl(IDC_LABEL_CURRENTTIME));
        TryCatch(__pCurrenTimeLabel != null, r = E_SYSTEM, "__pCurrenTimeLabel is null");
        __pCurrenTimeLabel->AddTouchEventListener(*this);
-       __pCurrenTimeLabel->SetTextConfig(SLIDER_TEXT_FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
 
        __pTotalTimeLabel = static_cast<Label*>(__pControllerPanel->GetControl(IDC_LABEL_FULLTIME));
        TryCatch(__pTotalTimeLabel != null, r = E_SYSTEM, "__pTotalTimeLabel is null");
        __pTotalTimeLabel->AddTouchEventListener(*this);
-       __pTotalTimeLabel->SetTextConfig(SLIDER_TEXT_FONT_SIZE, LABEL_TEXT_STYLE_NORMAL);
 
        __pSlider = static_cast<Slider*>(__pControllerPanel->GetControl(IDC_SLIDER));
        TryCatch(__pSlider != null, r = E_SYSTEM, "__pSlider is null");