Fix for 42117 42311 42386

[apps/osp/Call.git] / src / CallBaseForm.cpp

diff --git a/src/CallBaseForm.cpp b/src/CallBaseForm.cpp
index 966b1bb..9361bde 100644 (file)
--- a/src/CallBaseForm.cpp
+++ b/src/CallBaseForm.cpp
@@ -126,20 +126,20 @@ BaseForm::HandleCallConnected(IListT<AppCallInfo>& pCallList)
                        {
                                //single Conference call - goto active Conf. call form
                                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL,
-                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                        }
                        else
                        {
                                //single active call - goto active call form
                                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_ACTIVECALL,
-                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                        }
                }
                else if(noOfCalls == 2)
                {
                        //goto multiple active call form
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_MULTIPLEACTIVECALL,
-                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                }
        }
        break;
@@ -177,7 +177,7 @@ BaseForm::HandleCallConnected(IListT<AppCallInfo>& pCallList)
                        pCallInfoList->Add(pCaller);
                        //single active call - goto active call form
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_ACTIVE_EMERGENCYCALL,
-                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                }
        }
        break;
@@ -259,7 +259,7 @@ BaseForm::HandleCallDisconnected(bool isLastCall, IListT<AppCallInfo>& pCurrentA
                                if (1)
                                {
                                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_ENDCALL,
-                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                                }
                                else
                                {
@@ -274,13 +274,13 @@ BaseForm::HandleCallDisconnected(bool isLastCall, IListT<AppCallInfo>& pCurrentA
                                        if (callInfo.IsConferenceCall() == true)
                                        {
                                                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL,
-                                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                                        }
                                        else
                                        {
                                                //goto Single Active Call form
                                                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_ACTIVECALL,
-                                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                                        }
                                }
                        }
@@ -289,7 +289,7 @@ BaseForm::HandleCallDisconnected(bool isLastCall, IListT<AppCallInfo>& pCurrentA
                {
                        //multiple active calls are present.
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_MULTIPLEACTIVECALL,
-                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
                }
        }
        else
@@ -311,7 +311,7 @@ BaseForm::HandleCallDisconnected(bool isLastCall, IListT<AppCallInfo>& pCurrentA
                        pCallInfoList->Add(pCaller);
                        //multiple active calls are present.
                        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_ENDCALL,
-                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
 
                }
                else
@@ -339,7 +339,7 @@ BaseForm::HandleConferenceCall(AppCallInfo& pCallInfo)
 
        //Todo: create screens for single conf call and conf call with another held call
        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL,
-                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
 }
 
 void
@@ -357,7 +357,7 @@ BaseForm::HandleIncomingCall(AppCallInfo& pCallInfo)
        pCallInfoList->Add(pIncomingCall);
 
        pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_INCOMINGCALL,
-                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
+                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_KEEP), pCallInfoList);
 }
 
 void