equal
deleted
inserted
replaced
370 aCallId ); |
370 aCallId ); |
371 |
371 |
372 if( iSingleCallId == aCallId ) |
372 if( iSingleCallId == aCallId ) |
373 { |
373 { |
374 // Idle message came for active call |
374 // Idle message came for active call |
375 BeginUiUpdateLC(); |
375 TransitionHandlerL().BeginUiUpdateLC(); |
376 |
376 |
377 // Remove call |
377 // Remove call |
378 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
378 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
379 |
379 |
380 // Get waiting callId |
380 // Get waiting callId |
421 UpdateSilenceButtonDimming(); |
421 UpdateSilenceButtonDimming(); |
422 |
422 |
423 // Play ringtone |
423 // Play ringtone |
424 SetRingingTonePlaybackL( callStateData.CallId() ); |
424 SetRingingTonePlaybackL( callStateData.CallId() ); |
425 } |
425 } |
426 EndUiUpdate(); |
426 TransitionHandlerL().EndUiUpdate(); |
427 SetToolbarDimming( ETrue ); |
427 SetToolbarDimming( ETrue ); |
428 |
428 |
429 iStateMachine->ChangeState( EPhoneStateIncoming ); |
429 iStateMachine->ChangeState( EPhoneStateIncoming ); |
430 } |
430 } |
431 else |
431 else |
432 { |
432 { |
433 BeginUiUpdateLC(); |
433 TransitionHandlerL().BeginUiUpdateLC(); |
434 |
434 |
435 // Remove call |
435 // Remove call |
436 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
436 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
437 // Idle message came for waiting call |
437 // Idle message came for waiting call |
438 if ( IsNumberEntryUsedL() ) |
438 if ( IsNumberEntryUsedL() ) |
471 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication, |
471 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication, |
472 &uidParam ); |
472 &uidParam ); |
473 } |
473 } |
474 |
474 |
475 SetTouchPaneButtons( EPhoneIncallButtons ); |
475 SetTouchPaneButtons( EPhoneIncallButtons ); |
476 EndUiUpdate(); |
476 TransitionHandlerL().EndUiUpdate(); |
477 // CBA updates in above if-else conditions |
477 // CBA updates in above if-else conditions |
478 iStateMachine->ChangeState( EPhoneStateSingle ); |
478 iStateMachine->ChangeState( EPhoneStateSingle ); |
479 } |
479 } |
480 } |
480 } |
481 |
481 |
581 // |
581 // |
582 void CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL( TInt aCallId ) |
582 void CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL( TInt aCallId ) |
583 { |
583 { |
584 __LOGMETHODSTARTEND( EPhoneUIStates, |
584 __LOGMETHODSTARTEND( EPhoneUIStates, |
585 "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() "); |
585 "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() "); |
586 BeginUiUpdateLC(); |
586 TransitionHandlerL().BeginUiUpdateLC(); |
587 UpdateRemoteInfoDataL ( aCallId ); |
587 UpdateRemoteInfoDataL ( aCallId ); |
588 // Show bubble |
588 // Show bubble |
589 TPhoneCmdParamCallHeaderData callHeaderParam; |
589 TPhoneCmdParamCallHeaderData callHeaderParam; |
590 callHeaderParam.SetCallState( EPEStateConnected ); |
590 callHeaderParam.SetCallState( EPEStateConnected ); |
591 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, |
591 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, |
616 // Set Two singles state softkeys |
616 // Set Two singles state softkeys |
617 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
617 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
618 } |
618 } |
619 |
619 |
620 SetTouchPaneButtons( EPhoneTwoSinglesButtons ); |
620 SetTouchPaneButtons( EPhoneTwoSinglesButtons ); |
621 EndUiUpdate(); |
621 TransitionHandlerL().EndUiUpdate(); |
622 // CBA updates in above if-else conditions |
622 // CBA updates in above if-else conditions |
623 iStateMachine->ChangeState( EPhoneStateTwoSingles ); |
623 iStateMachine->ChangeState( EPhoneStateTwoSingles ); |
624 } |
624 } |
625 |
625 |
626 // --------------------------------------------------------- |
626 // --------------------------------------------------------- |