--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Mon Mar 15 12:40:24 2010 +0200
@@ -430,9 +430,6 @@
// Display incoming call
DisplayIncomingCallL( aCallId );
- // Disable HW keys and Call UI if needed
- CheckDisableHWKeysAndCallUIL();
-
EndUiUpdate();
EndTransEffect();
@@ -569,14 +566,10 @@
break;
case EPhoneCmdBack:
+ BeginTransEffectLC( ENumberEntryClose );
HandleBackCommandL();
- break;
-
- case EPhoneViewOpenNumberEntry:
- BeginTransEffectLC( ENumberEntryCreate );
- commandStatus = CPhoneState::HandleCommandL( aCommand );
- EndTransEffect();
- break;
+ EndTransEffect();
+ break;
default:
commandStatus = CPhoneState::HandleCommandL( aCommand );
@@ -606,9 +599,15 @@
ResolveResourceID( EPhoneNumberAcqOkMenubar ) );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewMenuBarOpen, &integerParam );
- commandStatus = ETrue;
+ commandStatus = ETrue;
}
- break;
+ break;
+
+ case EPhoneViewOpenNumberEntry:
+ BeginTransEffectLC( ENumberEntryOpen );
+ commandStatus = CPhoneState::ProcessCommandL( aCommand );
+ EndTransEffect();
+ break;
default:
commandStatus = CPhoneState::ProcessCommandL( aCommand );
@@ -679,14 +678,10 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewActivatePreviousApp );
- BeginTransEffectLC( ENumberEntryClose );
-
// Remove number entry from screen
iViewCommandHandle->ExecuteCommandL(
EPhoneViewRemoveNumberEntry );
- EndTransEffect();
-
iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
previousApp = ETrue;
}
@@ -694,14 +689,10 @@
if ( !previousApp )
{
- BeginTransEffectLC( ENumberEntryClose );
-
// Remove number entry from screen
iViewCommandHandle->ExecuteCommandL(
EPhoneViewRemoveNumberEntry );
-
- EndTransEffect();
-
+
// Do state-specific operation when number entry is cleared
HandleNumberEntryClearedL();
}