FCL/sf/app/phone: comparison phoneapp/phoneuicontrol/src/cphonestateincall.cpp

equal deleted inserted replaced

-:c76a0b1755b9
+:2be0b271d017
 // INCLUDES
 #include <featmgr.h>
 #include <StringLoader.h>
 #include <PSVariables.h>
 #include <hwrmdomainpskeys.h>
-#include <UikonInternalPSKeys.h>
 #include <mpeengineinfo.h>
 #include <videotelcontrolmediatorapi.h>
 #include <MediatorDomainUIDs.h>
 #include <bldvariant.hrh>
 HandleVoiceKeyPressL( aMessage );
 break;
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 case EKeyEnter:
-if ( IsNumberEntryVisibleL() )
+if ( iNumberEntryManager->IsNumberEntryVisibleL() )
 {
 HandleCommandL( EPhoneCmdOptions );
 }
 break;
 #endif
 EXPORT_C void CPhoneStateInCall::HandleNumberEntryClearedL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateInCall::HandleNumberEntryClearedL()" );
 // Update single call CBA when number entry is cleared
-UpdateInCallCbaL();
+UpdateUiCommands();
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::HandlePhoneEngineMessageL
 // -----------------------------------------------------------
 // If there is a waiting call then update header and label
 // else forward message to CPhoneState.
 if ( IsWaitingCallL( aCallId ) )
 {
 // Update remote info data and label.
-UpdateRemoteInfoDataAndLabelL( aCallId, UpdateCallHeaderInfoL( aCallId ) );
+UpdateRemoteInfoDataAndLabelL( aCallId );
 }
 else
 {
 CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId );
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL
 // -----------------------------------------------------------
 //
 void CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL(
-TInt aCallId,
+TInt aCallId )
-TPhoneCmdParamCallHeaderData aCallHeaderParam )
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL ()" );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
-aCallId,
+aCallId );
-&aCallHeaderParam );
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::HandleIdleL
 // -----------------------------------------------------------
 TBool showDialer( EFalse );
 HBufC *phoneNumber = HBufC::NewLC( KPhoneNumberEntryBufferSize );
 TPtr ptr( phoneNumber->Des() );
 TPhoneCmdParamString stringParam;
 stringParam.SetString( &ptr );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
 BeginUiUpdateLC();
 SetDefaultFlagsL();
-if ( IsNumberEntryUsedL() )
+	iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
+if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
 iViewCommandHandle->ExecuteCommand(
 EPhoneViewGetNumberFromEntry,
 &stringParam );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 showDialer = ETrue;
 }
-if ( !TopAppIsDisplayedL() || IsAutoLockOn() )
+if ( IsAutoLockOn() || !showDialer )
 {
-// Continue displaying current app but set up the
+RemoveDialogsAndSendPhoneToBackgroundL();
-// idle screen in the background
-SetupIdleScreenInBackgroundL();
 }
 else if ( showDialer )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewLaunchLogs, &stringParam );
-}
-else
-{
-DisplayIdleScreenL();
 }
 DeleteTouchPaneButtons();
 EndUiUpdate();
 DisplayCallTerminationNoteL();
 CleanupStack::PopAndDestroy( phoneNumber );
 iStateMachine->ChangeState( EPhoneStateIdle );
 }
 // -----------------------------------------------------------
-// CPhoneStateInCall::UpdateInCallCbaL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::UpdateInCallCbaL()
-{
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::UpdateInCallCbaL() ");
-UpdateCbaL( EPhoneCallHandlingInCallCBA );
-}
-// -----------------------------------------------------------
-// CPhoneStateInCall::UpdateCbaL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::UpdateCbaL( TInt aResource )
-{
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::UpdateCbaL() ");
-iCbaManager->UpdateCbaL( aResource );
-}
-// -----------------------------------------------------------
 // CPhoneStateInCall::HandleAudioMuteChangedL
 // -----------------------------------------------------------
 //
 void CPhoneStateInCall::HandleAudioMuteChangedL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateInCall::HandleAudioMuteChangedL()" );
 CPhoneState::HandleAudioMuteChangedL();
-// Update the single call CBA only if the number entry is not
+UpdateUiCommands();
-// used
-if ( !IsNumberEntryUsedL() )
-{
-// Go to current state implementation
-UpdateInCallCbaL();
-}
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::HandleAudioOutputChangedL
 // -----------------------------------------------------------
 //
 void CPhoneStateInCall::HandleAudioOutputChangedL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateInCall::HandleAudioOutputChangedL()" );
 CPhoneState::HandleAudioOutputChangedL();
+UpdateUiCommands();
-UpdateInCallCbaL();
-SetTouchPaneButtons(0);
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::HandleAudioVolumeChangedL
 // -----------------------------------------------------------
 if ( iStateMachine->PhoneEngineInfo()->PhoneNumberIsServiceCode() ||
 phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
 {
 // Send a manual control sequence by providing number
 // information with dial command
-CallFromNumberEntryL();
+iNumberEntryManager->CallFromNumberEntryL();
 }
 else
 {
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageCheckEmergencyNumber );
 }
 CleanupStack::PopAndDestroy( phoneNumber );
 }
 else
 {
-CallFromNumberEntryL();
+iNumberEntryManager->CallFromNumberEntryL();
 }
 break;
 case EPhoneCmdEnd:
 CPhoneState::DisconnectCallL();
 break;
 case EPhoneNumberAcqCmdVideoCall:
 {// Create normal voice call, if number is emergency number.
 // Get the number entry contents
-HBufC* phoneNumber = PhoneNumberFromEntryLC();
+HBufC* phoneNumber = iNumberEntryManager->PhoneNumberFromEntryLC();
 iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber );
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageCheckEmergencyNumber );
 CleanupStack::PopAndDestroy( phoneNumber );}
 break;
-case EPhoneInCallCmdLockKeypad:
-case EPhoneInCallCmdLockScreen:
-LockKeypadL();
-break;
 case EPhoneViewOpenCallHandling:
-if ( IsNumberEntryUsedL() )
+if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 HandleNumberEntryClearedL();
 }
 commandStatus = CPhoneState::HandleCommandL( aCommand );
 break;
-case EPhoneInCallCmdNewCallFind:
 case EPhoneInCallCmdNewCall:
-case EPhoneInCallCmdDtmfListViewSearch:
 case EPhoneInCallCmdDtmfManualQuery:
-case EPhoneCmdDtmfSearch:
 case EPhoneDtmfDialerExit:
 case EPhoneCmdOptions:
 break;
 default:
 iViewCommandHandle->HandleCommandL(
 EPhoneViewGetCallIdByState, &callStateData );
 }
 else
 {
-if ( IsNumberEntryUsedL() )
+iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
-{
-SetNumberEntryVisibilityL(ETrue);
-}
 }
 }
 if( callStateData.CallId() > KErrNotFound )
 {
 {
 __PHONELOG( EOnlyFatal, EPhoneControl,
 "CPhoneStateInCall::DisconnectOutgoingCallL() has negative call id!" );
 __ASSERT_DEBUG( EFalse, Panic( EPhoneCtrlIndexOutOfBounds ) );
 }
-}
-// -----------------------------------------------------------------------------
-// CPhoneStateInCall::LockKeysL
-// -----------------------------------------------------------------------------
-//
-void CPhoneStateInCall::LockKeypadL()
-{
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::LockKeypadL()");
-TInt state = EPSHWRMGripStatusUninitialized;
-if ( !FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider ) )
-{
-TInt err = RProperty::Get( KPSUidHWRM, KHWRMGripStatus, state );
-if ( state == EPSHWRMGripOpen )
-{
-SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
-}
-}
-if ( state != EPSHWRMGripOpen )
-{
-iViewCommandHandle->ExecuteCommandL( EPhoneViewEnableKeyLock );
-}
 }
 // -----------------------------------------------------------------------------
 // CPhoneStateInCall::HandleEndKeyPressL
 // -----------------------------------------------------------------------------
 }
 else
 {
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
-if ( IsNumberEntryContentStored() )
+iNumberEntryManager->ClearNumberEntryContentCacheIfContentStored();
-{
-ClearNumberEntryContentCache();
-}
 }
-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

changeset 77	2be0b271d017
parent 72	c76a0b1755b9
child 76	cfea66083b62