diff -r 5266b1f337bd -r 8baf28733c3d phoneapp/phoneuistates/src/cphonesinglecall.cpp --- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp Wed Sep 01 12:30:10 2010 +0100 +++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp Tue Sep 14 21:18:17 2010 +0300 @@ -497,15 +497,11 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::HandleIncomingL()"); - CPhonePubSubProxy::Instance()->ChangePropertyValue( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, EPhoneScreensaverNotAllowed ); - IsNumberEntryUsedL() ? - BeginTransEffectLC( ECallUiAppear ) : - BeginTransEffectLC( ENumberEntryOpen ); - BeginUiUpdateLC(); + TransitionHandlerL().IncomingCallUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -513,23 +509,20 @@ SetNumberEntryVisibilityL( EFalse ); } + // Get allow waiting call header param value. TPhoneCmdParamBoolean dialerParam; dialerParam.SetBoolean( ETrue ); - - // Get allow waiting call header param value. AllowShowingOfWaitingCallHeaderL( dialerParam ); // Close fast swap window if it's displayed EikonEnv()->DismissTaskList(); // Show incoming call buttons - SetTouchPaneButtons( EPhoneWaitingCallButtons ); - - // Display incoming call + SetTouchPaneButtons( EPhoneWaitingCallButtons ); + DisplayIncomingCallL( aCallId, dialerParam ); - - EndUiUpdate(); - EndTransEffect(); + TransitionHandlerL().EndUiUpdateAndEffect(); + // This query is required to dismiss // Operation cannot be completed in waiting and single state if ( iSwitchToVideoQuery )