equal
deleted
inserted
replaced
96 CPhonePubSubProxy::Instance()->ChangePropertyValue( |
96 CPhonePubSubProxy::Instance()->ChangePropertyValue( |
97 KPSUidScreenSaver, |
97 KPSUidScreenSaver, |
98 KScreenSaverAllowScreenSaver, |
98 KScreenSaverAllowScreenSaver, |
99 EPhoneScreensaverNotAllowed ); |
99 EPhoneScreensaverNotAllowed ); |
100 } |
100 } |
|
101 |
|
102 if ( IsKeyLockOn() ) |
|
103 { |
|
104 iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote ); |
|
105 } |
|
106 |
101 } |
107 } |
102 |
108 |
103 // ----------------------------------------------------------- |
109 // ----------------------------------------------------------- |
104 // CPhoneStateCallSetup::NewL() |
110 // CPhoneStateCallSetup::NewL() |
105 // Constructor |
111 // Constructor |
568 // CPhoneStateCallSetup::HandleConnectedL |
574 // CPhoneStateCallSetup::HandleConnectedL |
569 // ----------------------------------------------------------- |
575 // ----------------------------------------------------------- |
570 // |
576 // |
571 void CPhoneStateCallSetup::HandleConnectedL( TInt aCallId ) |
577 void CPhoneStateCallSetup::HandleConnectedL( TInt aCallId ) |
572 { |
578 { |
573 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()"); |
579 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()"); |
574 |
|
575 // Close menu bar, if it is displayed |
|
576 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); |
580 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); |
577 |
581 |
578 BeginUiUpdateLC(); |
582 TransitionHandlerL().BeginUiUpdateLC(); |
579 |
583 |
580 // Remove the number entry if it isn't DTMF dialer |
584 // Remove the number entry if it isn't DTMF dialer |
581 if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() ) |
585 if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() ) |
582 { |
586 { |
583 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
587 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
595 // Update touch buttons |
599 // Update touch buttons |
596 SetTouchPaneButtons( EPhoneIncallButtons ); |
600 SetTouchPaneButtons( EPhoneIncallButtons ); |
597 |
601 |
598 SetToolbarDimming( EFalse ); |
602 SetToolbarDimming( EFalse ); |
599 |
603 |
600 EndUiUpdate(); |
604 TransitionHandlerL().EndUiUpdate(); |
601 |
605 |
602 // Go to single state |
|
603 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
606 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
604 |
|
605 iStateMachine->ChangeState( EPhoneStateSingle ); |
607 iStateMachine->ChangeState( EPhoneStateSingle ); |
606 } |
608 } |
607 |
609 |
608 // ----------------------------------------------------------- |
610 // ----------------------------------------------------------- |
609 // CPhoneStateCallSetup::HandleIdleL |
611 // CPhoneStateCallSetup::HandleIdleL |
613 { |
615 { |
614 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleIdleL()"); |
616 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleIdleL()"); |
615 if ( !NeedToReturnToForegroundAppL() && |
617 if ( !NeedToReturnToForegroundAppL() && |
616 IsNumberEntryUsedL() ) |
618 IsNumberEntryUsedL() ) |
617 { |
619 { |
618 BeginTransEffectLC( ECallUiDisappear ); |
620 TransitionHandlerL(). |
|
621 BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ); |
619 } |
622 } |
620 else |
623 else |
621 { |
624 { |
622 BeginTransEffectLC( ENumberEntryOpen ); |
625 TransitionHandlerL(). |
623 } |
626 BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); |
624 BeginUiUpdateLC(); |
627 } |
|
628 TransitionHandlerL().BeginUiUpdateLC(); |
625 |
629 |
626 // Disable the volume display |
630 // Disable the volume display |
627 iViewCommandHandle->ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume ); |
631 iViewCommandHandle->ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume ); |
628 |
632 |
629 // Remove call |
633 // Remove call |
662 __PHONELOG( EBasic,EPhoneControl,"CPhoneStateCallSetup::elseif2"); |
666 __PHONELOG( EBasic,EPhoneControl,"CPhoneStateCallSetup::elseif2"); |
663 // Display idle screen |
667 // Display idle screen |
664 DisplayIdleScreenL(); |
668 DisplayIdleScreenL(); |
665 } |
669 } |
666 |
670 |
667 EndUiUpdate(); |
671 TransitionHandlerL().EndUiUpdateAndEffect(); |
668 EndTransEffect(); |
|
669 // No need update cba |
672 // No need update cba |
670 iStateMachine->ChangeState( EPhoneStateIdle ); |
673 iStateMachine->ChangeState( EPhoneStateIdle ); |
671 } |
674 } |
672 |
675 |
673 // ----------------------------------------------------------------------------- |
676 // ----------------------------------------------------------------------------- |