--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Tue Sep 14 21:18:17 2010 +0300
@@ -428,7 +428,7 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- BeginUiUpdateLC();
+ TransitionHandlerL().BeginUiUpdateLC();
// Update bubble content
UpdateRemoteInfoDataL( aCallId );
@@ -439,7 +439,7 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
&callHeaderParam );
- EndUiUpdate();
+ TransitionHandlerL().EndUiUpdate();
// Set call waiting cba
UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
@@ -507,15 +507,13 @@
holdFlag.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
- BeginUiUpdateLC();
+ TransitionHandlerL().BeginUiUpdateLC();
SetTouchPaneButtons( EPhoneCallSetupButtons );
SetToolbarDimming( ETrue );
SetToolbarButtonLoudspeakerEnabled();
- EndUiUpdate();
-
- // Go to Call Setup And Waiting state
+ TransitionHandlerL().EndUiUpdate();
// No need to update cbas
iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
}
@@ -548,12 +546,11 @@
holdFlag.SetBoolean( ETrue );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
- BeginUiUpdateLC();
+ TransitionHandlerL().BeginUiUpdateLC();
SetTouchPaneButtons( EPhoneWaitingCallButtons );
- EndUiUpdate();
- // Go to Single And Waiting state
+ TransitionHandlerL().EndUiUpdate();
UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
}
@@ -582,13 +579,12 @@
holdFlag.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
- BeginUiUpdateLC();
+ TransitionHandlerL().BeginUiUpdateLC();
SetTouchPaneButtons( EPhoneCallSetupButtons );
- EndUiUpdate();
- // Go to Single And Alerting state
- UpdateCbaL( EPhoneCallHandlingInCallCBA );
+ TransitionHandlerL().EndUiUpdate();
+ UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateAlertingInSingle );
}
@@ -600,15 +596,13 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL()");
-
- BeginUiUpdateLC();
+ TransitionHandlerL().BeginUiUpdateLC();
SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneTwoSinglesButtons );
- EndUiUpdate();
+ TransitionHandlerL().EndUiUpdate();
- // Go to two singles state
UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
iStateMachine->ChangeState( EPhoneStateTwoSingles );
}
@@ -622,12 +616,12 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL()");
- BeginUiUpdateLC();
+ TransitionHandlerL().BeginUiUpdateLC();
SetTouchPaneButtons( EPhoneWaitingCallButtons );
SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
- EndUiUpdate();
+ TransitionHandlerL().EndUiUpdate();
// Go to two singles state and waiting
UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );