372 { |
372 { |
373 iStateMachine->ChangeState( EPhoneStateAlertingInSingle ); |
373 iStateMachine->ChangeState( EPhoneStateAlertingInSingle ); |
374 } |
374 } |
375 else |
375 else |
376 { |
376 { |
377 iStateMachine->ChangeState( EPhoneStateCallSetupInSingle ); |
377 iStateMachine->ChangeState( EPhoneStateCallSetupInSingle ); |
378 } |
378 } |
379 } |
379 } |
380 } |
380 } |
381 else |
381 else |
382 { |
382 { |
383 // Remove outgoing call |
383 // Remove outgoing call |
|
384 BeginTransEffectLC( ENumberEntryOpen ); |
384 BeginUiUpdateLC(); |
385 BeginUiUpdateLC(); |
385 |
|
386 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
386 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); |
387 |
|
388 CheckIfRestoreNEContentAfterDtmfDialer(); |
387 CheckIfRestoreNEContentAfterDtmfDialer(); |
389 |
|
390 if ( IsNumberEntryUsedL() ) |
388 if ( IsNumberEntryUsedL() ) |
391 { |
389 { |
392 // Show the number entry if it exists |
390 // Show the number entry if it exists |
393 SetNumberEntryVisibilityL(ETrue); |
391 SetNumberEntryVisibilityL(ETrue); |
394 } |
392 } |
395 |
393 |
396 SetTouchPaneButtons( EPhoneConferenceButtons ); |
394 SetTouchPaneButtons( EPhoneConferenceButtons ); |
397 EndUiUpdate(); |
395 EndUiUpdate(); |
398 |
396 EndTransEffect(); |
399 // Go to conference state |
|
400 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
397 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
401 iStateMachine->ChangeState( EPhoneStateConference ); |
398 iStateMachine->ChangeState( EPhoneStateConference ); |
402 } |
399 } |
403 |
400 } |
404 } |
|
405 |
|
406 |
401 |
407 // ----------------------------------------------------------- |
402 // ----------------------------------------------------------- |
408 // CPhoneConferenceAndCallSetup::UpdateInCallCbaL |
403 // CPhoneConferenceAndCallSetup::UpdateInCallCbaL |
409 // ----------------------------------------------------------- |
404 // ----------------------------------------------------------- |
410 // |
405 // |