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

equal deleted inserted replaced

-:c76a0b1755b9
+:2be0b271d017
 if ( IsSimOk() && !IsSimStateNotPresentWithSecurityModeEnabled() )
 {
 //  if still idle ( f.e not incoming call arrived when rfs )
 if ( iStateMachine->State() == this )
 {
-DisplayIdleScreenL();
+RemoveDialogsAndSendPhoneToBackgroundL();
 }
 }
 else
 {
 StartShowSecurityNoteL();
 case EKeyNo:
 HandleEndKeyPressL( aMessage );
 break;
 // send-key
 case EKeyYes:
-if ( IsNumberEntryUsedL() )
+if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
 TPhoneCmdParamBoolean isSecurityMode;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
 TPhoneCmdParamInteger numberEntryCountParam;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
 &numberEntryCountParam );
 TInt neLength( numberEntryCountParam.Integer() );
-if ( IsAnyQueryActiveL() )
+if ( neLength == 0 && !isSecurityMode.Boolean())
-{
-return;
-}
-else if ( neLength == 0 && !isSecurityMode.Boolean())
 {
 // start logs
 iViewCommandHandle->HandleCommandL(
 EPhoneDialerCmdLog );
 return;
 HandleSendCommandL();
 }
 // If dialer is not open but phone is in foreground and phone receives
 // send-key event we have to check if security mode is true and if it
 // is then open emergency dialer.
-else if ( !IsNumberEntryUsedL() )
+else
 {
 TPhoneCmdParamBoolean isSecurityMode;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
 if ( isSecurityMode.Boolean())
 {
 case EKeyApplication0:
 {
 // If dialer is not open but phone is in foreground and phone receives
 // applicaion-key event we have to open emergency dialer. No need own
 // securitymode check because Applicationkey only captured in securitymode.
-if ( !IsNumberEntryUsedL() )
+if ( !iNumberEntryManager->IsNumberEntryUsedL() )
 {
 HandleCommandL(EPhoneNumberAcqSecurityDialer);
 }
 }
 break;
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 case EKeyEnter:
-if ( IsNumberEntryVisibleL() )
+if ( iNumberEntryManager->IsNumberEntryVisibleL() )
 {
 HandleCommandL( EPhoneCmdOptions );
 }
 break;
 #endif
 break;
 case MEngineMonitor::EPEMessageIssuedUSSDRequest:
 // Note that after the sending of SS
 // strings the view stays in Dialer.
-if ( IsNumberEntryUsedL() )
+if ( !iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue ) )
 {
-// Show the number entry if it exists
+RemoveDialogsAndSendPhoneToBackgroundL();
-SetNumberEntryVisibilityL(ETrue);
-}
-else if ( NeedToSendToBackgroundL() )
-{
-// Continue displaying current app but set up the
-// idle screen in the background
-SetupIdleScreenInBackgroundL();
-}
-else
-{
-// Display idle screen
-DisplayIdleScreenL();
 }
 break;
 case MEngineMonitor::EPEMessageIdle:
 HandleIdleL( aCallId );
 void CPhoneStateIdle::HandleIncomingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIncomingL( ) ");
 HandleAudioAvailableOutputChangedL();
 SetRingingTonePlaybackL( aCallId );
 BeginUiUpdateLC();
+iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(EFalse);
-if ( IsNumberEntryUsedL() )
-{
-SetNumberEntryVisibilityL(EFalse);
-}
 DisplayIncomingCallL( aCallId );
-SetTouchPaneButtons( EPhoneIncomingCallButtons );
-CheckDisableHWKeysAndCallUIL();
 SetBackButtonActive(EFalse);
+UpdateUiCommands();
 EndUiUpdate();
-iCbaManager->UpdateIncomingCbaL( aCallId );
+ChangeTo( EPhoneStateIncoming );
-iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
+}
-iStateMachine->ChangeState( EPhoneStateIncoming );
-SetDivertIndication( EFalse );
+// -----------------------------------------------------------
-}
+// CPhoneStateIdle::HandleDialingL
-// -----------------------------------------------------------
-// CPhoneStateIdle::HandleDiallingL
 // Default handling for dialling message
 // (other items were commented in a header).
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneStateIdle::HandleDialingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleDialingL( ) ");
-BeginUiUpdateLC();
+TPhoneCmdParamKeyCapture captureParam;
-DisplayCallSetupL( aCallId );
+captureParam.SetKeyCode( EKeyNo );
-SetTouchPaneButtons( EPhoneCallSetupButtons );
+iViewCommandHandle->ExecuteCommand( EPhoneViewStartCapturingKey, &captureParam );
-EndUiUpdate();
+DisplayCallHeaderL( aCallId, ESetNEVisibilityFalse );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+SetToolbarButtonLoudspeakerEnabled();
-iCbaManager->UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
+ChangeTo( EPhoneStateCallSetup );
-iStateMachine->ChangeState( EPhoneStateCallSetup );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleConnectedL
 // Message Handling function for message EPEMessageConnected
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleConnectedL( ) ");
-// Keep Phone app in the foreground if it is external
-if ( !TopAppIsDisplayedL() )
-{
-TPhoneCmdParamInteger uidParam;
-uidParam.SetInteger( KUidPhoneApplication.iUid );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
-&uidParam );
-}
 BeginUiUpdateLC();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-DisplayCallSetupL( aCallId );
+DisplayCallHeaderL( aCallId, ESetNEVisibilityFalse );
 UpdateSingleActiveCallL( aCallId );
-SetTouchPaneButtons( EPhoneIncallButtons );
+UpdateUiCommands();
 EndUiUpdate();
+ChangeTo( EPhoneStateSingle );
-iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
-iStateMachine->ChangeState( EPhoneStateSingle );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleCommandL
 // -----------------------------------------------------------
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::DialVideoCallL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DialVideoCallL( ) ");
-if ( IsNumberEntryUsedL() )
+if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
 // get the number entry contents
-HBufC* phoneNumber = PhoneNumberFromEntryLC();
+HBufC* phoneNumber = iNumberEntryManager->PhoneNumberFromEntryLC();
 #ifdef _DEBUG
 if ( (*phoneNumber).Compare( KExit ) == 0 )
 {
 CleanupStack::PopAndDestroy( phoneNumber );
 SendExitCommandL();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 TPhoneCmdParamKeyCapture captureParam;
 captureParam.SetKeyCode( EKeyNo );
 iViewCommandHandle->ExecuteCommand( EPhoneViewStartCapturingKey, &captureParam );
-// Indicate that the Phone needs to be sent to the background if
+iViewCommandHandle->ExecuteCommandL( EPhoneViewBringPhoneAppToForeground );
-// an application other than the top application is in the foreground
-TPhoneCmdParamBoolean booleanParam;
-booleanParam.SetBoolean( !TopAppIsDisplayedL() );
-iViewCommandHandle->ExecuteCommandL(
-EPhoneViewSetNeedToSendToBackgroundStatus,
-&booleanParam );
-TPhoneCmdParamInteger uidParam;
-uidParam.SetInteger( KUidPhoneApplication.iUid );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
-&uidParam );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
-&uidParam );
 // Disable global notes when there is an incoming call
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
 &globalNotifierParam );
-DisplayHeaderForCallComingInL( aCallId, EFalse ); //not waiting
+iViewCommandHandle->ExecuteCommandL(EPhoneViewCreateCallHeader, aCallId);
-}
-// -----------------------------------------------------------
-// CPhoneStateIdle::DisplayCallSetupL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateIdle::DisplayCallSetupL( TInt aCallId )
-{
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DisplayCallSetupL( ) ");
-__ASSERT_DEBUG( aCallId > KErrNotFound, Panic( EPhoneCtrlParameterNotInitialized ) );
-TPhoneCmdParamKeyCapture captureParam;
-captureParam.SetKeyCode( EKeyNo );
-iViewCommandHandle->ExecuteCommand( EPhoneViewStartCapturingKey, &captureParam );
-// Indicate that the Phone needs to be sent to the background if
-// an application other than the top application is in the foreground
-TPhoneCmdParamBoolean booleanParam;
-booleanParam.SetBoolean( !TopAppIsDisplayedL() );
-iViewCommandHandle->ExecuteCommandL(
-EPhoneViewSetNeedToSendToBackgroundStatus,
-&booleanParam );
-// Bring Phone app in the foreground
-TPhoneCmdParamInteger uidParam;
-uidParam.SetInteger( KUidPhoneApplication.iUid );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
-&uidParam );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
-&uidParam );
-DisplayHeaderForOutgoingCallL( aCallId );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleIdleForegroundEventL
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneStateIdle::HandleIdleForegroundEventL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleForegroundEventL( ) ");
-if ( IsNumberEntryUsedL() )
+iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-{
-if ( IsNumberEntryVisibleL() )
-{
-iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
-}
-}
-else if ( !IsAnyQueryActiveL() )
-{
-iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-}
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandlePhoneForegroundEventL
 // -----------------------------------------------------------
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneStateIdle::HandlePhoneFocusLostEventL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandlePhoneFocusLostEventL( ) ");
-if ( !IsNumberEntryUsedL() )
+if ( !iNumberEntryManager->IsNumberEntryUsedL() )
 {
 // If dialer is open add icon to FSW list.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
 }
 }
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::SendExitCommandL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::SendExitCommand( ) ");
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
+// Simulate exit command
-// Simulate exit command
+RWsSession& wsSession = EikonEnv()->WsSession();
-CEikonEnv& eikEnv = *CEikonEnv::Static();
+TKeyEvent keyEvent;
-CCoeEnv& coeEnv = eikEnv;
+keyEvent.iCode = EEikCmdExit;
-RWsSession& wsSession=coeEnv.WsSession();
+keyEvent.iScanCode = EEikCmdExit;
-TKeyEvent keyEvent;
+keyEvent.iModifiers = 0;
-keyEvent.iCode = EEikCmdExit;
+keyEvent.iRepeats = 0;
-keyEvent.iScanCode = EEikCmdExit;
+wsSession.SimulateKeyEvent( keyEvent );
-keyEvent.iModifiers = 0;
+wsSession.Flush();
-keyEvent.iRepeats = 0;
-wsSession.SimulateKeyEvent( keyEvent );
-wsSession.Flush();
 iViewCommandHandle->ExecuteCommandL( EPhoneAppShutDown );
 }
 // -----------------------------------------------------------
 __LOGMETHODSTARTEND( EPhoneControl, "CPhoneStateIdle::HandleEndKeyPressL( ) ");
 // End key not handled also in phone startup when pressed during country/time/date query
 RWsSession sess = CCoeEnv::Static()->WsSession();
 TApaTaskList appList( sess );
 TApaTask startup = appList.FindApp( KUidStartupApplication );
-if ( !IsAutoLockOn() && !IsKeyLockOn() && !startup.Exists() )
+if ( !IsAutoLockOn() && !startup.Exists() )
 {
 //Cancels e.g. USB notifier and Audio notifier.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewCancelAllNotications );
 // If KFeatureIdFfSimlessOfflineSupport is undef and security note is shown then do not
 // remove security note from screen.
 {
 if ( aMessage == EPhoneKeyLongPress )
 {
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
-if ( IsNumberEntryUsedL() )
+if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 // Do state-specific operation when number entry is cleared
 HandleNumberEntryClearedL();
 // If long end key event occures then all calls are terminated and
 // dialer is closed, therefore tel.icon must be removed from FSW.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
 }
-if ( !TopAppIsDisplayedL() )
-{
-DisplayIdleScreenL();
-}
 }
-else if ( IsNumberEntryUsedL() && TopAppIsDisplayedL() )
+else if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 // Do state-specific operation when number entry is cleared
 HandleNumberEntryClearedL();
 }
-else if ( !TopAppIsDisplayedL() )
+}
-{
+else if ( iNumberEntryManager->IsNumberEntryUsedL() )
-// Phone might not be the topmost app since it has
-// some dialog/query open therefore we need to check this
-// and remove dialog/phone.
-if ( IsAnyQueryActiveL()  )
-{
-if ( !IsSimStateNotPresentWithSecurityModeEnabled() )
-{
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
-}
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-}
-iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-}
-}
-else if ( IsNumberEntryUsedL() )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 StartShowSecurityNoteL();
 }
 }
 //
 void CPhoneStateIdle::HandleVoiceCallCommandL()
 {
 __LOGMETHODSTARTEND(
 EPhoneControl, "CPhoneStateIdle::HandleVoiceCallCommandL()" );
-if ( IsNumberEntryUsedL() )
+if ( iNumberEntryManager->IsNumberEntryUsedL() )
 {
-HBufC* phoneNumber = PhoneNumberFromEntryLC();
+HBufC* phoneNumber = iNumberEntryManager->PhoneNumberFromEntryLC();
 if ( !IsSimOk() )
 {
 iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber ) ;
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageCheckEmergencyNumber );
 CleanupStack::PopAndDestroy( phoneNumber );
 }
 }
 }
+// -----------------------------------------------------------
+// CPhoneStateIdle::ChangeTo
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::ChangeTo( TInt aState )
+{
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::ChangeTo - aState =%d ",
+aState );
+iStateMachine->ChangeState( aState );
+}
 // End of File

changeset 77	2be0b271d017
parent 72	c76a0b1755b9
child 76	cfea66083b62