--- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp	Tue Aug 31 15:14:29 2010 +0300
@@ -102,20 +102,15 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageConnected:
-            {
             HandleConnectedL( aCallId );
             break;
-            }
+            
         case MEngineMonitor::EPEMessageIdle:
-            {
             HandleIdleL( aCallId );
-            }
             break;
-           
+            
         default:
-            {
             CPhoneAlerting::HandlePhoneEngineMessageL( aMessage, aCallId );
-            }
             break;
         }
     }
@@ -143,7 +138,7 @@
                 {
                 // Show not allowed note
                 CPhoneState::SendGlobalErrorNoteL( 
-                    EPhoneNoteTextNotAllowed );
+                    EPhoneNoteTextNotAllowed, ETrue );
                 }
             break;
 
@@ -192,9 +187,12 @@
         EPhoneViewGetCallIdByState, &callStateData );
         
     if( callStateData.CallId() == aCallId )
-        {        
-        // Close menu bar, if it is displayed
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+        {    
+        // Keep Phone in the foreground
+        TPhoneCmdParamBoolean booleanParam;
+        booleanParam.SetBoolean( EFalse );
+        iViewCommandHandle->ExecuteCommandL( 
+            EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
 
         CPhoneState::BeginUiUpdateLC();
             
@@ -204,8 +202,8 @@
         iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
             &callHeaderParam );
 
-        SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-        EndUiUpdate();
+        CPhoneState::SetTouchPaneButtons( EPhoneTwoSinglesButtons );
+        CPhoneState::EndUiUpdate();
               
         // Set Hold flag to view
         TPhoneCmdParamBoolean holdFlag;
@@ -214,7 +212,7 @@
         
         
         // Set Two singles softkeys
-	    UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
+        UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
         
         // Go to two singles state
         iStateMachine->ChangeState( EPhoneStateTwoSingles );
@@ -246,9 +244,6 @@
     // Remove call 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
-    // Close menu bar, if it is displayed
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
     if ( !TopAppIsDisplayedL() )
         {
         // Continue displaying current app but set up the 
@@ -282,40 +277,13 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneSingleAndAlerting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndAlerting::OpenMenuBarL()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
-        "CPhoneSingleAndAlerting::OpenMenuBarL()");
-    TInt resourceId;
-
-    if ( IsNumberEntryVisibleL() )
-        {
-        resourceId = EPhoneAlertingAndHeldCallMenuBarWithNumberEntry;
-        }
-    else
-        {
-        resourceId = EPhoneAlertingAndHeldCallMenuBar;
-        }
-
-    TPhoneCmdParamInteger integerParam;
-    integerParam.SetInteger( 
-        CPhoneMainResourceResolver::Instance()->
-        ResolveResourceID( resourceId ) );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, 
-        &integerParam );
-    }
-
-// -----------------------------------------------------------
 // CPhoneSingleAndAlerting::UpdateInCallCbaL
 // -----------------------------------------------------------
 //
 void CPhoneSingleAndAlerting::UpdateInCallCbaL()
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneSingleAndAlerting::UpdateInCallCbaL() ");
- 	UpdateCbaL( EPhoneCallHandlingInCallCBA );
+    UpdateCbaL( EPhoneCallHandlingInCallCBA );
     }