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

equal deleted inserted replaced

-:bab96b7ed1a4
+:f39ed5e045e0
 #include "tphonecmdparaminteger.h"
 #include "tphonecmdparamstring.h"
 #include "tphonecmdparamnote.h"
 #include "tphonecmdparamquery.h"
 #include "tphonecmdparamcallstatedata.h"
+#include "tphonecmdparamkeycapture.h"
 #include "tphonecmdparamsfidata.h"
 #include "mphonestatemachine.h"
 #include "phonestatedefinitions.h"
 #include "phoneviewcommanddefinitions.h"
 #include "phoneui.hrh"
 case MEngineMonitor::EPEMessageSentDTMF:
 case MEngineMonitor::EPEMessageDTMFSendingAborted:
 CancelDTMFSendingL();
 break;
-case MEngineMonitor::EPEMessagePromptSpeedDial:
-HandleDTMFPromptSpeedDialL();
-break;
-case MEngineMonitor::EPEMessageSpeedDialNotAssigned:
-CPhoneState::SendGlobalErrorNoteL(
-EPhoneDtmfSpeedDialNotAssigned );
-break;
-case MEngineMonitor::EPEMessageInvalidSpeedDial:
-CPhoneState::SendGlobalErrorNoteL( EPhoneDtmfInvalidSpeedDial );
-break;
 case MEngineMonitor::EPEMessageAudioVolumeChanged:
 HandleAudioVolumeChangedL();
 break;
 }
 CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId );
 break;
 case MEngineMonitor::EPEMessageInValidEmergencyNumber:
-SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
+SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
 break;
 case MEngineMonitor::EPEMessageValidEmergencyNumber:
 DialVoiceCallL();
 break;
 EXPORT_C void CPhoneStateInCall::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateInCall::HandleIdleL()" );
 __ASSERT_DEBUG( aCallId >= 0, Panic( EPhoneCtrlParameterNotInitialized ) );
+TBool showDialer( EFalse );
+HBufC *phoneNumber = HBufC::NewLC( KPhoneNumberEntryBufferSize );
+TPtr ptr( phoneNumber->Des() );
+TPhoneCmdParamString stringParam;
+stringParam.SetString( &ptr );
 // Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 //Make sure that toolbar is not shown
 iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
 BeginTransEffectLC( ENumberEntryOpen );
 BeginUiUpdateLC();
 SetDefaultFlagsL();
 if ( IsNumberEntryUsedL() )
 {
-// Show the number entry if it exists and update cba's.
+if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
-SetNumberEntryVisibilityL( ETrue );
-// Close dtmf dialer when call is disconnected.
-if ( IsDTMFEditorVisibleL() )
-{
-CloseDTMFEditorL();
-// Display idle screen and update CBA's
-DisplayIdleScreenL();
-}
-else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
 {
 CloseCustomizedDialerL();
-// Display idle screen and update CBA's
+}
-DisplayIdleScreenL();
+else
-}
+{
-}
+iViewCommandHandle->ExecuteCommand(
-else
+EPhoneViewGetNumberFromEntry,
-{
+&stringParam );
-// Close menu bar, if it is displayed
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+showDialer = ETrue;
+}
+}
-if ( !TopAppIsDisplayedL() || IsAutoLockOn() )
+// Close menu bar, if it is displayed
-{
+iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-// Continue displaying current app but set up the
-// idle screen in the background
+if ( !TopAppIsDisplayedL() || IsAutoLockOn() )
-SetupIdleScreenInBackgroundL();
+{
-}
+// Continue displaying current app but set up the
-else
+// idle screen in the background
-{
+SetupIdleScreenInBackgroundL();
-// Display idle screen and update CBAs
+}
-DisplayIdleScreenL();
+else if ( showDialer )
-}
+{
+// Open dialer
+iViewCommandHandle->ExecuteCommandL( EPhoneViewLaunchLogs, &stringParam );
+}
+else
+{
+// Display idle screen and update CBAs
+DisplayIdleScreenL();
 }
 DeleteTouchPaneButtons();
 EndUiUpdate();
 EndTransEffect();
 // Display call termination note, if necessary
 DisplayCallTerminationNoteL();
+TPhoneCmdParamKeyCapture captureParam;
+captureParam.SetKeyCode( EKeyNo );
+iViewCommandHandle->ExecuteCommand( EPhoneViewStopCapturingKey, &captureParam );
+CleanupStack::PopAndDestroy( phoneNumber );
 // Go to idle state
 iStateMachine->ChangeState( EPhoneStateIdle );
 }
 // -----------------------------------------------------------
 if ( !IsNumberEntryVisibleL() )
 {
 // Go to current state implementation
 UpdateInCallCbaL();
 }
+SetTouchPaneButtons(0);
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::HandleAudioVolumeChangedL
 // -----------------------------------------------------------
 // Remove the Sending... note
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveDtmfNote );
 }
 // -----------------------------------------------------------
-// CPhoneStateInCall::HandleDtmfPromptSpeedDialL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::HandleDTMFPromptSpeedDialL()
-{
-__LOGMETHODSTARTEND(EPhoneControl,
-"CPhoneStateInCall::HandleDTMFPromptSpeedDialL()" );
-// Remove the Sending... note
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
-// Prompt for speed dial number
-HBufC* emptyString = HBufC::NewLC( KPhoneNumberEntryBufferSize );
-TPtr ptr( emptyString->Des() );
-// If the Search softkey is selected before a speed dial number is entered,
-// revert back to the DTMF query
-ShowDtmfTextQueryL(
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( EPhoneDtmfSpeedDialNumberQuery ),
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( EPhoneSendDtmfEmptyEditBoxCBA ),
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( EPhoneDtmfSpeedDialNormalEditBoxCBA ),
-&ptr );
-CleanupStack::PopAndDestroy( emptyString );
-}
-// -----------------------------------------------------------
 // CPhoneStateInCall::HandleCommandL
 // -----------------------------------------------------------
 //
 EXPORT_C TBool CPhoneStateInCall::HandleCommandL( TInt aCommand )
 {
 break;
 // DTMF entry - Ok
 case EPhoneCmdDtmfOk:
 SendDtmfL();
-break;
-// DTMF Speed entry - Ok
-case EPhoneCmdDtmfSpeedDialOk:
-SendDtmfSpeedDialNumberL();
 break;
 // DTMF sending - Cancel
 case EPhoneInCallCmdCancelSendingDtmfString:
 // Stop the asynchronous sending operation the
 MPEPhoneModel::EPEMessageSendDTMF );
 }
 CleanupStack::PopAndDestroy( content );
 }
-// -----------------------------------------------------------
-// CPhoneStateInCall::SendDtmfSpeedDialNumberL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::SendDtmfSpeedDialNumberL()
-{
-__LOGMETHODSTARTEND(EPhoneControl,
-"CPhoneStateInCall::SendDtmfSpeedDialNumberL()" );
-// First get the DTMF sequence from dialog
-TPhoneCmdParamString dtmfSequence;
-HBufC *content = HBufC::NewLC( KPEDtmfMaxLength );
-TPtr ptr( content->Des() );
-dtmfSequence.SetString( &ptr );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
-&dtmfSequence );
-// Prefix the query content string with the speed dial character '+'
-_LIT( KSpeedDialPrefix, "+" );
-ptr.Insert( 0, KSpeedDialPrefix );
-// Send the DTMF
-iStateMachine->PhoneEngineInfo()->SetDtmfStringCommand( ptr );
-iStateMachine->SendPhoneEngineMessage(
-MPEPhoneModel::EPEMessageSendDTMF );
-CleanupStack::PopAndDestroy( content );
-}
 // -----------------------------------------------------------
 // CPhoneStateInCall::LaunchDtmfManualQueryL
 // -----------------------------------------------------------
 //
 KPSUidHWRM,
 KHWRMGripStatus,
 state );
 if ( state == EPSHWRMGripOpen )
 {
-SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
+SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
 }
 else
 {
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewEnableKeyLock );
 SetHandsfreeModeL( !handsfreeMode );
 }
 else // aMessage == EPhoneKeyLongPress
 {
 // Display call in progress information note
-SendGlobalInfoNoteL( EPhoneCallInProgress );
+SendGlobalInfoNoteL( EPhoneCallInProgress, ETrue );
 }
 }
 // -----------------------------------------------------------
 // CPhoneStateInCall::ShowDtmfTextQueryL

branch	GCC_SURGE
changeset 51	f39ed5e045e0
parent 22	6bb1b21d2484
parent 46	bc5a64e5bc3c