MCL/sf/app/phone: comparison phoneapp/phoneuistates/src/cphoneconference.cpp

equal deleted inserted replaced

-:5266b1f337bd
+:8baf28733c3d
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
 case EAknSoftkeyCancel:
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 CloseSelectionListL();
 SetTouchPaneButtons( EPhoneConferenceButtons );
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdate();
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 break;
 case EPhoneInCallCmdHold:
 case EPhoneInCallCmdConferenceHold:
 // CPhoneConference:HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneConference::HandleIdleL( TInt aCallId )
 {
-__LOGMETHODSTARTEND( EPhoneUIStates,
+__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleIdleL()");
-"CPhoneConference::HandleIdleL()");
 // Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
 // Stop capturing keys
 CaptureKeysDuringCallNotificationL( EFalse );
 // If dialler is not open then close menu bar.
 if ( !IsNumberEntryUsedL() )
 }
 else
 {
 // Remove call header
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewRemoveCallHeader, aCallId );
 }
 }
 // -----------------------------------------------------------
 // CPhoneConference:HandleConferenceIdleL
 //
 void CPhoneConference::HandleConferenceIdleL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::HandleConferenceIdleL()");
-BeginTransEffectLC( ENumberEntryClose );
+TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
 TPhoneCmdParamInteger activeCallCount;
-iViewCommandHandle->ExecuteCommandL(
+iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCountOfActiveCalls, &activeCallCount );
-EPhoneViewGetCountOfActiveCalls, &activeCallCount );
 switch( activeCallCount.Integer() )
 {
 case ENoActiveCalls:
 MakeStateTransitionToIdleL();
 break;
 case EOneActiveCall:
-{
+if ( !MakeTransitionToWaitingInSingleL() )
-// Fetch ringing call's id from view
-TPhoneCmdParamCallStateData callStateData;
-callStateData.SetCallState( EPEStateRinging );
-iViewCommandHandle->HandleCommandL(
-EPhoneViewGetCallIdByState, &callStateData );
-if( callStateData.CallId() > KErrNotFound )
-{
-CPhonePubSubProxy::Instance()->ChangePropertyValue(
-KPSUidScreenSaver,
-KScreenSaverAllowScreenSaver,
-EPhoneScreensaverNotAllowed );
-UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
-}
-else
 {
 MakeStateTransitionToSingleL();
 }
-}
 break;
 case ETwoActiveCalls:
 MakeStateTransitionToTwoSinglesL();
 break;
 default:
 MakeStateTransitionToTwoSinglesL();
 break;
 }
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdateAndEffect();
-EndTransEffect();
 }
 // -----------------------------------------------------------
 // CPhoneConference::HandleHeldConferenceL
 // -----------------------------------------------------------
 {
 // Set Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 }
 // -----------------------------------------------------------
 // CPhoneConference::HandleConnectedConferenceL
 // -----------------------------------------------------------
 {
 SendGlobalInfoNoteL( EPhoneInformationConferenceActiveted );
 }
 SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
 UpdateInCallCbaL();
 }
 // -----------------------------------------------------------
 // CPhoneConference::OpenDropParticipantSelectionL
 "CPhoneConference::OpenDropParticipantSelectionL()");
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewOpenConferenceList, &booleanParam );
 iCbaManager->SetCbaL( EPhoneDropParticipantCBA );
 }
 // -----------------------------------------------------------
 // CPhoneConference::DropSelectedParticipantL
 "CPhoneConference::DropSelectedParticipantL()");
 // First fetch the call id matching the selected item
 TPhoneViewResponseId response;
 TPhoneCmdParamInteger callId;
 response = iViewCommandHandle->HandleCommandL(
 EPhoneViewSelectedConfMember, &callId );
 if( response == EPhoneViewResponseSuccess )
 {
-// Drop the call from conference
+iStateMachine->SetCallId( callId.Integer() );
-iStateMachine->SetCallId( callId.Integer() );
 iStateMachine->SendPhoneEngineMessage(
 CPEPhoneModelIF::EPEMessageDropConferenceMember );
 }
 }
 // -----------------------------------------------------------
 // CPhoneConference::OpenPrivateSelectionL
 "CPhoneConference::OpenPrivateSelectionL()");
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewOpenConferenceList, &booleanParam );
 iCbaManager->SetCbaL( EPhonePrivateParticipantCBA );
 }
 // -----------------------------------------------------------
 // CPhoneConference::PrivateSelectedParticipantL
 iStateMachine->SetCallId( callId.Integer() );
 iStateMachine->SendPhoneEngineMessage(
 CPEPhoneModelIF::EPEMessageGoOneToOne );
 // Update call view
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 CloseSelectionListL();
 SetTouchPaneButtons( EPhoneConferenceButtons );
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdate();
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
 }
 // -----------------------------------------------------------
 // CPhoneConference::MakeStateTransitionToIdleL
 //
 void CPhoneConference::MakeStateTransitionToIdleL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::MakeStateTransitionToIdleL()");
 SetDefaultFlagsL();
 if ( IsNumberEntryUsedL() )
 {
 if ( NeedToReturnToForegroundAppL() )
 {
 // Return phone to the background if menu application is needed to foreground.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
 // Set Number Entry CBA
 iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
 }
 else
 {
 // Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
 // Close dtmf dialer when call is disconnected.
 if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
 {
 CloseDTMFEditorL();
 // Display idle screen and update CBAs
 DisplayIdleScreenL();
 }
 }
 }
 else if ( !TopAppIsDisplayedL() || NeedToReturnToForegroundAppL() )
 {
-// Close menu bar, if it is displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 // Continue displaying current app but set up the
 // idle screen in the background
 SetupIdleScreenInBackgroundL();
 }
 else
 {
-// Close menu bar, if it is displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-// Display idle screen
 DisplayIdleScreenL();
 }
 // Display call termination note, if necessary
 DisplayCallTerminationNoteL();
 UpdateCbaL( EPhoneEmptyCBA );
-// Go to idle state
 iStateMachine->ChangeState( EPhoneStateIdle );
 }
 // -----------------------------------------------------------
+// CPhoneConference::MakeTransitionToWaitingInSingleL
+// -----------------------------------------------------------
+//
+TBool CPhoneConference::MakeTransitionToWaitingInSingleL()
+{
+__LOGMETHODSTARTEND( EPhoneUIStates,
+"CPhoneConference::MakeTransitionToWaitingInSingleL()");
+TBool retValue(EFalse);
+TPhoneCmdParamCallStateData callStateData;
+callStateData.SetCallState( EPEStateRinging );
+iViewCommandHandle->HandleCommandL(
+EPhoneViewGetCallIdByState, &callStateData );
+if (  callStateData.CallId() > KErrNotFound )
+{
+CPhonePubSubProxy::Instance()->ChangePropertyValue(
+KPSUidScreenSaver,
+KScreenSaverAllowScreenSaver,
+EPhoneScreensaverNotAllowed );
+UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
+retValue = ETrue;
+}
+return retValue;
+}
+// -----------------------------------------------------------
 // CPhoneConference::MakeStateTransitionToSingleL
 // -----------------------------------------------------------
 //
 void CPhoneConference::MakeStateTransitionToSingleL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::MakeStateTransitionToSingleL()");
-// Close menu bar, if it is displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+SetTouchPaneButtons( EPhoneIncallButtons );
-SetTouchPaneButtons( EPhoneIncallButtons );
-// Go to single state
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateSingle );
 }
 // -----------------------------------------------------------
 // CPhoneConference::MakeTransitionToTwoSinglesL
 // -----------------------------------------------------------
 //
 void CPhoneConference::MakeStateTransitionToTwoSinglesL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::MakeStateTransitionToTwoSinglesL()");
-// Close menu bar, if it is displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-// Set Two singles softkeys
 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
+iStateMachine->ChangeState( EPhoneStateTwoSingles );
-// Go to two singles state
-iStateMachine->ChangeState( EPhoneStateTwoSingles );
 }
 // -----------------------------------------------------------
 // CPhoneConference::CloseSelectionListL
 // -----------------------------------------------------------
 //
 void CPhoneConference::HandleIncomingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::HandleIncomingL()");
 CPhonePubSubProxy::Instance()->ChangePropertyValue(
 KPSUidScreenSaver,
 KScreenSaverAllowScreenSaver,
 EPhoneScreensaverNotAllowed );
+TransitionHandlerL().IncomingCallUiUpdateLC();
-IsNumberEntryUsedL() ?
-BeginTransEffectLC( ECallUiAppear ) :
-BeginTransEffectLC( ENumberEntryOpen );
-BeginUiUpdateLC();
 // Hide the number entry if it exists
 if ( IsNumberEntryUsedL() )
 {
 SetNumberEntryVisibilityL( EFalse );
 // Indicate that the menu application on foreground needs to be sent back to the foreground
 // after call is ended.
 SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() );
+// Get allow waiting call header param value.
 TPhoneCmdParamBoolean dialerParam;
 dialerParam.SetBoolean( ETrue );
-// Get allow waiting call header param value.
 AllowShowingOfWaitingCallHeaderL( dialerParam );
 CloseSelectionListL();
 // Close fast swap window if it's displayed
 EikonEnv()->DismissTaskList();
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
-// Display incoming call
 DisplayIncomingCallL( aCallId, dialerParam );
+TransitionHandlerL().EndUiUpdateAndEffect();
-EndUiUpdate();
-EndTransEffect();
-// Go to incoming state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );
 }
 // -----------------------------------------------------------
 void CPhoneConference::HandleWentOneToOneL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::HandleWentOneToOneL()");
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 // Update conference bubble
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewPrivateFromConference, aCallId );
 }
 else
 {
 SetTouchPaneButtons( EPhoneTwoSinglesButtons );
 }
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdate();
 }
 // -----------------------------------------------------------
 // CPhoneConference::OpenParticipantsListL
 // -----------------------------------------------------------
 //
 void CPhoneConference::OpenParticipantsListL()
 {
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenConferenceList,
 &booleanParam );
 SetTouchPaneButtons( EPhoneParticipantListButtons );
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdate();
 iCbaManager->SetCbaL( EPhoneParticipantListCBA );
 // Find out is conference held or not
 TPhoneCmdParamCallStateData callStateData;

branch	RCL_3
changeset 26	8baf28733c3d
parent 25	5266b1f337bd