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

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 /*
 * Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 // INCLUDES
 #include <pevirtualengine.h>
 #include <mpeengineinfo.h>
 #include <mpeclientinformation.h>
 #include <MediatorDomainUIDs.h>
-#include <videotelcontrolmediatorapi.h>
 #include "cphonealerting.h"
 #include "mphonestatemachine.h"
 #include "tphonecmdparamboolean.h"
 #include "tphonecmdparaminteger.h"
 #include "tphonecmdparamcallstatedata.h"
 }
 else
 {
 // Show not allowed note
 SendGlobalErrorNoteL(
-EPhoneNoteTextNotAllowed );
+EPhoneNoteTextNotAllowed, ETrue );
 }
 break;
 // end-key
 case EKeyNo:
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
 if ( IsNumberEntryUsedL() )
 {
-CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+// Remove number entry from screen
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewRemoveNumberEntry );
+// Do state-specific operation when number entry is cleared
+HandleNumberEntryClearedL();
 }
 if ( !TopAppIsDisplayedL() )
 {
 // Bring app to foreground
 TPhoneCmdParamInteger uidParam;
 "CPhoneAlerting::HandlePhoneEngineMessageL()");
 switch ( aMessage )
 {
 case MEngineMonitor::EPEMessageConnected:
-{
 HandleConnectedL( aCallId );
-}
 break;
 case MEngineMonitor::EPEMessageDisconnecting:
-{
 HandleDisconnectingL( aCallId );
-}
 break;
 case MEngineMonitor::EPEMessageRemoteTerminated:
-{
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewHideNaviPaneAudioVolume );
-}
+CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
 break;
 case MEngineMonitor::EPEMessageIncoming:
 {
 // If incoming message is received in alerting state, teardown of
 return;
 }
 }
 break;
 default:
 break;
 }
 //
 EXPORT_C void CPhoneAlerting::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneAlerting::HandleConnectedL()");
+// Keep Phone in the foreground
-// Close menu bar, if it is displayed
+TPhoneCmdParamBoolean booleanParam;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+booleanParam.SetBoolean( EFalse );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
 BeginUiUpdateLC();
 // Update the single call
 UpdateSingleActiveCallL( aCallId );
 SetTouchPaneButtons( EPhoneIncallButtons );
-SetToolbarDimming( EFalse );
 EndUiUpdate();
 // Go to single state
 UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateSingle );
 }
 // -----------------------------------------------------------
-// CPhoneAlerting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneAlerting::OpenMenuBarL()
-{
-__LOGMETHODSTARTEND( EPhoneUIStates,
-"CPhoneAlerting::OpenMenuBarL()");
-TInt resourceId;
-if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
-{
-resourceId = EPhoneDtmfDialerMenubar;
-}
-else if ( IsNumberEntryVisibleL() )
-{
-resourceId = EPhoneAlertingCallMenubarWithNumberEntry;
-}
-// Use different resources for alerting data, video and cs call
-else if( IsVideoCallAlertingL() )
-{
-resourceId = EPhoneAlertingVideoCallMenubar;
-}
-else
-{
-resourceId = EPhoneAlertingCallMenubar;
-}
-TPhoneCmdParamInteger integerParam;
-integerParam.SetInteger(
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( resourceId ) );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
-&integerParam );
-}
-// -----------------------------------------------------------
 // CPhoneAlerting::HandleCommandL
 // -----------------------------------------------------------
 //
 EXPORT_C TBool CPhoneAlerting::HandleCommandL( TInt aCommand )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneAlerting::HandleCommandL()" );
-TBool commandStatus = ETrue;
+return CPhoneGsmInCall::HandleCommandL( aCommand );
-switch( aCommand )
-{
-case EPhoneInCallCmdHelp:
-{
-TPtrC contextName;
-if ( IsVideoCallAlertingL() )
-{
-contextName.Set( KINCAL_HLP_VIDEOCALL() );
-}
-else
-{
-contextName.Set( KINCAL_HLP_CALL_HANDLING() );
-}
-iViewCommandHandle->ExecuteCommandL(
-EPhoneViewLaunchHelpApplication, 0, contextName );
-}
-break;
-default:
-commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
-break;
-}
-return commandStatus;
 }
 // -----------------------------------------------------------
 // CPhoneAlerting::IsVideoCallAlertingL
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneAlerting::HandleDisconnectingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneUIStates,
 "CPhoneAlerting::HandleDisconnectingL()" );
-if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
-{
-// User has hangup alerting SAT call, complete sat request
-CompleteSatRequestL( aCallId );
-}
 CPhoneGsmInCall::HandleDisconnectingL( aCallId );
 }

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