diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuistates/src/cphonealerting.cpp
--- a/phoneapp/phoneuistates/src/cphonealerting.cpp	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp	Tue Aug 31 15:14:29 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -21,7 +21,6 @@
 #include <mpeengineinfo.h>
 #include <mpeclientinformation.h>
 #include <MediatorDomainUIDs.h>
-#include <videotelcontrolmediatorapi.h>
 #include "cphonealerting.h"
 #include "mphonestatemachine.h"
 #include "tphonecmdparamboolean.h"
@@ -117,7 +116,7 @@
                 {
                 // Show not allowed note
                 SendGlobalErrorNoteL( 
-                    EPhoneNoteTextNotAllowed );
+                    EPhoneNoteTextNotAllowed, ETrue );
                 }
             break;
 
@@ -132,7 +131,11 @@
 
                 if ( IsNumberEntryUsedL() )
                     {
-                    CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+                    // Remove number entry from screen
+                    iViewCommandHandle->ExecuteCommandL( 
+                        EPhoneViewRemoveNumberEntry );
+                    // Do state-specific operation when number entry is cleared
+                    HandleNumberEntryClearedL();
                     }
                 if ( !TopAppIsDisplayedL() )
                     {
@@ -171,22 +174,17 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageConnected:
-            {
             HandleConnectedL( aCallId );
-            }
             break;
         
         case MEngineMonitor::EPEMessageDisconnecting:
-            {
             HandleDisconnectingL( aCallId );
-            }
             break;
         
         case MEngineMonitor::EPEMessageRemoteTerminated:
-            {
             iViewCommandHandle->ExecuteCommandL( 
-                EPhoneViewHideNaviPaneAudioVolume );            
-            }
+                EPhoneViewHideNaviPaneAudioVolume );
+            CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
             break;
         
         case MEngineMonitor::EPEMessageIncoming:
@@ -220,7 +218,6 @@
                 }
             }
             break;
-                   
         
         default:
             break;
@@ -237,19 +234,19 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneAlerting::HandleConnectedL()");
-
-    // Close menu bar, if it is displayed
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+    // Keep Phone in the foreground
+    TPhoneCmdParamBoolean booleanParam;
+    booleanParam.SetBoolean( EFalse );
+    iViewCommandHandle->ExecuteCommandL( 
+        EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
 
     BeginUiUpdateLC();
-
+        
     // Update the single call
     UpdateSingleActiveCallL( aCallId );
 
-    SetTouchPaneButtons( EPhoneIncallButtons );
-
-    SetToolbarDimming( EFalse );
-
+    SetTouchPaneButtons( EPhoneIncallButtons ); 
+        
     EndUiUpdate();
     
     // Go to single state
@@ -258,42 +255,6 @@
     }
 
 // -----------------------------------------------------------
-// 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
 // -----------------------------------------------------------
 //
@@ -301,30 +262,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,  
         "CPhoneAlerting::HandleCommandL()" );
-    TBool commandStatus = ETrue;
-
-    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;
+    return CPhoneGsmInCall::HandleCommandL( aCommand );
     }
 
 // -----------------------------------------------------------
@@ -369,13 +307,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,  
             "CPhoneAlerting::HandleDisconnectingL()" );
-    
-    if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
-        {
-        // User has hangup alerting SAT call, complete sat request
-        CompleteSatRequestL( aCallId );
-        }
-    
     CPhoneGsmInCall::HandleDisconnectingL( aCallId );
     }