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

equal deleted inserted replaced

-:b8d67d6176f5
+:3c221667e687
 #include "phonestatedefinitions.h"
 #include "tphonecmdparamappinfo.h"
 #include "cphonekeys.h"
 #include "tphonecmdparamcallstatedata.h"
+#include "tphonecmdparamcallheaderdata.h"
 #include "phoneviewcommanddefinitions.h"
 #include "phoneui.hrh"
 #include "phonerssbase.h"
 #include "cphonemainresourceresolver.h"
 #include "cphonecenrepproxy.h"
 {
 // Handle numeric keys when key events are received in idle state
 HandleNumericKeyEventL( aKeyEvent, aEventCode );
 }
 else if ( iStateMachine->SecurityMode()->IsSecurityMode()
-	&& CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
+&& CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
 // Handle numeric keys when key events are received in single state
 HandleNumericKeyEventL( aKeyEvent, aEventCode );
 }
 TKeyCode aCode )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleKeyMessageL( ) ");
 if( aMessage == EPhoneKeyLongPress && CheckAppLaunchingL( aCode ) )
-	{
+{
 return;
-	}
+}
 switch ( aCode )
 {
 case EKeyEnd:
 // This key even occur only in idle state, behaviour for this should
 HandleEndKeyPressL( EPhoneKeyLongPress );
 break;
 // end-key
 case EKeyNo:
 HandleEndKeyPressL( aMessage );
 break;
 // send-key
 case EKeyYes:
 // send-key event we have to check if security mode is true and if it
 // is then open emergency dialer.
 else if ( !IsNumberEntryUsedL() )
 {
 if ( iStateMachine->SecurityMode()->IsSecurityMode() )
-						{
+{
-						iViewCommandHandle->HandleCommandL( EPhoneViewOpenNumberEntry );
+iViewCommandHandle->HandleCommandL( EPhoneViewOpenNumberEntry );
-						}
+}
 }
 }
 else // iOnScreenDialer false, non-touch.
 {
 HandleSendCommandL();
 TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandlePhoneEngineMessageL( ) ");
 switch ( aMessage )
 {
+case MEngineMonitor::EPEMessageInitiatedMoCall:
+if( !IsBubbleInitialized() &&
+( EPECallTypeCSVoice ==
+iStateMachine->PhoneEngineInfo()->CallType(aCallId) ) )
+{
+// Display call setup ASAP.
+DisplayInitializingCallL( aCallId );
+}
+break;
 case MEngineMonitor::EPEMessageIncoming:
 HandleIncomingL( aCallId );
 break;
 case MEngineMonitor::EPEMessageDialing:
 if ( !iOnScreenDialer )
 {
 if ( IsNumberEntryUsedL() )
 {
 // Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
 }
 else if ( NeedToReturnToForegroundAppL() )
 {
 // Continue displaying current app but set up the
 // idle screen in the background
 case MEngineMonitor::EPEMessageIdle:
 HandleIdleL( aCallId );
 break;
 case MEngineMonitor::EPEMessageInValidEmergencyNumber:
-SendGlobalWarningNoteL( EPhoneEmergencyCallsOnly );
+// if sim is ok then there is no need show this note.
+if ( !IsSimOk() )
+{
+SendGlobalWarningNoteL( EPhoneEmergencyCallsOnly );
+}
 break;
 case MEngineMonitor::EPEMessageValidEmergencyNumber:
-DialVoiceCallL();
+/* DisplayInitializingCallL calls EPEMessageCheckEmergencyNumber which
+means that engine will send EPEMessageInValidEmergencyNumber or
+EPEMessageValidEmergencyNumber response to phoneapp. If phoneengine
+sends EPEMessageValidEmergencyNumber then iBubbleInitialized should be
+set to EFalse this way we dont initializing call bubble behind attempting emergency
+call dialog.*/
+if ( IsBubbleInitialized() )
+{
+SetBubbleInitialized( EFalse );
+}
+else
+{
+DialVoiceCallL();
+}
 break;
 default:
 CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId );
 break;
 }
 }
 CEikonEnv::Static()->DismissTaskList();
 // Show incoming call buttons
 SetTouchPaneButtons( EPhoneIncomingCallButtons );
 SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
+SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
 // Display incoming call
 DisplayIncomingCallL( aCallId );
 EndUiUpdate();
 UpdateIncomingContextMenuL( aCallId );
 //Dim toolbar items
 SetToolbarDimming( ETrue );
 //request that dimmed toolbar is visible.
 iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
-iStateMachine->ChangeState( EPhoneStateIncoming );
+ChangeTo( EPhoneStateIncoming );
 // Reset divert indication
 SetDivertIndication( EFalse );
 }
 SetNumberEntryVisibilityL(EFalse);
 // Show call setup buttons
 SetTouchPaneButtons( EPhoneCallSetupButtons );
+SetTouchPaneButtonDisabled( EPhoneInCallCmdHold );
 // Display call setup
 DisplayCallSetupL( aCallId );
 EndUiUpdate();
 // Go to call setup state
 iCbaManager->UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
 SetToolbarDimming( ETrue );
-iStateMachine->ChangeState( EPhoneStateCallSetup );
+SetToolbarButtonLoudspeakerEnabled();
+SetToolbarButtonHandsetEnabled();
+ChangeTo( EPhoneStateCallSetup );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleConnectedL
 // Message Handling function for message EPEMessageConnected
 EndUiUpdate();
 // Go to single state
 iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
-iStateMachine->ChangeState( EPhoneStateSingle );
+ChangeTo( EPhoneStateSingle );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleCommandL
 // -----------------------------------------------------------
 {
 iCustomization->HandleDialL( aNumber );
 }
 else
 {
 DialVoiceCallL();
 }
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleBackCommandL
 // Set Phone as the top application
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
 &uidParam );
-// Display call setup header
+if ( !UpdateCallBubbleL( aCallId ) )
-DisplayHeaderForOutgoingCallL( aCallId );
+{
+// Create and Display call setup header if update was not done.
+DisplayHeaderForOutgoingCallL( aCallId );
+}
+}
+// -----------------------------------------------------------
+// CPhoneStateIdle::UpdateCallBubbleL
+// -----------------------------------------------------------
+//
+TBool CPhoneStateIdle::UpdateCallBubbleL( TInt aCallId )
+{
+__LOGMETHODSTARTEND(EPhoneControl,
+"CPhoneStateIdle::UpdateCallBubbleL( )");
+TBool retValue(EFalse);
+if( IsBubbleInitialized() )
+{
+// Call bubble is already initialized so it is
+// enough just to update existing header with
+// contacts,number...etc info.
+TPhoneCmdParamCallHeaderData callHeaderParam =
+UpdateCallHeaderInfoL( aCallId );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewUpdateCallHeaderRemoteInfoData,
+aCallId,
+&callHeaderParam );
+// reset flag.
+SetBubbleInitialized( EFalse );
+retValue = ETrue;
+}
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::UpdateCallBubbleL - retValue =%d ",
+retValue );
+return retValue;
+}
+// -----------------------------------------------------------
+// CPhoneStateIdle::DisplayInitializingCallL
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::DisplayInitializingCallL( TInt aCallId )
+{
+__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DisplayInitializingCallL( )");
+/*Set flag value to true before SendPhoneEngineMessage because if phone number
+is emergency number then EPEMessageValidEmergencyNumber message handling sets
+iBubbleInitialized to false value and if value is false then initializing call
+bubble shouldnt be shown.*/
+SetBubbleInitialized( ETrue );
+iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageCheckEmergencyNumber );
+if ( IsBubbleInitialized() )
+{
+BeginUiUpdateLC();
+SetNumberEntryVisibilityL(EFalse);
+// Show call setup buttons
+SetTouchPaneButtons( EPhoneCallSetupButtons );
+// Close menu bar, if it is displayed
+iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+// Capture keys when the phone is dialling
+CaptureKeysDuringCallNotificationL( ETrue );
+// Bring Phone app in the foreground
+TPhoneCmdParamInteger uidParam;
+uidParam.SetInteger( KUidPhoneApplication.iUid );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
+&uidParam );
+// Set Phone as the top application
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
+&uidParam );
+DisplayHeaderForInitializingCallL( aCallId );
+EndUiUpdate();
+// Remove any phone dialogs if they are displayed
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+// Go to call setup state
+iCbaManager->UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
+SetToolbarDimming( ETrue );
+}
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleIdleForegroundEventL
 // -----------------------------------------------------------
 }
 }
 else if ( !IsAnyQueryActiveL() )
 {
 // Set idle as top application
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
 }
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandlePhoneForegroundEventL
 }
 // If dialer is open add icon to FSW list.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
 }
-else if ( !IsNumberEntryUsedL() && !iStateMachine->SecurityMode()->IsSecurityMode() )
+/*iBubbleInitialized has to be checked because if it true then phoneapp
+is already showing call bubble and we cant bring idle to screen. */
+else if ( !IsNumberEntryUsedL() &&
+!iStateMachine->SecurityMode()->IsSecurityMode() &&
+!IsBubbleInitialized() )
 {
 // Bring Idle app to the foreground
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-		}
+}
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandlePhoneFocusLostEventL
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::HandleIdleL( TInt /*aCallId*/ )
 {
-__LOGMETHODSTARTEND(EPhoneControl,
+__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleL()" );
-"CPhoneStateIdle::HandleIdleL()" );
 // Remove all call headers
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveAllCallHeaders );
 // Close number entry
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 // Remove all notes and dialogs
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+// Reset flag.
+SetBubbleInitialized( EFalse );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::SpeedDialL
 // -----------------------------------------------------------
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneStateIdle::DialVoiceCallL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DialVoiceCallL() ");
-__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(),
+__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
-Panic( EPhoneCtrlInvariant ) );
-// Disable global notes
-TPhoneCmdParamBoolean globalNotifierParam;
-globalNotifierParam.SetBoolean( ETrue );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
-&globalNotifierParam );
 CPhoneState::DialVoiceCallL();
 }
 // -----------------------------------------------------------------------------
 // CPhoneStateIdle::RestoreOngoing
 // -----------------------------------------------------------------------------
 }
 }
 return menuId;
 }
+// -----------------------------------------------------------
+// CPhoneStateIdle::HandleErrorL
+// -----------------------------------------------------------
+//
+EXPORT_C void CPhoneStateIdle::HandleErrorL( const TPEErrorInfo& aErrorInfo )
+{
+__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneStateIdle::HandleErrorL() ");
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::HandleErrorL - aErrorInfo.iErrorCode =%d ",
+aErrorInfo.iErrorCode );
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::HandleErrorL - aErrorInfo.iCallId =%d ",
+aErrorInfo.iCallId );
+if( ( ECCPErrorNone != aErrorInfo.iErrorCode ) &&
+IsBubbleInitialized() )
+{
+HandleInitializingCallErrorL( aErrorInfo.iCallId );
+SetBubbleInitialized( EFalse );
+}
+CPhoneState::HandleErrorL( aErrorInfo );
+}
+// -----------------------------------------------------------
+// CPhoneStateIdle::HandleInitializingCallErrorL
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::HandleInitializingCallErrorL( TInt aCallId )
+{
+__LOGMETHODSTARTEND(
+EPhoneControl,
+"CPhoneStateIdle::HandleInitializingCallErrorL()" );
+// Remove call
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
+BeginUiUpdateLC();
+SetDefaultFlagsL();
+if ( IsNumberEntryUsedL() )
+{
+if ( NeedToReturnToForegroundAppL() )
+{
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
+iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
+}
+else
+{
+// Show the number entry if it exists and update cba's.
+SetNumberEntryVisibilityL( ETrue );
+if ( IsDTMFEditorVisibleL() )
+{
+CloseDTMFEditorL();
+DisplayIdleScreenL();
+}
+else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
+{
+CloseCustomizedDialerL();
+DisplayIdleScreenL();
+}
+}
+}
+else
+{
+iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+if ( !TopAppIsDisplayedL() || IsAutoLockOn() || NeedToReturnToForegroundAppL() )
+{
+// Continue displaying current app but set up the
+// idle screen in the background
+SetupIdleScreenInBackgroundL();
+}
+else
+{
+DisplayIdleScreenL();
+}
+}
+DeleteTouchPaneButtons();
+EndUiUpdate();
+// Display call termination note, if necessary
+DisplayCallTerminationNoteL();
+iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
+}
+// -----------------------------------------------------------
+// CPhoneStateIdle::SetBubbleInitialized
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::SetBubbleInitialized( TBool aValue )
+{
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::SetBubbleInitialized - aValue =%d ",
+aValue );
+iBubbleInitialized = aValue;
+}
+// -----------------------------------------------------------
+// CPhoneStateIdle::IsBubbleInitialized
+// -----------------------------------------------------------
+//
+TBool CPhoneStateIdle::IsBubbleInitialized()
+{
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::IsBubbleInitialized - iBubbleInitialized =%d ",
+iBubbleInitialized );
+return iBubbleInitialized;
+}
+// -----------------------------------------------------------
+// CPhoneStateIdle::ChangeTo
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::ChangeTo( TInt aState )
+{
+__PHONELOG1( EBasic, EPhoneControl,
+"PhoneUIControl: CPhoneStateIdle::ChangeTo - aState =%d ",
+aState );
+SetBubbleInitialized( EFalse );
+iStateMachine->ChangeState( aState );
+}
 // End of File

branch	RCL_3
changeset 44	3c221667e687
parent 39	b8d67d6176f5
child 57	94dc1107e8b2