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

equal deleted inserted replaced

-:e30d4a1b8bad
+:c26cc2a7c548
 void CPhoneConference::ConstructL()
 {
 CPhoneGsmInCall::ConstructL();
 // Re-enable global notes
-TPhoneCmdParamBoolean globalNotifierParam;
+EnableGlobalNotifiersL();
-globalNotifierParam.SetBoolean( EFalse );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
-&globalNotifierParam );
 CPhonePubSubProxy::Instance()->ChangePropertyValue(
 KPSUidScreenSaver,
 KScreenSaverAllowScreenSaver,
 EPhoneScreensaverAllowed );
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
 case EAknSoftkeyCancel:
-TransitionHandlerL().BeginUiUpdateLC();
+BeginUiUpdateLC();
 CloseSelectionListL();
 SetTouchPaneButtons( EPhoneConferenceButtons );
-TransitionHandlerL().EndUiUpdate();
+EndUiUpdate();
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 break;
 case EPhoneInCallCmdHold:
 case EPhoneInCallCmdConferenceHold:
 // CPhoneConference:HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneConference::HandleIdleL( TInt aCallId )
 {
-__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleIdleL()");
+__LOGMETHODSTARTEND( EPhoneUIStates,
+"CPhoneConference::HandleIdleL()");
 // Re-enable global notes
-TPhoneCmdParamBoolean globalNotifierParam;
+EnableGlobalNotifiersL();
-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()");
-TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
+BeginTransEffectLC( ENumberEntryClose );
-TransitionHandlerL().BeginUiUpdateLC();
+BeginUiUpdateLC();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
 TPhoneCmdParamInteger activeCallCount;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCountOfActiveCalls, &activeCallCount );
+iViewCommandHandle->ExecuteCommandL(
+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;
 }
-TransitionHandlerL().EndUiUpdateAndEffect();
+EndUiUpdate();
+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 )
 {
-iStateMachine->SetCallId( callId.Integer() );
+// Drop the call from conference
+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
-TransitionHandlerL().BeginUiUpdateLC();
+BeginUiUpdateLC();
 CloseSelectionListL();
 SetTouchPaneButtons( EPhoneConferenceButtons );
-TransitionHandlerL().EndUiUpdate();
+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() );
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( !TopAppIsDisplayedL() );
-// Get allow waiting call header param value.
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToReturnToForegroundAppStatus,
+&booleanParam );
 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();
+CEikonEnv::Static()->DismissTaskList();
 SetTouchPaneButtons( EPhoneWaitingCallButtons );
+// Display incoming call
 DisplayIncomingCallL( aCallId, dialerParam );
-TransitionHandlerL().EndUiUpdateAndEffect();
+EndUiUpdate();
+EndTransEffect();
+// Go to incoming state
 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );
 }
 // -----------------------------------------------------------
 // CPhoneConference::DisplayIncomingCallL
 // -----------------------------------------------------------
 //
 void CPhoneConference::DisplayIncomingCallL(
 TInt aCallId,
-const TPhoneCmdParamBoolean /*aCommandParam*/ )
+const TPhoneCmdParamBoolean aCommandParam )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::DisplayIncomingCallL()");
 // Close menu bar, if it is displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 // Remove any phone dialogs if they are displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 // Indicate that the Phone needs to be sent to the background if
 // an application other than the top application is in the foreground
-SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() );
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( !TopAppIsDisplayedL() );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToReturnToForegroundAppStatus,
+&booleanParam );
 // Bring Phone app in the foreground
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 void CPhoneConference::HandleWentOneToOneL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneConference::HandleWentOneToOneL()");
-TransitionHandlerL().BeginUiUpdateLC();
+BeginUiUpdateLC();
 // Update conference bubble
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewPrivateFromConference, aCallId );
 }
 else
 {
 SetTouchPaneButtons( EPhoneTwoSinglesButtons );
 }
-TransitionHandlerL().EndUiUpdate();
+EndUiUpdate();
 }
 // -----------------------------------------------------------
 // CPhoneConference::OpenParticipantsListL
 // -----------------------------------------------------------
 //
 void CPhoneConference::OpenParticipantsListL()
 {
-TransitionHandlerL().BeginUiUpdateLC();
+BeginUiUpdateLC();
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenConferenceList,
 &booleanParam );
 SetTouchPaneButtons( EPhoneParticipantListButtons );
-TransitionHandlerL().EndUiUpdate();
+EndUiUpdate();
 iCbaManager->SetCbaL( EPhoneParticipantListCBA );
 // Find out is conference held or not
 TPhoneCmdParamCallStateData callStateData;

branch	RCL_3
changeset 81	c26cc2a7c548
parent 69	8baf28733c3d