--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Mon Aug 23 15:42:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Fri Sep 03 13:33:36 2010 +0300
@@ -216,11 +216,8 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- // Stop capturing keys
- CaptureKeysDuringCallNotificationL( EFalse );
-
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
+ if ( !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -260,13 +257,9 @@
callHeaderParam.SetCallState( EPEStateConnected );
iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
&callHeaderParam );
-
- // Capturing keys and number entry must be removed because some
- // networks jump over connecting state directly to connected state.
- CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
+ if ( !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -306,8 +299,6 @@
if( activeCallCount.Integer() )
{
- CheckIfRestoreNEContentAfterDtmfDialer();
-
if ( IsNumberEntryUsedL() )
{
// Show the number entry if it exists
@@ -320,10 +311,7 @@
}
SetTouchPaneButtons( EPhoneIncallButtons );
- // UnCapture keys callsetup fails
- CaptureKeysDuringCallNotificationL( EFalse );
- // Setup call was terminated
- iStateMachine->ChangeState( EPhoneStateSingle );
+ iStateMachine->ChangeState( EPhoneStateSingle );
}
else
{
@@ -335,7 +323,7 @@
SetToolbarButtonLoudspeakerEnabled();
// Update call setup CBAs
UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
- iStateMachine->ChangeState( EPhoneStateCallSetup );
+ iStateMachine->ChangeState( EPhoneStateCallSetup );
}
EndUiUpdate();