--- a/phoneapp/phoneuistates/src/cphonealerting.cpp Mon Aug 23 15:42:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Fri Sep 03 13:33:36 2010 +0300
@@ -105,33 +105,25 @@
"CPhoneAlerting::HandleKeyMessageL()");
switch ( aCode )
{
- // send-key
- case EKeyYes:
+ case EKeyYes: // send-key
if ( IsNumberEntryUsedL() )
{
- // send a manual control sequence
- CallFromNumberEntryL();
+ CallFromNumberEntryL();
}
else
{
- // Show not allowed note
SendGlobalErrorNoteL(
EPhoneNoteTextNotAllowed, ETrue );
}
break;
- // end-key
- case EKeyNo:
- // handle long press
+ case EKeyNo: // end-key
if ( aMessage == EPhoneKeyLongPress )
{
- // Close all connections
iStateMachine->SendPhoneEngineMessage(
MPEPhoneModel::EPEMessageTerminateAllConnections );
-
if ( IsNumberEntryUsedL() )
{
- // Remove number entry from screen
iViewCommandHandle->ExecuteCommandL(
EPhoneViewRemoveNumberEntry );
// Do state-specific operation when number entry is cleared
@@ -139,22 +131,19 @@
}
if ( !TopAppIsDisplayedL() )
{
- // Bring app to foreground
TPhoneCmdParamInteger uidParam;
uidParam.SetInteger( KUidPhoneApplication.iUid );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewBringAppToForeground, &uidParam );
}
}
- else
+ else // handle short end key
{
- // handle end key
DisconnectOutgoingCallL();
}
break;
default:
- // do base operation
CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
break;
}
@@ -170,7 +159,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneAlerting::HandlePhoneEngineMessageL()");
-
switch ( aMessage )
{
case MEngineMonitor::EPEMessageConnected:
@@ -207,7 +195,6 @@
{
CPhoneGsmInCall::HandlePhoneEngineMessageL(
aMessage, aCallId );
-
// Simulate incoming event which was received while
// teardown of first call was ongoing.
iStateMachine->State()->HandlePhoneEngineMessageL(
@@ -222,7 +209,6 @@
default:
break;
}
-
CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
}
@@ -234,23 +220,15 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneAlerting::HandleConnectedL()");
- // Keep Phone in the foreground
TPhoneCmdParamBoolean booleanParam;
booleanParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
-
BeginUiUpdateLC();
-
- // Update the single call
UpdateSingleActiveCallL( aCallId );
-
- SetTouchPaneButtons( EPhoneIncallButtons );
-
+ SetTouchPaneButtons( EPhoneIncallButtons );
EndUiUpdate();
-
- // Go to single state
- UpdateCbaL( EPhoneCallHandlingInCallCBA );
+ UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateSingle );
}
@@ -274,17 +252,14 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneAlerting::IsVideoCallAlerting()" );
TBool retVal = EFalse;
- // Fetch active call's id from view
TPhoneCmdParamCallStateData callStateData;
callStateData.SetCallState( EPEStateConnecting );
iViewCommandHandle->HandleCommandL(
EPhoneViewGetCallIdByState, &callStateData );
-
if ( callStateData.CallId() > KErrNotFound )
{
retVal = IsVideoCall( callStateData.CallId() );
}
-
return retVal;
}
@@ -310,6 +285,4 @@
CPhoneGsmInCall::HandleDisconnectingL( aCallId );
}
-
-
// End of File