--- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -98,6 +98,12 @@
                         KScreenSaverAllowScreenSaver,
                         EPhoneScreensaverNotAllowed );
         }
+    
+    if ( IsKeyLockOn() )
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
+        }
+    
     }
 
 // -----------------------------------------------------------
@@ -570,12 +576,10 @@
 //
 void CPhoneStateCallSetup::HandleConnectedL( TInt aCallId )
     {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()");        
-
-    // Close menu bar, if it is displayed
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()");
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
         
     // Remove the number entry if it isn't DTMF dialer
     if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
@@ -597,11 +601,9 @@
 
     SetToolbarDimming( EFalse );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
-    // Go to single state
     UpdateCbaL( EPhoneCallHandlingInCallCBA );    
-
     iStateMachine->ChangeState( EPhoneStateSingle );
     }
 
@@ -615,13 +617,15 @@
     if ( !NeedToReturnToForegroundAppL() &&
          IsNumberEntryUsedL() )
         {
-        BeginTransEffectLC( ECallUiDisappear );
+        TransitionHandlerL().
+                BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
         }
     else 
         {
-        BeginTransEffectLC( ENumberEntryOpen );
+        TransitionHandlerL().
+                BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen );
         }
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Disable the volume display
     iViewCommandHandle->ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume );
@@ -664,8 +668,7 @@
         DisplayIdleScreenL();
         }
         
-    EndUiUpdate();
-    EndTransEffect(); 
+    TransitionHandlerL().EndUiUpdateAndEffect();
     // No need update cba
     iStateMachine->ChangeState( EPhoneStateIdle );
     }