diff -r c76a0b1755b9 -r 2be0b271d017 phoneapp/phoneuistates/src/cphonealerting.cpp --- a/phoneapp/phoneuistates/src/cphonealerting.cpp Fri Sep 17 08:29:19 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Mon Oct 04 00:16:48 2010 +0300 @@ -106,9 +106,9 @@ switch ( aCode ) { case EKeyYes: // send-key - if ( IsNumberEntryUsedL() ) + if ( iNumberEntryManager->IsNumberEntryUsedL() ) { - CallFromNumberEntryL(); + iNumberEntryManager->CallFromNumberEntryL(); } else { @@ -122,20 +122,13 @@ { iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageTerminateAllConnections ); - if ( IsNumberEntryUsedL() ) + if ( iNumberEntryManager->IsNumberEntryUsedL() ) { iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); // Do state-specific operation when number entry is cleared HandleNumberEntryClearedL(); } - if ( !TopAppIsDisplayedL() ) - { - TPhoneCmdParamInteger uidParam; - uidParam.SetInteger( KUidPhoneApplication.iUid ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewBringAppToForeground, &uidParam ); - } } else // handle short end key { @@ -220,15 +213,10 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneAlerting::HandleConnectedL()"); - TPhoneCmdParamBoolean booleanParam; - booleanParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam ); BeginUiUpdateLC(); UpdateSingleActiveCallL( aCallId ); - SetTouchPaneButtons( EPhoneIncallButtons ); + UpdateUiCommands(); EndUiUpdate(); - UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateSingle ); }