equal
deleted
inserted
replaced
428 |
428 |
429 iStateMachine->ChangeState( EPhoneStateIncoming ); |
429 iStateMachine->ChangeState( EPhoneStateIncoming ); |
430 } |
430 } |
431 else |
431 else |
432 { |
432 { |
433 // Effect is shown when dialer exist. |
|
434 TBool effectStarted ( EFalse ); |
|
435 if ( !NeedToReturnToForegroundAppL() ) |
|
436 { |
|
437 BeginTransEffectLC( ENumberEntryOpen ); |
|
438 effectStarted = ETrue; |
|
439 } |
|
440 |
|
441 BeginUiUpdateLC(); |
433 BeginUiUpdateLC(); |
442 |
434 |
443 // Remove call |
435 // Remove call |
444 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
436 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
445 |
437 |
473 } |
465 } |
474 } |
466 } |
475 |
467 |
476 SetTouchPaneButtons( EPhoneIncallButtons ); |
468 SetTouchPaneButtons( EPhoneIncallButtons ); |
477 EndUiUpdate(); |
469 EndUiUpdate(); |
478 if( effectStarted ) |
470 |
479 { |
|
480 EndTransEffect(); |
|
481 } |
|
482 // CBA updates in above if-else conditions |
471 // CBA updates in above if-else conditions |
483 iStateMachine->ChangeState( EPhoneStateSingle ); |
472 iStateMachine->ChangeState( EPhoneStateSingle ); |
484 } |
473 } |
485 |
474 |
486 } |
475 } |
588 void CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL( TInt aCallId ) |
577 void CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL( TInt aCallId ) |
589 { |
578 { |
590 __LOGMETHODSTARTEND( EPhoneUIStates, |
579 __LOGMETHODSTARTEND( EPhoneUIStates, |
591 "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() "); |
580 "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() "); |
592 |
581 |
593 // Effect is shown when dialer exist. |
|
594 TBool effectStarted ( EFalse ); |
|
595 if ( !NeedToReturnToForegroundAppL() ) |
|
596 { |
|
597 BeginTransEffectLC( ENumberEntryOpen ); |
|
598 effectStarted = ETrue; |
|
599 } |
|
600 |
|
601 BeginUiUpdateLC(); |
582 BeginUiUpdateLC(); |
602 |
583 |
603 UpdateRemoteInfoDataL ( aCallId ); |
584 UpdateRemoteInfoDataL ( aCallId ); |
604 // Show bubble |
585 // Show bubble |
605 TPhoneCmdParamCallHeaderData callHeaderParam; |
586 TPhoneCmdParamCallHeaderData callHeaderParam; |
634 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
615 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
635 } |
616 } |
636 |
617 |
637 SetTouchPaneButtons( EPhoneTwoSinglesButtons ); |
618 SetTouchPaneButtons( EPhoneTwoSinglesButtons ); |
638 EndUiUpdate(); |
619 EndUiUpdate(); |
639 if( effectStarted ) |
|
640 { |
|
641 EndTransEffect(); |
|
642 } |
|
643 |
620 |
644 // Go to two singles state |
621 // Go to two singles state |
645 // CBA updates in above if-else conditions |
622 // CBA updates in above if-else conditions |
646 iStateMachine->ChangeState( EPhoneStateTwoSingles ); |
623 iStateMachine->ChangeState( EPhoneStateTwoSingles ); |
647 } |
624 } |
678 void CPhoneSingleAndWaiting::HandleDiallingL( TInt aCallId ) |
655 void CPhoneSingleAndWaiting::HandleDiallingL( TInt aCallId ) |
679 { |
656 { |
680 __LOGMETHODSTARTEND( EPhoneUIStates, |
657 __LOGMETHODSTARTEND( EPhoneUIStates, |
681 "CPhoneSingleAndWaiting::HandleDiallingL() "); |
658 "CPhoneSingleAndWaiting::HandleDiallingL() "); |
682 |
659 |
683 BeginTransEffectLC( ENumberEntryClose ); |
|
684 BeginUiUpdateLC(); |
660 BeginUiUpdateLC(); |
685 |
661 |
686 // Hide number entry if it exists |
662 // Hide number entry if it exists |
687 SetNumberEntryVisibilityL(EFalse); |
663 SetNumberEntryVisibilityL(EFalse); |
688 |
664 |
695 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); |
671 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); |
696 |
672 |
697 SetTouchPaneButtons( EPhoneCallSetupButtons ); |
673 SetTouchPaneButtons( EPhoneCallSetupButtons ); |
698 |
674 |
699 EndUiUpdate(); |
675 EndUiUpdate(); |
700 EndTransEffect(); |
|
701 |
676 |
702 // Update call setup CBAs |
677 // Update call setup CBAs |
703 UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); |
678 UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); |
704 |
679 |
705 // Go to Single And Waiting And Call Setup state |
680 // Go to Single And Waiting And Call Setup state |