diff -r 2a5d4ab426d3 -r d1c62c765e48 phoneapp/phoneuicontrol/src/cphonestateincall.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Fri Sep 03 13:33:36 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Fri Sep 17 17:09:12 2010 +0300
@@ -21,7 +21,6 @@
 #include <StringLoader.h>
 #include <PSVariables.h>
 #include <hwrmdomainpskeys.h>
-#include <UikonInternalPSKeys.h>
 #include <mpeengineinfo.h>
 #include <videotelcontrolmediatorapi.h>
 #include <MediatorDomainUIDs.h>
@@ -136,7 +135,7 @@
             
 #ifdef RD_INTELLIGENT_TEXT_INPUT
         case EKeyEnter:
-            if ( IsNumberEntryVisibleL() )
+            if ( iNumberEntryManager->IsNumberEntryVisibleL() )
                 {
                 HandleCommandL( EPhoneCmdOptions );
                 }
@@ -156,7 +155,7 @@
     __LOGMETHODSTARTEND(EPhoneControl,  
         "CPhoneStateInCall::HandleNumberEntryClearedL()" );
     // Update single call CBA when number entry is cleared
-     UpdateInCallCbaL();
+    UpdateUiCommands();
     }
 
 // -----------------------------------------------------------
@@ -220,7 +219,7 @@
             if ( IsWaitingCallL( aCallId ) )
                 {
                 // Update remote info data and label.
-                UpdateRemoteInfoDataAndLabelL( aCallId, UpdateCallHeaderInfoL( aCallId ) );
+                UpdateRemoteInfoDataAndLabelL( aCallId );
                 }
             else
                 {
@@ -239,15 +238,13 @@
 // -----------------------------------------------------------
 //
 void CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL( 
-        TInt aCallId, 
-        TPhoneCmdParamCallHeaderData aCallHeaderParam )
+        TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneControl,
             "CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL ()" );
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel, 
-        aCallId,
-        &aCallHeaderParam );
+        aCallId );
     }
 
 // -----------------------------------------------------------
@@ -263,13 +260,13 @@
     TPtr ptr( phoneNumber->Des() );
     TPhoneCmdParamString stringParam;
     stringParam.SetString( &ptr );
-    
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
+
     
     BeginUiUpdateLC();
     SetDefaultFlagsL();
-    if ( IsNumberEntryUsedL() )
+	iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
+    if ( iNumberEntryManager->IsNumberEntryUsedL() )
         {
         iViewCommandHandle->ExecuteCommand(
                 EPhoneViewGetNumberFromEntry,
@@ -278,20 +275,14 @@
         showDialer = ETrue;
         }
     
-    if ( !TopAppIsDisplayedL() || IsAutoLockOn() )
+    if ( IsAutoLockOn() || !showDialer )
         {
-        // Continue displaying current app but set up the 
-        // idle screen in the background
-        SetupIdleScreenInBackgroundL();
+        RemoveDialogsAndSendPhoneToBackgroundL();
         }
     else if ( showDialer )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewLaunchLogs, &stringParam );
         }
-    else 
-        {
-        DisplayIdleScreenL();
-        }
         
     DeleteTouchPaneButtons();
     EndUiUpdate();
@@ -305,26 +296,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneStateInCall::UpdateInCallCbaL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::UpdateInCallCbaL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::UpdateInCallCbaL() ");
-    UpdateCbaL( EPhoneCallHandlingInCallCBA );
-    }
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::UpdateCbaL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::UpdateCbaL( TInt aResource )
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::UpdateCbaL() ");
-    iCbaManager->UpdateCbaL( aResource );
-    }
-
-// -----------------------------------------------------------
 // CPhoneStateInCall::HandleAudioMuteChangedL
 // -----------------------------------------------------------
 //
@@ -333,13 +304,7 @@
     __LOGMETHODSTARTEND(EPhoneControl,  
         "CPhoneStateInCall::HandleAudioMuteChangedL()" );
     CPhoneState::HandleAudioMuteChangedL();
-    // Update the single call CBA only if the number entry is not
-    // used
-    if ( !IsNumberEntryUsedL() )
-        {
-        // Go to current state implementation
-        UpdateInCallCbaL();
-        }
+    UpdateUiCommands();
     }
 
 // -----------------------------------------------------------
@@ -350,11 +315,8 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl,  
         "CPhoneStateInCall::HandleAudioOutputChangedL()" );
-    CPhoneState::HandleAudioOutputChangedL();
-
-    UpdateInCallCbaL();
-    
-    SetTouchPaneButtons(0);
+    CPhoneState::HandleAudioOutputChangedL();    
+    UpdateUiCommands();
     }
 
 // -----------------------------------------------------------
@@ -555,7 +517,7 @@
                     {  
                     // Send a manual control sequence by providing number 
                     // information with dial command
-                    CallFromNumberEntryL();
+                    iNumberEntryManager->CallFromNumberEntryL();
                     }
                 else
                     {
@@ -566,7 +528,7 @@
                 }
             else
                 {
-                CallFromNumberEntryL();
+                iNumberEntryManager->CallFromNumberEntryL();
                 }
             break;
 
@@ -591,20 +553,15 @@
         case EPhoneNumberAcqCmdVideoCall:
             {// Create normal voice call, if number is emergency number.
             // Get the number entry contents
-            HBufC* phoneNumber = PhoneNumberFromEntryLC();
+            HBufC* phoneNumber = iNumberEntryManager->PhoneNumberFromEntryLC();
             iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber );
             iStateMachine->SendPhoneEngineMessage(
                 MPEPhoneModel::EPEMessageCheckEmergencyNumber );
             CleanupStack::PopAndDestroy( phoneNumber );}
             break;
-            
-        case EPhoneInCallCmdLockKeypad:
-        case EPhoneInCallCmdLockScreen:
-            LockKeypadL();
-            break;
 
        case EPhoneViewOpenCallHandling:
-            if ( IsNumberEntryUsedL() )
+            if ( iNumberEntryManager->IsNumberEntryUsedL() )
                 {
                 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
                 HandleNumberEntryClearedL();
@@ -612,11 +569,8 @@
             commandStatus = CPhoneState::HandleCommandL( aCommand );
             break;
             
-       case EPhoneInCallCmdNewCallFind:
        case EPhoneInCallCmdNewCall:
-       case EPhoneInCallCmdDtmfListViewSearch:
        case EPhoneInCallCmdDtmfManualQuery:
-       case EPhoneCmdDtmfSearch:
        case EPhoneDtmfDialerExit:
        case EPhoneCmdOptions:
            break;
@@ -825,10 +779,7 @@
             }
         else
             {
-            if ( IsNumberEntryUsedL() )
-                {
-                SetNumberEntryVisibilityL(ETrue);   
-                }
+            iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
             }
         }
 
@@ -847,29 +798,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CPhoneStateInCall::LockKeysL
-// -----------------------------------------------------------------------------
-//
-void CPhoneStateInCall::LockKeypadL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::LockKeypadL()");
-    TInt state = EPSHWRMGripStatusUninitialized; 
-    if ( !FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider ) )
-        {
-        TInt err = RProperty::Get( KPSUidHWRM, KHWRMGripStatus, state );
-        if ( state == EPSHWRMGripOpen )
-            {
-            SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
-            }
-        }
-    
-    if ( state != EPSHWRMGripOpen )
-        {
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewEnableKeyLock );
-        }
-    }
-
-// -----------------------------------------------------------------------------
 // CPhoneStateInCall::HandleEndKeyPressL
 // -----------------------------------------------------------------------------
 //    
@@ -900,27 +828,16 @@
             {
             iStateMachine->SendPhoneEngineMessage(
                 MPEPhoneModel::EPEMessageTerminateAllConnections );
-            if ( IsNumberEntryContentStored() )
-                {
-                ClearNumberEntryContentCache();
-                }
+            iNumberEntryManager->ClearNumberEntryContentCacheIfContentStored();
             }
 
-        if ( IsNumberEntryUsedL() )
+        if ( iNumberEntryManager->IsNumberEntryUsedL() )
             {
             iViewCommandHandle->ExecuteCommandL( 
                 EPhoneViewRemoveNumberEntry );
             // Do state-specific operation when number entry is cleared
             HandleNumberEntryClearedL();
             }
-
-        if ( !TopAppIsDisplayedL() )
-            {
-            TPhoneCmdParamInteger uidParam;
-            uidParam.SetInteger( KUidPhoneApplication.iUid );
-            iViewCommandHandle->ExecuteCommandL(
-                EPhoneViewBringAppToForeground, &uidParam );
-            }
         }
     else
         {