--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Fri Sep 17 08:29:19 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Mon Oct 04 00:16:48 2010 +0300
@@ -126,7 +126,7 @@
break;
case MEngineMonitor::EPEMessageHeld:
- HandleHeldL( aCallId );
+ UpdateBubbleAndUICommandsL( aCallId );
break;
case MEngineMonitor::EPEMessageConnected:
@@ -134,7 +134,7 @@
break;
case MEngineMonitor::EPEMessageDialing:
- HandleDiallingL( aCallId );
+ HandleDialingL( aCallId );
break;
case MEngineMonitor::EPEMessageDisconnecting:
@@ -177,9 +177,6 @@
case EPhoneInCallCmdNewCall:
break;
- case EPhoneInCallCmdNewCallCall:
- break;
-
case EPhoneCallComingCmdReject: // fall through
{
// Get waiting callid
@@ -224,9 +221,9 @@
{
case EKeyYes: // send-key
{
- if( IsNumberEntryVisibleL() )
+ if( iNumberEntryManager->IsNumberEntryVisibleL() )
{
- CallFromNumberEntryL();
+ iNumberEntryManager->CallFromNumberEntryL();
}
else
{
@@ -245,22 +242,6 @@
}
// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::HandleKeyEventL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::HandleKeyEventL(
- const TKeyEvent& aKeyEvent,
- TEventCode /*aEventCode*/ )
- {
- if( EKeyDeviceF == aKeyEvent.iCode )
- {
- __PHONELOG( EBasic, EPhoneUIStates,
- "CPhoneSingleAndWaiting::HandleKeyMessageL-deviceF" );
- HandleHoldSwitchL();
- }
- }
-
-// -----------------------------------------------------------
// CPhoneSingleAndWaiting::HandleIdleL
// -----------------------------------------------------------
//
@@ -317,31 +298,18 @@
// Display ringing bubble
if ( callStateData.CallId() > KErrNotFound )
- {
- TPhoneCmdParamCallHeaderData callHeaderParam;
- callHeaderParam.SetCallState( EPEStateRinging );
-
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- SetCallHeaderTextsForCallComingInL( callStateData.CallId(), EFalse, &callHeaderParam );
-
+ {
iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
- callStateData.CallId(),
- &callHeaderParam );
+ callStateData.CallId() );
- if ( IsNumberEntryVisibleL() )
+ if ( iNumberEntryManager->IsNumberEntryVisibleL() )
{
- SetNumberEntryVisibilityL(EFalse);
+ iNumberEntryManager->SetNumberEntryVisibilityL(EFalse);
}
- CheckDisableHWKeysAndCallUIL();
-
- SetTouchPaneButtons( EPhoneIncomingCallButtons );
+ SetRingingTonePlaybackL( callStateData.CallId() );
+ UpdateUiCommands();
BringIncomingToForegroundL();
- iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
- SetRingingTonePlaybackL( callStateData.CallId() );
}
SetBackButtonActive(EFalse);
EndUiUpdate();
@@ -353,69 +321,19 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
// Idle message came for waiting call
- if ( IsNumberEntryUsedL() )
+ if ( iNumberEntryManager->IsNumberEntryUsedL() )
{
- if ( NeedToSendToBackgroundL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- UpdateCbaL( EPhoneCallHandlingInCallCBA );
- }
- else
- {
- SetNumberEntryVisibilityL(ETrue);
- }
- }
- else
- {
- UpdateCbaL( EPhoneCallHandlingInCallCBA );
- // If numberentry is not open just check NeedToSendToBackgroundL and
- // sendbackround if needed.
- if ( NeedToSendToBackgroundL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- }
+ iNumberEntryManager->SetNumberEntryVisibilityL(ETrue);
}
- if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
- && iStateMachine->PhoneStorage()->IsScreenLocked() )
- {
- EnableCallUIL();
- }
- iStateMachine->PhoneStorage()->ResetBlockedKeysList();
- SetTouchPaneButtons( EPhoneIncallButtons );
+ UpdateUiCommands();
EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateSingle );
}
}
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::HandleHeldL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::HandleHeldL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::HandleHeldL() ");
- TPhoneCmdParamCallHeaderData callHeaderParam;
- callHeaderParam.SetCallState( EPEStateHeld );
- TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
- TInt callLabelId = CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneCallOnHold );
- StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() );
- callHeaderParam.SetLabelText( labelText );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
- &callHeaderParam );
-
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- UpdateInCallCbaL();
- SetTouchPaneButtons( EPhoneWaitingCallButtons );
- }
// -----------------------------------------------------------
// CPhoneSingleAndWaiting::HandleConnectedL
@@ -427,11 +345,12 @@
"CPhoneSingleAndWaiting::HandleConnectedL() ");
__PHONELOG1( EBasic, EPhoneUIStates,
"CPhoneSingleAndWaiting::HandleConnectedL (CallId=%d)", aCallId);
+
if ( iSingleCallId == aCallId )
{
// Connected message came for the hold call, we still
// have the waiting call also
- HandleUnholdL( aCallId );
+ UpdateBubbleAndUICommandsL( aCallId );
}
else
{
@@ -448,17 +367,9 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::HandleUnholdL() ");
- TPhoneCmdParamCallHeaderData callHeaderParam;
- callHeaderParam.SetCallState( EPEStateConnected );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
- &callHeaderParam );
+ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- UpdateInCallCbaL();
- SetTouchPaneButtons( EPhoneWaitingCallButtons );
+ UpdateUiCommands();
}
// -----------------------------------------------------------
@@ -469,105 +380,33 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() ");
- iStateMachine->PhoneStorage()->ResetBlockedKeysList();
BeginUiUpdateLC();
UpdateRemoteInfoDataL ( aCallId );
- TPhoneCmdParamCallHeaderData callHeaderParam;
- callHeaderParam.SetCallState( EPEStateConnected );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
- &callHeaderParam );
+ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- if ( IsNumberEntryUsedL() )
+ if ( iNumberEntryManager->IsNumberEntryUsedL() )
{
- if ( NeedToSendToBackgroundL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- UpdateCbaL( EPhoneCallHandlingInCallCBA );
- }
- else
- {
- SetNumberEntryVisibilityL(ETrue);
- }
- }
- else
- {
- UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
+ iNumberEntryManager->SetNumberEntryVisibilityL(ETrue);
}
- SetTouchPaneButtons( EPhoneTwoSinglesButtons );
+ UpdateUiCommands();
EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateTwoSingles );
}
// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::HandleDiallingL
+// CPhoneSingleAndWaiting::HandleDialingL
// -----------------------------------------------------------
//
-void CPhoneSingleAndWaiting::HandleDiallingL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::HandleDiallingL() ");
- BeginUiUpdateLC();
- SetNumberEntryVisibilityL(EFalse);
- DisplayCallSetupL( aCallId );
-
- // Set Hold flag to view ( DTMF menu label have to present )
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- SetTouchPaneButtons( EPhoneCallSetupButtons );
- EndUiUpdate();
-
- UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
- iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
- }
-
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::DisplayCallSetupL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::DisplayCallSetupL( TInt aCallId )
+void CPhoneSingleAndWaiting::HandleDialingL( TInt aCallId )
{
__LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::DisplayCallSetupL() ");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
-
- // Force telephony to the foreground
- TPhoneCmdParamInteger uidParam;
- uidParam.SetInteger( KUidPhoneApplication.iUid );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
- &uidParam );
-
- DisplayHeaderForOutgoingCallL( aCallId );
- }
-
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::UpdateInCallCbaL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::UpdateInCallCbaL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::UpdateInCallCbaL() ");
- TPhoneCmdParamInteger callIdParam;
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewGetExpandedBubbleCallId, &callIdParam );
- if ( callIdParam.Integer()==iSingleCallId )
- {
- CPhoneGsmInCall::UpdateInCallCbaL();
- }
- else
- {
- UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
- }
+ "CPhoneSingleAndWaiting::HandleDialingL() ");
+ DisplayCallHeaderL( aCallId, ESetNEVisibilityFalse);
+ iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
}
// -----------------------------------------------------------
@@ -594,20 +433,9 @@
// CPhoneSingleAndWaiting::HandleDisconnectingL
// -----------------------------------------------------------
//
-void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt aCallId )
+void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::HandleDisconnectingL( ) ");
-
- if( ( iSingleCallId == aCallId ) && IsVideoCall( aCallId ) )
- {
- __PHONELOG( EBasic, EPhoneControl,
- "CPhoneSingleAndWaiting::HandleDisconnectingL EPhoneViewSetNeedToSendToBackgroundStatus" );
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetNeedToSendToBackgroundStatus,
- &booleanParam );
- }
}
// -----------------------------------------------------------
@@ -617,7 +445,21 @@
void CPhoneSingleAndWaiting::UpdateUiControlsL()
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::UpdateUiControlsL( ) ");
- UpdateInCallCbaL();
+ UpdateUiCommands();
+ }
+
+// -----------------------------------------------------------
+// Updates bubble and ui commands
+// -----------------------------------------------------------
+//
+void CPhoneSingleAndWaiting::UpdateBubbleAndUICommandsL(
+ TInt aCallId )
+ {
+ __LOGMETHODSTARTEND( EPhoneUIStates,
+ "CPhoneSingleAndWaiting::UpdateBubbleAndUICommandsL() ");
+ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+
+ UpdateUiCommands();
}
// End of File