equal
deleted
inserted
replaced
263 // ----------------------------------------------------------- |
263 // ----------------------------------------------------------- |
264 // |
264 // |
265 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId ) |
265 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId ) |
266 { |
266 { |
267 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()"); |
267 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()"); |
268 |
|
269 // Effect is shown when dialer exist. |
|
270 TBool effectStarted ( EFalse ); |
|
271 if ( !NeedToReturnToForegroundAppL() ) |
|
272 { |
|
273 BeginTransEffectLC( ENumberEntryOpen ); |
|
274 effectStarted = ETrue; |
|
275 } |
|
276 |
268 |
277 BeginUiUpdateLC(); |
269 BeginUiUpdateLC(); |
278 |
270 |
279 UpdateRemoteInfoDataL ( aCallId ); |
271 UpdateRemoteInfoDataL ( aCallId ); |
280 |
272 |
305 } |
297 } |
306 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); |
298 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); |
307 SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); |
299 SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); |
308 |
300 |
309 EndUiUpdate(); |
301 EndUiUpdate(); |
310 if( effectStarted ) |
302 |
311 { |
|
312 EndTransEffect(); |
|
313 } |
|
314 // CBA updates in above if-else conditions |
303 // CBA updates in above if-else conditions |
315 iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); |
304 iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); |
316 } |
305 } |
317 |
306 |
318 // ----------------------------------------------------------- |
307 // ----------------------------------------------------------- |
333 iRingingCallId = callStateData.CallId(); |
322 iRingingCallId = callStateData.CallId(); |
334 } |
323 } |
335 |
324 |
336 if( iRingingCallId == aCallId ) |
325 if( iRingingCallId == aCallId ) |
337 { |
326 { |
338 // Effect is shown when dialer exist. |
|
339 TBool effectStarted ( EFalse ); |
|
340 if ( !NeedToReturnToForegroundAppL() ) |
|
341 { |
|
342 BeginTransEffectLC( ENumberEntryOpen ); |
|
343 effectStarted = ETrue; |
|
344 } |
|
345 |
|
346 BeginUiUpdateLC(); |
327 BeginUiUpdateLC(); |
347 |
328 |
348 // Idle message came for waiting call |
329 // Idle message came for waiting call |
349 // Close menu bar, if it is displayed |
330 // Close menu bar, if it is displayed |
350 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); |
331 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); |
384 else |
365 else |
385 { |
366 { |
386 SetTouchPaneButtons( EPhoneConferenceButtons ); |
367 SetTouchPaneButtons( EPhoneConferenceButtons ); |
387 } |
368 } |
388 EndUiUpdate(); |
369 EndUiUpdate(); |
389 if ( effectStarted ) |
370 |
390 { |
|
391 EndTransEffect(); |
|
392 } |
|
393 |
|
394 // Go to conference state |
371 // Go to conference state |
395 // CBA updates in above if-else conditions |
372 // CBA updates in above if-else conditions |
396 iStateMachine->ChangeState( EPhoneStateConference ); |
373 iStateMachine->ChangeState( EPhoneStateConference ); |
397 } |
374 } |
398 else |
375 else |
417 // |
394 // |
418 void CPhoneConferenceAndWaiting::HandleConferenceIdleL() |
395 void CPhoneConferenceAndWaiting::HandleConferenceIdleL() |
419 { |
396 { |
420 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()"); |
397 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()"); |
421 |
398 |
422 BeginTransEffectLC( ENumberEntryOpen ); |
|
423 BeginUiUpdateLC(); |
399 BeginUiUpdateLC(); |
424 |
400 |
425 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); |
401 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); |
426 |
402 |
427 TPhoneCmdParamInteger activeCallCount; |
403 TPhoneCmdParamInteger activeCallCount; |
501 // This case may happen when 'End all calls' because conferenceIdle may |
477 // This case may happen when 'End all calls' because conferenceIdle may |
502 // come earlier than idle for conference member |
478 // come earlier than idle for conference member |
503 break; |
479 break; |
504 } |
480 } |
505 EndUiUpdate(); |
481 EndUiUpdate(); |
506 EndTransEffect(); |
|
507 } |
482 } |
508 |
483 |
509 // ----------------------------------------------------------- |
484 // ----------------------------------------------------------- |
510 // CPhoneConferenceAndWaiting::UpdateInCallCbaL |
485 // CPhoneConferenceAndWaiting::UpdateInCallCbaL |
511 // ----------------------------------------------------------- |
486 // ----------------------------------------------------------- |
523 void CPhoneConferenceAndWaiting::HandleDiallingL( TInt aCallId ) |
498 void CPhoneConferenceAndWaiting::HandleDiallingL( TInt aCallId ) |
524 { |
499 { |
525 __LOGMETHODSTARTEND( EPhoneUIStates, |
500 __LOGMETHODSTARTEND( EPhoneUIStates, |
526 "CPhoneConferenceAndWaiting::HandleDiallingL()"); |
501 "CPhoneConferenceAndWaiting::HandleDiallingL()"); |
527 |
502 |
528 BeginTransEffectLC( ENumberEntryClose ); |
|
529 BeginUiUpdateLC(); |
503 BeginUiUpdateLC(); |
530 // Hide number entry if it exists |
504 // Hide number entry if it exists |
531 SetNumberEntryVisibilityL(EFalse); |
505 SetNumberEntryVisibilityL(EFalse); |
532 |
506 |
533 // Display call setup |
507 // Display call setup |
534 DisplayCallSetupL( aCallId ); |
508 DisplayCallSetupL( aCallId ); |
535 |
509 |
536 SetTouchPaneButtons( EPhoneCallSetupButtons ); |
510 SetTouchPaneButtons( EPhoneCallSetupButtons ); |
537 |
511 |
538 EndUiUpdate(); |
512 EndUiUpdate(); |
539 EndTransEffect(); |
|
540 |
513 |
541 // Update conference and waiting and call setup softkeys |
514 // Update conference and waiting and call setup softkeys |
542 UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); |
515 UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); |
543 |
516 |
544 // Go to conference and waiting and call setup state |
517 // Go to conference and waiting and call setup state |