MCL/sf/app/phone: comparison phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 #include "tphonecmdparamcallstatedata.h"
 #include "phonestatedefinitionsgsm.h"
 #include "phonelogger.h"
 #include "cphonecenrepproxy.h"
 #include "cphonepubsubproxy.h"
+#include "mphonestorage.h"
 // ================= MEMBER FUNCTIONS =======================
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // (other items were commented in a header).
 // -----------------------------------------------------------
 //
 CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting()
 {
-if( iViewCommandHandle )
-{
-TPhoneCmdParamBoolean dtmfSendFlag;
-dtmfSendFlag.SetBoolean( EFalse );
-TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
-EPhoneViewSetVideoCallDTMFVisibilityFlag,
-&dtmfSendFlag ); )
-}
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::ConstructL()
 // Constructor
 case MEngineMonitor::EPEMessageConnected:
 HandleConnectedL( aCallId );
 break;
 case MEngineMonitor::EPEMessageDialing:
-HandleDialingL( aCallId );
+HandleDiallingL( aCallId );
 break;
 case MEngineMonitor::EPEMessageDisconnecting:
 HandleDisconnectingL( aCallId );
 /* Flow through */
 CPEPhoneModelIF::EPEMessageResume );
 break;
 }
 case EPhoneInCallCmdNewCall:
-LaunchNewCallQueryL();
 break;
 case EPhoneInCallCmdNewCallCall:
-CallFromNewCallQueryL();
 break;
 case EPhoneCallComingCmdReject: // fall through
 {
 // Get waiting callid
 iStateMachine->SetCallId( iSingleCallId );
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageReject );
 break;
+case EPhoneCmdUpdateUiControls:
+UpdateUiControlsL();
+break;
 default:
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 break;
 }
 return commandStatus;
-}
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::OpenMenuBarL()
-{
-__LOGMETHODSTARTEND( EPhoneUIStates,
-"CPhoneSingleAndWaiting::OpenMenuBarL() ");
-TInt resourceId ( KErrNone );
-if ( !IsAutoLockOn() )
-{
-if( IsVideoCallActiveL() || IsVideoCallRingingL() )
-{
-//DTMF hiding will be set to TRUE
-if( IsVideoCallActiveL() )
-{
-TPhoneCmdParamBoolean dtmfSendFlag;
-dtmfSendFlag.SetBoolean( ETrue );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetVideoCallDTMFVisibilityFlag,
-&dtmfSendFlag );
-}
-if ( IsNumberEntryVisibleL() )
-{
-resourceId = EPhoneVideoCallWaitingMenubarWithNumberEntry;
-}
-else
-{
-resourceId = EPhoneVideoCallWaitingMenubar;
-}
-}
-else // single voice and waiting voice
-{
-if ( IsNumberEntryVisibleL() )
-{
-resourceId = EPhoneCallWaitingMenubarWithNumberEntry;
-}
-else
-{
-resourceId = EPhoneCallWaitingMenubar;
-}
-}
-}
-else
-{
-resourceId = EPhoneCallWaitingLockMenubar;
-}
-TPhoneCmdParamInteger integerParam;
-integerParam.SetInteger(
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( resourceId ) );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
-&integerParam );
 }
 // --------------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleKeyMessageL
 // --------------------------------------------------------------
 break;
 }
 }
 // -----------------------------------------------------------
+// CPhoneSingleAndWaiting::HandleKeyEventL
+// -----------------------------------------------------------
+//
+void CPhoneSingleAndWaiting::HandleKeyEventL(
+const TKeyEvent& aKeyEvent,
+TEventCode /*aEventCode*/ )
+{
+if( EKeyDeviceF == aKeyEvent.iCode )
+{
+__PHONELOG( EBasic, EPhoneUIStates,
+"CPhoneSingleAndWaiting::HandleKeyMessageL-deviceF" );
+HandleHoldSwitchL();
+}
+}
+// -----------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndWaiting::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndWaiting::HandleIdleL() ");
-// Close menu bar, if it is displayed
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 if ( iSingleCallId == KErrNotFound )
 {
 TPhoneCmdParamCallStateData callStateData;
 callStateData.SetCallState( EPEStateDisconnecting );
 if ( IsNumberEntryVisibleL() )
 {
 SetNumberEntryVisibilityL(EFalse);
 }
+// Check if HW Keys or Call UI should be disabled
+CheckDisableHWKeysAndCallUIL();
 SetTouchPaneButtons( EPhoneIncomingCallButtons );
-SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
 // Bring up callhandling view
 BringIncomingToForegroundL();
 //Set incoming cba
 iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
-UpdateSilenceButtonDimming();
 // Play ringtone
 SetRingingTonePlaybackL( callStateData.CallId() );
 }
+SetBackButtonActive(EFalse);
 EndUiUpdate();
-SetToolbarDimming( ETrue );
 iStateMachine->ChangeState( EPhoneStateIncoming );
 }
 else
 {
 BeginUiUpdateLC();
 // Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 // Idle message came for waiting call
 if ( IsNumberEntryUsedL() )
 {
-if ( NeedToReturnToForegroundAppL() )
+if ( NeedToSendToBackgroundL() )
 {
 // Return phone to the background if send to background is needed.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
 else
 {
 // Show the number entry if it exists
 }
 }
 else
 {
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
-// If numberentry is not open just check NeedToReturnToForegroundAppL and
+// If numberentry is not open just check NeedToSendToBackgroundL and
 // sendbackround if needed.
-if ( NeedToReturnToForegroundAppL() )
+if ( NeedToSendToBackgroundL() )
 {
 // Return phone to the background if send to background is needed.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
 }
 }
-if ( IsVideoCall( iSingleCallId ) )
+// Enable call UI
-{
+if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
-TPhoneCmdParamInteger uidParam;
+&& iStateMachine->PhoneStorage()->IsScreenLocked() )
-uidParam.SetInteger( KVtUiAppUidValue.iUid );
+{
+EnableCallUIL();
-// Set video Phone as the top application
+}
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
-&uidParam );
+// Reset blocked keys list
-}
+iStateMachine->PhoneStorage()->ResetBlockedKeysList();
 SetTouchPaneButtons( EPhoneIncallButtons );
 EndUiUpdate();
 // CBA updates in above if-else conditions
 iStateMachine->ChangeState( EPhoneStateSingle );
 }
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleHeldL
 // -----------------------------------------------------------
 TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
 TInt callLabelId = CPhoneMainResourceResolver::Instance()->
 ResolveResourceID( EPhoneCallOnHold );
 StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() );
 callHeaderParam.SetLabelText( labelText );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
 {
 HandleHoldNoteL( aCallId, ETrue );
 }
 UpdateInCallCbaL();
+SetTouchPaneButtons( EPhoneWaitingCallButtons );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleConnectedL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndWaiting::HandleUnholdL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndWaiting::HandleUnholdL() ");
-// Close menu if focus is somewhere else than number entry.
-if ( !IsNumberEntryUsedL() )
-{
-// Close menubar
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-}
 // Show bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnected );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 {
 HandleHoldNoteL( aCallId, EFalse );
 }
 // Set CBAs
-UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+UpdateInCallCbaL();
+SetTouchPaneButtons( EPhoneWaitingCallButtons );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() ");
+// Reset blocked keys list
+iStateMachine->PhoneStorage()->ResetBlockedKeysList();
 BeginUiUpdateLC();
 UpdateRemoteInfoDataL ( aCallId );
 // Show bubble
 TPhoneCmdParamCallHeaderData callHeaderParam;
 callHeaderParam.SetCallState( EPEStateConnected );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 // Set Hold flag to view
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-// Close dtmf dialer if exist.
+if ( IsNumberEntryUsedL() )
-if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
+{
-{
+if ( NeedToSendToBackgroundL() )
-CloseDTMFEditorL();
+{
-}
+// Return phone to the background if send to background is needed.
-else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
+iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-{
-CloseCustomizedDialerL();
+UpdateCbaL( EPhoneCallHandlingInCallCBA );
 }
+else
-if ( IsNumberEntryUsedL() && NeedToReturnToForegroundAppL() )
+{
-{
+// Show the number entry if it exists.
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
+SetNumberEntryVisibilityL(ETrue);
-UpdateCbaL( EPhoneCallHandlingInCallCBA );
+}
 }
 else
 {
-// Set Two singles state softkeys
+// Set Two singles softkeys
 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
 }
 SetTouchPaneButtons( EPhoneTwoSinglesButtons );
 EndUiUpdate();
+// Go to two singles state
 // CBA updates in above if-else conditions
 iStateMachine->ChangeState( EPhoneStateTwoSingles );
 }
-// ---------------------------------------------------------
+// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::CallFromNewCallQueryL
+// CPhoneSingleAndWaiting::HandleDiallingL
-// ---------------------------------------------------------
+// -----------------------------------------------------------
 //
-void CPhoneSingleAndWaiting::CallFromNewCallQueryL()
+void CPhoneSingleAndWaiting::HandleDiallingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
-"CPhoneSingleAndWaiting::CallFromNewCallQueryL() ");
+"CPhoneSingleAndWaiting::HandleDiallingL() ");
-// First get the phone number from the dialog
-TPhoneCmdParamString phoneNumberParam;
+BeginUiUpdateLC();
-HBufC *content = HBufC::NewLC( KPhoneNumberEntryBufferSize );
-TPtr ptr( content->Des() );
+// Hide number entry if it exists
-phoneNumberParam.SetString( &ptr );
+SetNumberEntryVisibilityL(EFalse);
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
-&phoneNumberParam );
-// Store the phone number
-iStateMachine->PhoneEngineInfo()->SetPhoneNumber( ptr );
-// clean up stack
-CleanupStack::PopAndDestroy( content );
-DialVoiceCallL();
-}
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::HandleDialingL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::HandleDialingL( TInt aCallId )
-{
-__LOGMETHODSTARTEND( EPhoneUIStates,
-"CPhoneSingleAndWaiting::HandleDialingL() ");
 // Display call setup
 DisplayCallSetupL( aCallId );
-// Go to Single And Waiting And Call Setup state
-iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
-}
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::DoStateSpecificCallSetUpDefinitionsL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneSingleAndWaiting::DoStateSpecificCallSetUpDefinitionsL()
-{
 // Set Hold flag to view ( DTMF menu label have to present )
 TPhoneCmdParamBoolean holdFlag;
 holdFlag.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 SetTouchPaneButtons( EPhoneCallSetupButtons );
+EndUiUpdate();
+// Update call setup CBAs
+UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
+// Go to Single And Waiting And Call Setup state
+iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
+}
+// -----------------------------------------------------------
+// CPhoneSingleAndWaiting::DisplayCallSetupL
+// -----------------------------------------------------------
+//
+void CPhoneSingleAndWaiting::DisplayCallSetupL( TInt aCallId )
+{
+__LOGMETHODSTARTEND( EPhoneUIStates,
+"CPhoneSingleAndWaiting::DisplayCallSetupL() ");
+// Remove dialogs if necessary
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+// Capture keys when the phone is dialling
+CaptureKeysDuringCallNotificationL( ETrue );
+// Force telephony to the foreground
+TPhoneCmdParamInteger uidParam;
+uidParam.SetInteger( KUidPhoneApplication.iUid );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
+&uidParam );
+// Display call setup header
+DisplayHeaderForOutgoingCallL( aCallId );
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::UpdateInCallCbaL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndWaiting::UpdateInCallCbaL()
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneSingleAndWaiting::UpdateInCallCbaL() ");
-UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+TPhoneCmdParamInteger callIdParam;
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewGetExpandedBubbleCallId, &callIdParam );
+if ( callIdParam.Integer()==iSingleCallId )
+{
+CPhoneGsmInCall::UpdateInCallCbaL();
+}
+else
+{
+iCbaManager->SetCbaL(  EPhoneCallHandlingCallWaitingCBA );
+}
 }
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleErrorL
 // -----------------------------------------------------------
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleDisconnectingL
 // -----------------------------------------------------------
 //
-void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt /*aCallId*/ )
+void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::HandleDisconnectingL( ) ");
+if( ( iSingleCallId == aCallId ) && IsVideoCall( aCallId ) )
+{
+__PHONELOG( EBasic, EPhoneControl,
+"CPhoneSingleAndWaiting::HandleDisconnectingL EPhoneViewSetNeedToSendToBackgroundStatus" );
+// Keep phone on the foreground
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( EFalse );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToSendToBackgroundStatus,
+&booleanParam );
+}
+}
+// -----------------------------------------------------------
+// CPhoneSingleAndWaiting::UpdateUiControlsL
+// -----------------------------------------------------------
+//
+void CPhoneSingleAndWaiting::UpdateUiControlsL()
+{
+__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::UpdateUiControlsL( ) ");
+UpdateInCallCbaL();
 }
 // End of File

branch	RCL_3
changeset 24	41a7f70b3818
parent 23	40a3f856b14d
child 25	5266b1f337bd