Fix for 45563 45573

Change-Id: Id7bbd155c57d83c22247c438b1b0c943f6b538f7
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>

diff --git a/res/screen-size-normal/IDL_CONFCALL_FORM.xml b/res/screen-size-normal/IDL_CONFCALL_FORM.xml
index acb460c..56eded1 100644 (file)
--- a/res/screen-size-normal/IDL_CONFCALL_FORM.xml
+++ b/res/screen-size-normal/IDL_CONFCALL_FORM.xml
@@ -36,7 +36,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_BACKGROUND_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="24.0" marginRight="0.0" marginTop="6.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_CALLER1_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="487.0" x="584.0" y="98.0"/>
     </Label>
     <Label id="IDC_CALLER1_TIME_LABEL" parent="IDL_CONFCALL_FORM">
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="00:00:01" textColor="#FFFFFF" textSize="30.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="00:00:01" textColor="#8BF632" textSize="30.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PARTICIPANTS_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="24.0" marginTop="6.0" mode="Portrait" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="184.0" x="512.0" y="99.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="24.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONF_CALL_MORE_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="184.0" x="1072.0" y="92.0"/>
     </Label>

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index 8c7dfa8..ddc03aa 100644 (file)
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -277,6 +277,7 @@ ActiveCallForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui
                        {
                                //in Portrait mode it is hidden beneath DTMF Keypad.
                                SetShowStateOnKeypad(false);
+                               DestroyMoreOptionsMenuList();
                        }
                        if(__pDTMFKeypad->GetShowState() == true)
                        {
@@ -580,6 +581,7 @@ ActiveCallForm::OnActionPerformed(const Control& source, int actionId)
                {
                        //hide only in portrait mode.
                        SetShowStateOnKeypad(false);
+                       DestroyMoreOptionsMenuList();
                }
                //Hide the hold button as it goes behind DTMF keypad
                SetHoldButtonShowState(false);

diff --git a/src/CallIncomingCallForm.cpp b/src/CallIncomingCallForm.cpp
index 89f486c..f80d435 100644 (file)
--- a/src/CallIncomingCallForm.cpp
+++ b/src/CallIncomingCallForm.cpp
@@ -629,13 +629,16 @@ IncomingCallForm::OnActionPerformed(const Control& source, int actionId)
 
        case IDA_CREATE_REJECT_CALL_MESSAGE:
        {
-               __pCallPresentor->RejectCall(__incomingCallHandle, true,*__pActiveContactNo);
-               ArrayListT<AppCallInfo>* pCallList  = static_cast<ArrayListT<AppCallInfo>*>(__pCallPresentor->GetCallListN());
-               if(pCallList != null && pCallList->GetCount() > 0)
+               if(__pCallPresentor->IsAppControlRunning() == false)
                {
-                       __pCallPresentor->HandleCallConnected(*pCallList);
+                       __pCallPresentor->RejectCall(__incomingCallHandle, true,*__pActiveContactNo);
+                       ArrayListT<AppCallInfo>* pCallList  = static_cast<ArrayListT<AppCallInfo>*>(__pCallPresentor->GetCallListN());
+                       if(pCallList != null && pCallList->GetCount() > 0)
+                       {
+                               __pCallPresentor->HandleCallConnected(*pCallList);
+                       }
+                       pCallList = null;
                }
-               pCallList = null;
        }
        break;