--- a/phoneapp/phoneuistates/src/cphonealerting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -131,11 +131,9 @@
if ( IsNumberEntryUsedL() )
{
- BeginTransEffectLC( ENumberEntryClose );
// Remove number entry from screen
iViewCommandHandle->ExecuteCommandL(
EPhoneViewRemoveNumberEntry );
- EndTransEffect();
// Do state-specific operation when number entry is cleared
HandleNumberEntryClearedL();
}
@@ -242,17 +240,12 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
BeginUiUpdateLC();
// Update the single call
UpdateSingleActiveCallL( aCallId );
SetTouchPaneButtons( EPhoneIncallButtons );
-
- SetToolbarDimming( EFalse );
EndUiUpdate();
@@ -262,42 +255,6 @@
}
// -----------------------------------------------------------
-// CPhoneAlerting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneAlerting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneAlerting::OpenMenuBarL()");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneAlertingCallMenubarWithNumberEntry;
- }
- // Use different resources for alerting data, video and cs call
- else if( IsVideoCallAlertingL() )
- {
- resourceId = EPhoneAlertingVideoCallMenubar;
- }
- else
- {
- resourceId = EPhoneAlertingCallMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneAlerting::HandleCommandL
// -----------------------------------------------------------
//
@@ -305,30 +262,7 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneAlerting::HandleCommandL()" );
- TBool commandStatus = ETrue;
-
- switch( aCommand )
- {
- case EPhoneInCallCmdHelp:
- {
- TPtrC contextName;
- if ( IsVideoCallAlertingL() )
- {
- contextName.Set( KINCAL_HLP_VIDEOCALL() );
- }
- else
- {
- contextName.Set( KINCAL_HLP_CALL_HANDLING() );
- }
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication, 0, contextName );
- }
- break;
- default:
- commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
- break;
- }
- return commandStatus;
+ return CPhoneGsmInCall::HandleCommandL( aCommand );
}
// -----------------------------------------------------------