--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Tue Aug 31 15:14:29 2010 +0300
@@ -52,16 +52,6 @@
 //
 CPhoneConferenceAndCallSetup::~CPhoneConferenceAndCallSetup()
     {
-    // Need to check iViewCommandHandle validity here to not
-    // trigger a high/can panic error in a Codescanner run.
-    // coverity[var_compare_op]
-    if ( iViewCommandHandle )
-        {
-        TPhoneCmdParamBoolean dtmfSendFlag;
-        dtmfSendFlag.SetBoolean( EFalse );
-        TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	    &dtmfSendFlag ) );
-        }
     }
 
 // -----------------------------------------------------------
@@ -109,35 +99,25 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageConnecting:
-            {
             iAlerting = ETrue;
             HandleConnectingL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageConnected:
-            {
             HandleConnectedL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageIdle:
-            {
             HandleIdleL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageConferenceIdle:
-            {
             HandleConferenceIdleL();
-            }
             break;
             
         default:
-            {
             CPhoneConference::HandlePhoneEngineMessageL( aMessage, 
                 aCallId );
-            }
             break;
         }
     }
@@ -156,7 +136,6 @@
         {   
         case EPhoneDtmfDialerCancel:
             {
-            CloseDTMFEditorL();
             }
             break;    
     
@@ -199,46 +178,6 @@
             break;
         }
     }
-// -----------------------------------------------------------
-// CPhoneConferenceAndCallSetup::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndCallSetup::OpenMenuBarL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::OpenMenuBarL()");
-    TInt resourceId;
-    
-    // Set specific flag to view so that DTMF menu item available
-    TPhoneCmdParamBoolean dtmfSendFlag;
-    dtmfSendFlag.SetBoolean( ETrue );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	&dtmfSendFlag );
-     
-    if ( iOnScreenDialer &&  IsDTMFEditorVisibleL() )
-        {
-        resourceId = EPhoneDtmfDialerMenubar;
-        }
-    else if ( IsNumberEntryVisibleL() )
-        {
-        resourceId = EPhoneAlertingAndConfHeldCallMenuBarWithNumberEntry;
-        }
-    else if ( IsConferenceBubbleInSelectionMode() )
-        {
-        resourceId = EPhoneConfCallParticipantsDropMenubar;    
-        }        
-    else
-	    {
-	    resourceId = EPhoneAlertingAndConfHeldCallMenuBar;
-	    }
-
-    TPhoneCmdParamInteger integerParam;
-    integerParam.SetInteger( 
-                CPhoneMainResourceResolver::Instance()->
-                ResolveResourceID( resourceId ) );
-	    
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, 
-        &integerParam );
-    }
 
 // -----------------------------------------------------------
 // CPhoneConferenceAndCallSetup::HandleConnectingL
@@ -264,7 +203,7 @@
     CaptureKeysDuringCallNotificationL( EFalse );
 
     // Remove the number entry if it isn't DTMF dialer
-    if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || ! IsDTMFEditorVisibleL() )
+    if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
         }
@@ -293,9 +232,12 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::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();
         
     // Show bubble
@@ -309,13 +251,12 @@
     CaptureKeysDuringCallNotificationL( EFalse );
     
     // Remove the number entry if it isn't DTMF dialer
-    if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || ! IsDTMFEditorVisibleL() )
+    if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
         }
     
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
-    SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
     EndUiUpdate(); 
     
     UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA );
@@ -340,17 +281,14 @@
     // Stop capturing keys
     CaptureKeysDuringCallNotificationL( EFalse );
 
-    // Close menu bar, if it is displayed
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
     TPhoneCmdParamBoolean conferenceExistsForCallId;
     iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
         aCallId, &conferenceExistsForCallId );
     
     if( conferenceExistsForCallId.Boolean() )
         {
-		// Remove 'Conference on hold' global note
-	    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
+        // Remove 'Conference on hold' global note
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
     
         // Remove conference member from conference bubble
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference, 
@@ -374,17 +312,19 @@
                 }
             else
                 {
-                iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );
+                iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );     
                 }
             }
         }
     else
-        {
+        {       
         // Remove  outgoing call 
-        BeginTransEffectLC( ENumberEntryOpen );
         BeginUiUpdateLC();
+        
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
+        
         CheckIfRestoreNEContentAfterDtmfDialer();
+         
         if ( IsNumberEntryUsedL() )
             {
             // Show the number entry if it exists
@@ -393,11 +333,14 @@
             
         SetTouchPaneButtons( EPhoneConferenceButtons );
         EndUiUpdate();
-        EndTransEffect(); 
+
+        // Go to conference state
         UpdateCbaL( EPhoneCallHandlingInCallCBA );
         iStateMachine->ChangeState( EPhoneStateConference );
-        }
+        } 
+
     }
+   
     
 // -----------------------------------------------------------
 // CPhoneConferenceAndCallSetup::UpdateInCallCbaL