Mercurial Mercurial > oss > FCL > sf > app > phone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fix for bug 2832. RCL_3 PDK_3.0.1
authorPat Downey <patd@symbian.org>
Mon, 12 Jul 2010 15:53:34 +0100
branchRCL_3
changeset 49 7e4661f76547
parent 44 3c221667e687 (diff)
parent 35 4853f386dec0 (current diff)
child 55 fbea179620e6
child 59 998e06c48bed
Merge fix for bug 2832.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/phone_application_commands_api/phone_application_commands_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="f8b5e8c2d5c658824216fea358937375" dataversion="2.0">
+  <name>phone_application_commands_api</name>
+  <description>List of phoneapp UI commands. This API is related to telephony_menu_extension_api.</description>
+  <type>c++</type>
+  <collection>phoneapp</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/phone_application_voip_commands_api/phone_application_voip_commands_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="86ebac75a121d58fad9a44aafb0092a4" dataversion="2.0">
+  <name>phone_application_voip_commands_api</name>
+  <description>List of phoneapp VoIP related UI commands. This API is related to telephony_menu_extension_api.</description>
+  <type>c++</type>
+  <collection>phoneapp</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/telephony_bubble_extension_api/telephony_bubble_extension_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="c883bcedfe2b2b72959090b59f8a33a2" dataversion="2.0">
+  <name>telephony_bubble_extension_api</name>
+  <description>This API enables customization of call handling UI (call bubbles). Certain indicators and caller image can be replaced with plug-in based implementation.</description>
+  <type>c++</type>
+  <collection>phoneuis</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.2"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/telephony_logging_extension_api/telephony_logging_extension_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="824866f4d6444f7c1413ddb7c446fff2" dataversion="2.0">
+  <name>telephony_logging_extension_api</name>
+  <description>This plug-in API enables manipulation of telephony event logging.</description>
+  <type>c++</type>
+  <collection>phoneengine</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/telephony_matching_extension_api/telephony_matching_extension_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="97e5b7b32efc3e749f51b863ac60acc0" dataversion="2.0">
+  <name>telephony_matching_extension_api</name>
+  <description>This plug-in API enables manipulation of telephony contact matching.</description>
+  <type>c++</type>
+  <collection>phoneengine</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/telephony_mediator_api/telephony_mediator_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="d195ea66b9998dedd678827e31db6bcd" dataversion="2.0">
+  <name>telephony_mediator_api</name>
+  <description>This mediator API can be used to: end calls, mute/unmute microphone and get call status information.</description>
+  <type>c++</type>
+  <collection>phoneapp</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/telephony_menu_extension_api/telephony_menu_extension_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="1bc03b12f63ce66ce85a12aa6418f5fe" dataversion="2.0">
+  <name>telephony_menu_extension_api</name>
+  <description>This plug-in API enables customization of phoneapp menus.</description>
+  <type>c++</type>
+  <collection>phoneapp</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phone_plat/video_telephony_mediator_api/video_telephony_mediator_api.metaxml	Mon Jul 12 15:53:34 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="48cd1f332053377c8039bd5aec60154d" dataversion="2.0">
+  <name>video_telephony_mediator_api</name>
+  <description>Video telephony specific mediator service. Used by video telephony.</description>
+  <type>c++</type>
+  <collection>phoneapp</collection>
+  <libs/>
+  <release category="platform" sinceversion="5.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>
--- a/phoneapp/phoneui/srcdata/callhandlingui.rss	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneui/srcdata/callhandlingui.rss	Mon Jul 12 15:53:34 2010 +0100
@@ -775,7 +775,7 @@
     {
     buttons =
         {
-        r_phoneui_ihf_toggle_button,
+        r_phoneui_hold_toggle_button,
         r_phoneui_end_outgoing_call_button
         };
     }
--- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Mon Jul 12 15:53:34 2010 +0100
@@ -1,240 +1,243 @@
 EXPORTS
-	?CallWaitingNoteL@CPhoneState@@IAEXH@Z @ 1 NONAME ; void CPhoneState::CallWaitingNoteL(int)
-	?HandleKeyMessageL@CPhoneStateIncoming@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 2 NONAME ; void CPhoneStateIncoming::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?TopAppIsDisplayedL@CPhoneState@@IBEHXZ @ 3 NONAME ; int CPhoneState::TopAppIsDisplayedL(void) const
-	?HandleKeyMessageL@CPhoneStateCallSetup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4 NONAME ; void CPhoneStateCallSetup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?SetContextMenuL@CPhoneState@@MAEXH@Z @ 5 NONAME ; void CPhoneState::SetContextMenuL(int)
-	?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 6 NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &)
-	?DisconnectCallL@CPhoneState@@MAEXXZ @ 7 NONAME ; void CPhoneState::DisconnectCallL(void)
-	?SetCbaL@CPhoneCbaManager@@QAEXH@Z @ 8 NONAME ; void CPhoneCbaManager::SetCbaL(int)
-	?InstanceL@CPhoneReconnectQuery@@SAPAV1@XZ @ 9 NONAME ; class CPhoneReconnectQuery * CPhoneReconnectQuery::InstanceL(void)
-	?HandlePhoneStartupL@CPhoneState@@UAEXXZ @ 10 NONAME ; void CPhoneState::HandlePhoneStartupL(void)
-	?HandlePhoneFocusLostEventL@CPhoneStateIdle@@UAEXXZ @ 11 NONAME ; void CPhoneStateIdle::HandlePhoneFocusLostEventL(void)
-	?HandleIdleL@CPhoneStateInCall@@IAEXH@Z @ 12 NONAME ; void CPhoneStateInCall::HandleIdleL(int)
-	?ShowQueryL@CPhoneState@@IAEXH@Z @ 13 NONAME ; void CPhoneState::ShowQueryL(int)
-	?PhoneNumberAvailableInPhoneEngineL@CPhoneStateInCall@@IAEXH@Z @ 14 NONAME ; void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL(int)
-	?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 15 NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void)
-	??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 16 NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleNumberLongKeyPressL@CPhoneStateIdle@@IAEXXZ @ 17 NONAME ; void CPhoneStateIdle::HandleNumberLongKeyPressL(void)
-	?HandlePropertyChangedL@CPhoneStateMachine@@UAEXABVTUid@@IH@Z @ 18 NONAME ; void CPhoneStateMachine::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 19 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
-	?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 20 NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void)
-	??1CPhoneStateCallSetup@@UAE@XZ @ 21 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
-	?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 22 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
-	?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 23 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
-	?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 24 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
-	?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 25 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
-	?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 26 NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *)
-	?HandleCommandL@CPhoneState@@UAEHH@Z @ 27 NONAME ; int CPhoneState::HandleCommandL(int)
-	?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 28 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
-	?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 29 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
-	?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 30 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
-	?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 31 NONAME ; void CPhoneStateIdle::HandleDialingL(int)
-	?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 32 NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void)
-	?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 33 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
-	?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 34 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
-	?RegisterStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 35 NONAME ; void CPhoneSecurityModeObserver::RegisterStateObserver(class MPhoneSecurityModeChangeObserver &)
-	?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 36 NONAME ; void CPhoneStateMachine::ChangeState(int)
-	?NewL@CPhoneUIController@@SAPAV1@AAVCPhoneViewController@@@Z @ 37 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class CPhoneViewController &)
-	?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 38 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
-	?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 39 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
-	?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 40 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
-	?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 41 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 42 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 43 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
-	?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 44 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
-	?HandleLongHashL@CPhoneState@@UAEXXZ @ 45 NONAME ; void CPhoneState::HandleLongHashL(void)
-	?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 46 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
-	?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 47 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
-	?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 48 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
-	?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 49 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
-	?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 50 NONAME ; void CPhoneState::HandleDisconnectingL(int)
-	?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 51 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
-	?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 52 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
-	?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 53 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
-	?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 54 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
-	?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 55 NONAME ; enum TPESimState CPhoneState::SimState(void) const
-	?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 56 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 57 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
-	?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 58 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int)
-	?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 59 NONAME ; void CPhoneState::CompleteSatRequestL(int)
-	?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 60 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 61 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
-	?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 62 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
-	?HandlePhoneEngineMessageL@CPhoneStateMachine@@UAEXHH@Z @ 63 NONAME ; void CPhoneStateMachine::HandlePhoneEngineMessageL(int, int)
-	?IsSecurityMode@CPhoneSecurityModeObserver@@UAEHXZ @ 64 NONAME ; int CPhoneSecurityModeObserver::IsSecurityMode(void)
-	?IsSimOk@CPhoneState@@QAEHXZ @ 65 NONAME ; int CPhoneState::IsSimOk(void)
-	?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 66 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
-	?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 67 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
-	?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 68 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
-	?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 69 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
-	?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 70 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
-	?IsKeyLockOn@CPhoneState@@MBEHXZ @ 71 NONAME ; int CPhoneState::IsKeyLockOn(void) const
-	??1CPhoneStateInCall@@UAE@XZ @ 72 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
-	?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 73 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
-	?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 74 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
-	?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 75 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
-	?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 76 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
-	?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 77 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
-	?ConstructL@CPhoneStateInCall@@MAEXXZ @ 78 NONAME ; void CPhoneStateInCall::ConstructL(void)
-	?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 79 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
-	?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 80 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
-	?IsAutolockEnabled@CPhoneSecurityModeObserver@@UAEHXZ @ 81 NONAME ; int CPhoneSecurityModeObserver::IsAutolockEnabled(void)
-	?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 82 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
-	?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 83 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
-	?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 84 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
-	?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 85 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
-	?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 86 NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
-	?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 87 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
-	?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 88 NONAME ; void CPhoneState::DialMultimediaCallL(void)
-	?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 89 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 90 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
-	?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 91 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 92 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
-	?SecurityMode@CPhoneStateMachine@@UAEPAVMPhoneSecurityModeObserver@@XZ @ 93 NONAME ; class MPhoneSecurityModeObserver * CPhoneStateMachine::SecurityMode(void)
-	?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 94 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
-	??1CPhoneUIController@@UAE@XZ @ 95 NONAME ; CPhoneUIController::~CPhoneUIController(void)
-	?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 96 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 97 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
-	?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 98 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
-	?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 99 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
-	?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 100 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
-	?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 101 NONAME ; void CPhoneStateIncoming::ConstructL(void)
-	?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 102 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
-	?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 103 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
-	?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 104 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
-	?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 105 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
-	?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 106 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
-	?IsVideoCall@CPhoneState@@IAEHH@Z @ 107 NONAME ; int CPhoneState::IsVideoCall(int)
-	?IsSwivelClosed@CPhoneState@@QBEHXZ @ 108 NONAME ; int CPhoneState::IsSwivelClosed(void) const
-	?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 109 NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
-	?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 110 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
-	?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 111 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
-	?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 112 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
-	?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 113 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 114 NONAME ; void CPhoneState::SetToolbarDimming(int)
-	?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 115 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int)
-	?IsAutoLockOn@CPhoneState@@UBEHXZ @ 116 NONAME ; int CPhoneState::IsAutoLockOn(void) const
-	?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 117 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
-	?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 118 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
-	?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 119 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 120 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
-	?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 121 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
-	?DialVoiceCallL@CPhoneState@@IAEXXZ @ 122 NONAME ; void CPhoneState::DialVoiceCallL(void)
-	?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 123 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
-	?EndUiUpdate@CPhoneState@@IAEXXZ @ 124 NONAME ; void CPhoneState::EndUiUpdate(void)
-	?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 125 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
-	?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 126 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
-	?EndTransEffect@CPhoneState@@QAEXXZ @ 127 NONAME ; void CPhoneState::EndTransEffect(void)
-	?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 128 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
-	?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 129 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 130 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
-	?ProcessCommandL@CPhoneState@@UAEHH@Z @ 131 NONAME ; int CPhoneState::ProcessCommandL(int)
-	?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 132 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
-	?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 133 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
-	?RemoveStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 134 NONAME ; void CPhoneSecurityModeObserver::RemoveStateObserver(class MPhoneSecurityModeChangeObserver &)
-	?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 135 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
-	?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 136 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
-	?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 137 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
-	?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 138 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
-	??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 139 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 140 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
-	?SetDivertIndication@CPhoneState@@UAEXH@Z @ 141 NONAME ; void CPhoneState::SetDivertIndication(int)
-	?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 142 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
-	?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 143 NONAME ; void CPhoneStateMachine::SetCallId(int)
-	?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 144 NONAME ; int CPhoneUIController::ProcessCommandL(int)
-	?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 145 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
-	?CanTransEffectTypeBeUsed@CPhoneState@@MAEHW4TStateTransEffectType@@@Z @ 146 NONAME ; int CPhoneState::CanTransEffectTypeBeUsed(enum TStateTransEffectType)
-	??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 147 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 148 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
-	??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 149 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 150 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 151 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
-	?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 152 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 153 NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int)
-	?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 154 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
-	?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 155 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
-	?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 156 NONAME ; int CPhoneUIController::HandleCommandL(int)
-	?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 157 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 158 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
-	?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 159 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
-	?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 160 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const
-	?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 161 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
-	??1CPhoneState@@UAE@XZ @ 162 NONAME ; CPhoneState::~CPhoneState(void)
-	?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 163 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 164 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
-	?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 165 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
-	?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 166 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	??1CPhoneStateMachine@@UAE@XZ @ 167 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
-	?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 168 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
-	?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 169 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
-	?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 170 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
-	?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 171 NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType)
-	?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 172 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
-	?SetSecurityModeObserver@CPhoneStateMachine@@UAEXPAVMPhoneSecurityModeObserver@@@Z @ 173 NONAME ; void CPhoneStateMachine::SetSecurityModeObserver(class MPhoneSecurityModeObserver *)
-	?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 174 NONAME ; void CPhoneUIController::HandleMessage(int, int)
-	?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 175 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
-	?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 176 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const
-	?DisplayCallSetupL@CPhoneStateIdle@@IAEXH@Z @ 177 NONAME ; void CPhoneStateIdle::DisplayCallSetupL(int)
-	?ConstructL@CPhoneStateStartup@@MAEXXZ @ 178 NONAME ; void CPhoneStateStartup::ConstructL(void)
-	?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 179 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?ShowNoteL@CPhoneState@@IAEXH@Z @ 180 NONAME ; void CPhoneState::ShowNoteL(int)
-	?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 181 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 182 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
-	?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 183 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
-	?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 184 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
-	?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 185 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
-	?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 186 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
-	?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 187 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
-	??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 188 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?CanTransEffectTypeBeUsed@CPhoneStateIdle@@MAEHW4TStateTransEffectType@@@Z @ 189 NONAME ; int CPhoneStateIdle::CanTransEffectTypeBeUsed(enum TStateTransEffectType)
-	??1CPhoneStateIncoming@@UAE@XZ @ 190 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
-	?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 191 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
-	?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 192 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
-	?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 193 NONAME ; int CPhoneState::IsNoteVisibleL(void)
-	?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 194 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
-	?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 195 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
-	?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 196 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
-	?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 197 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 198 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 199 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
-	?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 200 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
-	?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 201 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
-	?ConstructL@CPhoneStateIdle@@MAEXXZ @ 202 NONAME ; void CPhoneStateIdle::ConstructL(void)
-	?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 203 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
-	?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 204 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags)
-	?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 205 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int)
-	?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 206 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
-	?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 207 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
-	?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 208 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
-	?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 209 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
-	?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 210 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
-	?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 211 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
-	?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 212 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
-	?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 213 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
-	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 214 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
-	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 215 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
-	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 216 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
-	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 217 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
-	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 218 NONAME ; void CPhoneState::HandleForegroundEventL(int)
-	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 219 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
-	?SetSecurityMessageHandler@CPhoneStateMachine@@UAEXPAVMPhoneSecurityMessageHandler@@@Z @ 220 NONAME ; void CPhoneStateMachine::SetSecurityMessageHandler(class MPhoneSecurityMessageHandler *)
-	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 221 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	??1CPhoneStateIdle@@UAE@XZ @ 222 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
-	?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 223 NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const
-	?Initialize@CPhoneSecurityModeObserver@@UAEXXZ @ 224 NONAME ; void CPhoneSecurityModeObserver::Initialize(void)
-	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 225 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
-	?BaseConstructL@CPhoneState@@QAEXXZ @ 226 NONAME ; void CPhoneState::BaseConstructL(void)
-	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 227 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
-	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 228 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
-	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 229 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
-	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 230 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
-	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 231 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
-	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 232 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
-	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 233 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
-	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 234 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
-	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 235 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
-	??1CPhoneStateStartup@@UAE@XZ @ 236 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
-	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 237 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?ForwardPEMessageToPhoneCustomizationL@CPhoneState@@IAEHHH@Z @ 238 NONAME ; int CPhoneState::ForwardPEMessageToPhoneCustomizationL(int, int)
+	?CallWaitingNoteL@CPhoneState@@IAEXH@Z @ 1  NONAME ; void CPhoneState::CallWaitingNoteL(int)
+	?HandleKeyMessageL@CPhoneStateIncoming@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 2  NONAME ; void CPhoneStateIncoming::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?TopAppIsDisplayedL@CPhoneState@@IBEHXZ @ 3  NONAME ; int CPhoneState::TopAppIsDisplayedL(void) const
+	?HandleKeyMessageL@CPhoneStateCallSetup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4  NONAME ; void CPhoneStateCallSetup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?SetContextMenuL@CPhoneState@@MAEXH@Z @ 5  NONAME ; void CPhoneState::SetContextMenuL(int)
+	?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 6  NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &)
+	?DisconnectCallL@CPhoneState@@MAEXXZ @ 7  NONAME ; void CPhoneState::DisconnectCallL(void)
+	?SetCbaL@CPhoneCbaManager@@QAEXH@Z @ 8  NONAME ; void CPhoneCbaManager::SetCbaL(int)
+	?InstanceL@CPhoneReconnectQuery@@SAPAV1@XZ @ 9  NONAME ; class CPhoneReconnectQuery * CPhoneReconnectQuery::InstanceL(void)
+	?HandlePhoneStartupL@CPhoneState@@UAEXXZ @ 10  NONAME ; void CPhoneState::HandlePhoneStartupL(void)
+	?HandlePhoneFocusLostEventL@CPhoneStateIdle@@UAEXXZ @ 11  NONAME ; void CPhoneStateIdle::HandlePhoneFocusLostEventL(void)
+	?HandleIdleL@CPhoneStateInCall@@IAEXH@Z @ 12  NONAME ; void CPhoneStateInCall::HandleIdleL(int)
+	?ShowQueryL@CPhoneState@@IAEXH@Z @ 13  NONAME ; void CPhoneState::ShowQueryL(int)
+	?PhoneNumberAvailableInPhoneEngineL@CPhoneStateInCall@@IAEXH@Z @ 14  NONAME ; void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL(int)
+	?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 15  NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void)
+	??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 16  NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandleNumberLongKeyPressL@CPhoneStateIdle@@IAEXXZ @ 17  NONAME ; void CPhoneStateIdle::HandleNumberLongKeyPressL(void)
+	?DisplayHeaderForInitializingCallL@CPhoneState@@IAEXH@Z @ 18  NONAME ; void CPhoneState::DisplayHeaderForInitializingCallL(int)
+	?HandlePropertyChangedL@CPhoneStateMachine@@UAEXABVTUid@@IH@Z @ 19  NONAME ; void CPhoneStateMachine::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 20  NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
+	?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 21  NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void)
+	??1CPhoneStateCallSetup@@UAE@XZ @ 22  NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
+	?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 23  NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
+	?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 24  NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
+	?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 25  NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
+	?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 26  NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
+	?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 27  NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *)
+	?HandleCommandL@CPhoneState@@UAEHH@Z @ 28  NONAME ; int CPhoneState::HandleCommandL(int)
+	?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 29  NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
+	?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 30  NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
+	?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 31  NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
+	?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 32  NONAME ; void CPhoneStateIdle::HandleDialingL(int)
+	?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 33  NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void)
+	?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 34  NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
+	?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 35  NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+	?RegisterStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 36  NONAME ; void CPhoneSecurityModeObserver::RegisterStateObserver(class MPhoneSecurityModeChangeObserver &)
+	?SetToolbarButtonHandsetEnabled@CPhoneState@@IAEXXZ @ 37  NONAME ; void CPhoneState::SetToolbarButtonHandsetEnabled(void)
+	?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 38  NONAME ; void CPhoneStateMachine::ChangeState(int)
+	?NewL@CPhoneUIController@@SAPAV1@AAVCPhoneViewController@@@Z @ 39  NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class CPhoneViewController &)
+	?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 40  NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
+	?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 41  NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
+	?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 42  NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
+	?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 43  NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 44  NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 45  NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
+	?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 46  NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
+	?HandleLongHashL@CPhoneState@@UAEXXZ @ 47  NONAME ; void CPhoneState::HandleLongHashL(void)
+	?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 48  NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
+	?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 49  NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
+	?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 50  NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
+	?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 51  NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
+	?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 52  NONAME ; void CPhoneState::HandleDisconnectingL(int)
+	?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 53  NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
+	?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 54  NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
+	?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 55  NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
+	?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 56  NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
+	?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 57  NONAME ; enum TPESimState CPhoneState::SimState(void) const
+	?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 58  NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 59  NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
+	?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 60  NONAME ; void CPhoneState::SendGlobalWarningNoteL(int)
+	?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 61  NONAME ; void CPhoneState::CompleteSatRequestL(int)
+	?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 62  NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 63  NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
+	?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 64  NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
+	?HandlePhoneEngineMessageL@CPhoneStateMachine@@UAEXHH@Z @ 65  NONAME ; void CPhoneStateMachine::HandlePhoneEngineMessageL(int, int)
+	?IsSecurityMode@CPhoneSecurityModeObserver@@UAEHXZ @ 66  NONAME ; int CPhoneSecurityModeObserver::IsSecurityMode(void)
+	?IsSimOk@CPhoneState@@QAEHXZ @ 67  NONAME ; int CPhoneState::IsSimOk(void)
+	?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 68  NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
+	?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 69  NONAME ; int CPhoneStateIdle::HandleCommandL(int)
+	?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 70  NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
+	?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 71  NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
+	?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 72  NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
+	?IsKeyLockOn@CPhoneState@@MBEHXZ @ 73  NONAME ; int CPhoneState::IsKeyLockOn(void) const
+	??1CPhoneStateInCall@@UAE@XZ @ 74  NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
+	?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 75  NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
+	?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 76  NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
+	?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 77  NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
+	?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 78  NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
+	?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 79  NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
+	?ConstructL@CPhoneStateInCall@@MAEXXZ @ 80  NONAME ; void CPhoneStateInCall::ConstructL(void)
+	?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 81  NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
+	?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 82  NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
+	?IsAutolockEnabled@CPhoneSecurityModeObserver@@UAEHXZ @ 83  NONAME ; int CPhoneSecurityModeObserver::IsAutolockEnabled(void)
+	?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 84  NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
+	?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 85  NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
+	?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 86  NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
+	?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 87  NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+	?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 88  NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
+	?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 89  NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
+	?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 90  NONAME ; void CPhoneState::DialMultimediaCallL(void)
+	?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 91  NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 92  NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
+	?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 93  NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
+	?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 94  NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
+	?SecurityMode@CPhoneStateMachine@@UAEPAVMPhoneSecurityModeObserver@@XZ @ 95  NONAME ; class MPhoneSecurityModeObserver * CPhoneStateMachine::SecurityMode(void)
+	?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 96  NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
+	??1CPhoneUIController@@UAE@XZ @ 97  NONAME ; CPhoneUIController::~CPhoneUIController(void)
+	?ForwardPEMessageToPhoneCustomizationL@CPhoneState@@IAEHHH@Z @ 98  NONAME ; int CPhoneState::ForwardPEMessageToPhoneCustomizationL(int, int)
+	?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 99  NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 100  NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
+	?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 101  NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
+	?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 102  NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
+	?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 103  NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
+	?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 104  NONAME ; void CPhoneStateIncoming::ConstructL(void)
+	?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 105  NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
+	?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 106  NONAME ; void CPhoneState::SetTouchPaneButtons(int)
+	?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 107  NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
+	?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 108  NONAME ; void CPhoneState::CallFromNumberEntryL(void)
+	?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 109  NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
+	?IsVideoCall@CPhoneState@@IAEHH@Z @ 110  NONAME ; int CPhoneState::IsVideoCall(int)
+	?IsSwivelClosed@CPhoneState@@QBEHXZ @ 111  NONAME ; int CPhoneState::IsSwivelClosed(void) const
+	?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 112  NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
+	?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 113  NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
+	?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 114  NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
+	?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 115  NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
+	?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 116  NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 117  NONAME ; void CPhoneState::SetToolbarDimming(int)
+	?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 118  NONAME ; void CPhoneState::SendGlobalErrorNoteL(int)
+	?IsAutoLockOn@CPhoneState@@UBEHXZ @ 119  NONAME ; int CPhoneState::IsAutoLockOn(void) const
+	?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 120  NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
+	?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 121  NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
+	?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 122  NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 123  NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
+	?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 124  NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
+	?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 125  NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
+	?DialVoiceCallL@CPhoneState@@IAEXXZ @ 126  NONAME ; void CPhoneState::DialVoiceCallL(void)
+	?EndUiUpdate@CPhoneState@@IAEXXZ @ 127  NONAME ; void CPhoneState::EndUiUpdate(void)
+	?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 128  NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+	?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 129  NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
+	?EndTransEffect@CPhoneState@@QAEXXZ @ 130  NONAME ; void CPhoneState::EndTransEffect(void)
+	?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 131  NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
+	?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 132  NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 133  NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
+	?ProcessCommandL@CPhoneState@@UAEHH@Z @ 134  NONAME ; int CPhoneState::ProcessCommandL(int)
+	?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 135  NONAME ; void CPhoneState::BeginUiUpdateLC(void)
+	?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 136  NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
+	?RemoveStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 137  NONAME ; void CPhoneSecurityModeObserver::RemoveStateObserver(class MPhoneSecurityModeChangeObserver &)
+	?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 138  NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
+	?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 139  NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
+	?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 140  NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
+	?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 141  NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
+	??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 142  NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 143  NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
+	?SetDivertIndication@CPhoneState@@UAEXH@Z @ 144  NONAME ; void CPhoneState::SetDivertIndication(int)
+	?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 145  NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
+	?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 146  NONAME ; void CPhoneStateMachine::SetCallId(int)
+	?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 147  NONAME ; int CPhoneUIController::ProcessCommandL(int)
+	?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 148  NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
+	?CanTransEffectTypeBeUsed@CPhoneState@@MAEHW4TStateTransEffectType@@@Z @ 149  NONAME ; int CPhoneState::CanTransEffectTypeBeUsed(enum TStateTransEffectType)
+	??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 150  NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 151  NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
+	??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 152  NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 153  NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 154  NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+	?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 155  NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 156  NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int)
+	?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 157  NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
+	?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 158  NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
+	?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 159  NONAME ; int CPhoneUIController::HandleCommandL(int)
+	?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 160  NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 161  NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
+	?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 162  NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
+	?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 163  NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const
+	?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 164  NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
+	??1CPhoneState@@UAE@XZ @ 165  NONAME ; CPhoneState::~CPhoneState(void)
+	?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 166  NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 167  NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
+	?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 168  NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
+	?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 169  NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	??1CPhoneStateMachine@@UAE@XZ @ 170  NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
+	?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 171  NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
+	?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 172  NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
+	?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 173  NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
+	?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 174  NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType)
+	?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 175  NONAME ; void CPhoneStateCallSetup::ConstructL(void)
+	?SetSecurityModeObserver@CPhoneStateMachine@@UAEXPAVMPhoneSecurityModeObserver@@@Z @ 176  NONAME ; void CPhoneStateMachine::SetSecurityModeObserver(class MPhoneSecurityModeObserver *)
+	?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 177  NONAME ; void CPhoneUIController::HandleMessage(int, int)
+	?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 178  NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
+	?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 179  NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const
+	?DisplayCallSetupL@CPhoneStateIdle@@IAEXH@Z @ 180  NONAME ; void CPhoneStateIdle::DisplayCallSetupL(int)
+	?ConstructL@CPhoneStateStartup@@MAEXXZ @ 181  NONAME ; void CPhoneStateStartup::ConstructL(void)
+	?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 182  NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?ShowNoteL@CPhoneState@@IAEXH@Z @ 183  NONAME ; void CPhoneState::ShowNoteL(int)
+	?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 184  NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 185  NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
+	?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 186  NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
+	?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 187  NONAME ; void CPhoneState::SetHandsfreeModeL(int)
+	?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 188  NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
+	?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 189  NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
+	?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 190  NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
+	??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 191  NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?CanTransEffectTypeBeUsed@CPhoneStateIdle@@MAEHW4TStateTransEffectType@@@Z @ 192  NONAME ; int CPhoneStateIdle::CanTransEffectTypeBeUsed(enum TStateTransEffectType)
+	??1CPhoneStateIncoming@@UAE@XZ @ 193  NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
+	?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 194  NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
+	?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 195  NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
+	?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 196  NONAME ; int CPhoneState::IsNoteVisibleL(void)
+	?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 197  NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
+	?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 198  NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
+	?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 199  NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
+	?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 200  NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 201  NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 202  NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
+	?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 203  NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
+	?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 204  NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
+	?ConstructL@CPhoneStateIdle@@MAEXXZ @ 205  NONAME ; void CPhoneStateIdle::ConstructL(void)
+	?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 206  NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
+	?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 207  NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags)
+	?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 208  NONAME ; void CPhoneState::SendGlobalInfoNoteL(int)
+	?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 209  NONAME ; void CPhoneState::DisplayIdleScreenL(void)
+	?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 210  NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
+	?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 211  NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
+	?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 212  NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
+	?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 213  NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
+	?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 214  NONAME ; void CPhoneState::SetDefaultFlagsL(void)
+	?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 215  NONAME ; int CPhoneStateInCall::HandleCommandL(int)
+	?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 216  NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
+	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 217  NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
+	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 218  NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
+	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 219  NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
+	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 220  NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
+	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 221  NONAME ; void CPhoneState::HandleForegroundEventL(int)
+	?HandleErrorL@CPhoneStateIdle@@UAEXABUTPEErrorInfo@@@Z @ 222  NONAME ; void CPhoneStateIdle::HandleErrorL(struct TPEErrorInfo const &)
+	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 223  NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
+	?SetSecurityMessageHandler@CPhoneStateMachine@@UAEXPAVMPhoneSecurityMessageHandler@@@Z @ 224  NONAME ; void CPhoneStateMachine::SetSecurityMessageHandler(class MPhoneSecurityMessageHandler *)
+	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 225  NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	??1CPhoneStateIdle@@UAE@XZ @ 226  NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
+	?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 227  NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const
+	?Initialize@CPhoneSecurityModeObserver@@UAEXXZ @ 228  NONAME ; void CPhoneSecurityModeObserver::Initialize(void)
+	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 229  NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
+	?BaseConstructL@CPhoneState@@QAEXXZ @ 230  NONAME ; void CPhoneState::BaseConstructL(void)
+	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 231  NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
+	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 232  NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
+	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 233  NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
+	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 234  NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
+	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 235  NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
+	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 236  NONAME ; void CPhoneState::CloseDTMFEditorL(void)
+	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 237  NONAME ; void CPhoneState::SetTouchPaneVisible(int)
+	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 238  NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
+	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 239  NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
+	??1CPhoneStateStartup@@UAE@XZ @ 240  NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
+	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 241  NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
 
--- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Mon Jul 12 15:53:34 2010 +0100
@@ -89,384 +89,388 @@
 	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 88 NONAME
 	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 89 NONAME
 	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 90 NONAME
-	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 91 NONAME
-	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 92 NONAME
-	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 93 NONAME
-	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 94 NONAME
-	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 95 NONAME
-	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 96 NONAME
-	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 97 NONAME
-	_ZN11CPhoneState7IsSimOkEv @ 98 NONAME
-	_ZN11CPhoneState9ShowNoteLEi @ 99 NONAME
-	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 100 NONAME
-	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 101 NONAME
-	_ZN11CPhoneStateD0Ev @ 102 NONAME
-	_ZN11CPhoneStateD1Ev @ 103 NONAME
-	_ZN11CPhoneStateD2Ev @ 104 NONAME
-	_ZN15CPhoneStateIdle10ConstructLEv @ 105 NONAME
-	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 106 NONAME
-	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 107 NONAME
-	_ZN15CPhoneStateIdle14HandleCommandLEi @ 108 NONAME
-	_ZN15CPhoneStateIdle14HandleDialingLEi @ 109 NONAME
-	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 110 NONAME
-	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 111 NONAME
-	_ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 112 NONAME
-	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 113 NONAME
-	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 114 NONAME
-	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 115 NONAME
-	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 116 NONAME
-	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 117 NONAME
-	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 118 NONAME
-	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 119 NONAME
-	_ZN15CPhoneStateIdle24CanTransEffectTypeBeUsedE21TStateTransEffectType @ 120 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 121 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 122 NONAME
-	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 123 NONAME
-	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 124 NONAME
-	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 125 NONAME
-	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 126 NONAME
-	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 127 NONAME
-	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 128 NONAME
-	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 129 NONAME
-	_ZN15CPhoneStateIdleD0Ev @ 130 NONAME
-	_ZN15CPhoneStateIdleD1Ev @ 131 NONAME
-	_ZN15CPhoneStateIdleD2Ev @ 132 NONAME
-	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 133 NONAME
-	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 134 NONAME
-	_ZN16CPhoneCbaManager7SetCbaLEi @ 135 NONAME
-	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 136 NONAME
-	_ZN17CPhoneStateHandle8InstanceEv @ 137 NONAME
-	_ZN17CPhoneStateInCall10ConstructLEv @ 138 NONAME
-	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 139 NONAME
-	_ZN17CPhoneStateInCall11HandleIdleLEi @ 140 NONAME
-	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 141 NONAME
-	_ZN17CPhoneStateInCall14HandleCommandLEi @ 142 NONAME
-	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 143 NONAME
-	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 144 NONAME
-	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 145 NONAME
-	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 146 NONAME
-	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 147 NONAME
-	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 148 NONAME
-	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 149 NONAME
-	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 150 NONAME
-	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 151 NONAME
-	_ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 152 NONAME
-	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 153 NONAME
-	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 154 NONAME
-	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 155 NONAME
-	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 156 NONAME
-	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 157 NONAME
-	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 158 NONAME
-	_ZN17CPhoneStateInCallD0Ev @ 159 NONAME
-	_ZN17CPhoneStateInCallD1Ev @ 160 NONAME
-	_ZN17CPhoneStateInCallD2Ev @ 161 NONAME
-	_ZN18CPhoneStateMachine11ChangeStateEi @ 162 NONAME
-	_ZN18CPhoneStateMachine11PhoneEngineEv @ 163 NONAME
-	_ZN18CPhoneStateMachine12SecurityModeEv @ 164 NONAME
-	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 165 NONAME
-	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 166 NONAME
-	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 167 NONAME
-	_ZN18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 168 NONAME
-	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 169 NONAME
-	_ZN18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 170 NONAME
-	_ZN18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 171 NONAME
-	_ZN18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 172 NONAME
-	_ZN18CPhoneStateMachine5StateEv @ 173 NONAME
-	_ZN18CPhoneStateMachine9SetCallIdEi @ 174 NONAME
-	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 175 NONAME
-	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 176 NONAME
-	_ZN18CPhoneStateMachineD0Ev @ 177 NONAME
-	_ZN18CPhoneStateMachineD1Ev @ 178 NONAME
-	_ZN18CPhoneStateMachineD2Ev @ 179 NONAME
-	_ZN18CPhoneStateStartup10ConstructLEv @ 180 NONAME
-	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 181 NONAME
-	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 182 NONAME
-	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 183 NONAME
-	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 184 NONAME
-	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 185 NONAME
-	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 186 NONAME
-	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 187 NONAME
-	_ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 188 NONAME
-	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 189 NONAME
-	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 190 NONAME
-	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 191 NONAME
-	_ZN18CPhoneStateStartupD0Ev @ 192 NONAME
-	_ZN18CPhoneStateStartupD1Ev @ 193 NONAME
-	_ZN18CPhoneStateStartupD2Ev @ 194 NONAME
-	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 195 NONAME
-	_ZN18CPhoneUIController13HandleMessageEii @ 196 NONAME
-	_ZN18CPhoneUIController14HandleCommandLEi @ 197 NONAME
-	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 198 NONAME
-	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 199 NONAME
-	_ZN18CPhoneUIController15ProcessCommandLEi @ 200 NONAME
-	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 201 NONAME
-	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 202 NONAME
-	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 203 NONAME
-	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 204 NONAME
-	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 205 NONAME
-	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 206 NONAME
-	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 207 NONAME
-	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 208 NONAME
-	_ZN18CPhoneUIController4NewLER20CPhoneViewController @ 209 NONAME
-	_ZN18CPhoneUIControllerD0Ev @ 210 NONAME
-	_ZN18CPhoneUIControllerD1Ev @ 211 NONAME
-	_ZN18CPhoneUIControllerD2Ev @ 212 NONAME
-	_ZN19CPhoneStateIncoming10ConstructLEv @ 213 NONAME
-	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 214 NONAME
-	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 215 NONAME
-	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 216 NONAME
-	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 217 NONAME
-	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 218 NONAME
-	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 219 NONAME
-	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 220 NONAME
-	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 221 NONAME
-	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 222 NONAME
-	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 223 NONAME
-	_ZN19CPhoneStateIncomingD0Ev @ 224 NONAME
-	_ZN19CPhoneStateIncomingD1Ev @ 225 NONAME
-	_ZN19CPhoneStateIncomingD2Ev @ 226 NONAME
-	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 227 NONAME
-	_ZN20CPhoneReconnectQuery9InstanceLEv @ 228 NONAME
-	_ZN20CPhoneStateCallSetup10ConstructLEv @ 229 NONAME
-	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 230 NONAME
-	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 231 NONAME
-	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 232 NONAME
-	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 233 NONAME
-	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 234 NONAME
-	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 235 NONAME
-	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 236 NONAME
-	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 237 NONAME
-	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 238 NONAME
-	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 239 NONAME
-	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 240 NONAME
-	_ZN20CPhoneStateCallSetupD0Ev @ 241 NONAME
-	_ZN20CPhoneStateCallSetupD1Ev @ 242 NONAME
-	_ZN20CPhoneStateCallSetupD2Ev @ 243 NONAME
-	_ZNK11CPhoneState11IsKeyLockOnEv @ 244 NONAME
-	_ZNK11CPhoneState12IsAutoLockOnEv @ 245 NONAME
-	_ZNK11CPhoneState14IsSwivelClosedEv @ 246 NONAME
-	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 247 NONAME
-	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 248 NONAME
-	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 249 NONAME
-	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 250 NONAME
-	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 251 NONAME
-	_ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 252 NONAME
-	_ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 253 NONAME
-	_ZNK11CPhoneState8SimStateEv @ 254 NONAME
-	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 255 NONAME
-	_ZTI11CPhoneState @ 256 NONAME
-	_ZTI15CPhoneStateIdle @ 257 NONAME
-	_ZTI17CPhoneStateHandle @ 258 NONAME
-	_ZTI17CPhoneStateInCall @ 259 NONAME
-	_ZTI18CPhoneStateMachine @ 260 NONAME
-	_ZTI18CPhoneStateStartup @ 261 NONAME
-	_ZTI18CPhoneUIController @ 262 NONAME
-	_ZTI19CPhoneStateIncoming @ 263 NONAME
-	_ZTI20CPhoneReconnectQuery @ 264 NONAME
-	_ZTI20CPhoneStateCallSetup @ 265 NONAME
-	_ZTI23CPhoneDtmfWaitCharTimer @ 266 NONAME
-	_ZTI23CPhoneKeyEventForwarder @ 267 NONAME
-	_ZTI24CPhoneSystemEventHandler @ 268 NONAME
-	_ZTI26CPhoneRemoteControlHandler @ 269 NONAME
-	_ZTI27CPhoneBtaaDisconnectHandler @ 270 NONAME
-	_ZTV11CPhoneState @ 271 NONAME
-	_ZTV15CPhoneStateIdle @ 272 NONAME
-	_ZTV17CPhoneStateHandle @ 273 NONAME
-	_ZTV17CPhoneStateInCall @ 274 NONAME
-	_ZTV18CPhoneStateMachine @ 275 NONAME
-	_ZTV18CPhoneStateStartup @ 276 NONAME
-	_ZTV18CPhoneUIController @ 277 NONAME
-	_ZTV19CPhoneStateIncoming @ 278 NONAME
-	_ZTV20CPhoneReconnectQuery @ 279 NONAME
-	_ZTV20CPhoneStateCallSetup @ 280 NONAME
-	_ZTV23CPhoneDtmfWaitCharTimer @ 281 NONAME
-	_ZTV23CPhoneKeyEventForwarder @ 282 NONAME
-	_ZTV24CPhoneSystemEventHandler @ 283 NONAME
-	_ZTV26CPhoneRemoteControlHandler @ 284 NONAME
-	_ZTV27CPhoneBtaaDisconnectHandler @ 285 NONAME
-	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 286 NONAME
-	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 287 NONAME
-	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 288 NONAME
-	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 289 NONAME
-	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 290 NONAME
-	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 291 NONAME
-	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 292 NONAME
-	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 293 NONAME
-	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 294 NONAME
-	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 295 NONAME
-	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 296 NONAME
-	_ZThn12_N11CPhoneStateD0Ev @ 297 NONAME
-	_ZThn12_N11CPhoneStateD1Ev @ 298 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 299 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 300 NONAME
-	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 301 NONAME
-	_ZThn12_N15CPhoneStateIdleD0Ev @ 302 NONAME
-	_ZThn12_N15CPhoneStateIdleD1Ev @ 303 NONAME
-	_ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 304 NONAME
-	_ZThn12_N17CPhoneStateInCallD0Ev @ 305 NONAME
-	_ZThn12_N17CPhoneStateInCallD1Ev @ 306 NONAME
-	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 307 NONAME
-	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 308 NONAME
-	_ZThn12_N18CPhoneStateStartupD0Ev @ 309 NONAME
-	_ZThn12_N18CPhoneStateStartupD1Ev @ 310 NONAME
-	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 311 NONAME
-	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 312 NONAME
-	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 313 NONAME
-	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 314 NONAME
-	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 315 NONAME
-	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 316 NONAME
-	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 317 NONAME
-	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 318 NONAME
-	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 319 NONAME
-	_ZThn12_N18CPhoneUIControllerD0Ev @ 320 NONAME
-	_ZThn12_N18CPhoneUIControllerD1Ev @ 321 NONAME
-	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 322 NONAME
-	_ZThn12_N19CPhoneStateIncomingD0Ev @ 323 NONAME
-	_ZThn12_N19CPhoneStateIncomingD1Ev @ 324 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 325 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 326 NONAME
-	_ZThn16_N11CPhoneState14HandleCommandLEi @ 327 NONAME
-	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 328 NONAME
-	_ZThn16_N11CPhoneStateD0Ev @ 329 NONAME
-	_ZThn16_N11CPhoneStateD1Ev @ 330 NONAME
-	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 331 NONAME
-	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 332 NONAME
-	_ZThn16_N15CPhoneStateIdleD0Ev @ 333 NONAME
-	_ZThn16_N15CPhoneStateIdleD1Ev @ 334 NONAME
-	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 335 NONAME
-	_ZThn16_N17CPhoneStateInCallD0Ev @ 336 NONAME
-	_ZThn16_N17CPhoneStateInCallD1Ev @ 337 NONAME
-	_ZThn16_N18CPhoneStateStartupD0Ev @ 338 NONAME
-	_ZThn16_N18CPhoneStateStartupD1Ev @ 339 NONAME
-	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 340 NONAME
-	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 341 NONAME
-	_ZThn16_N18CPhoneUIControllerD0Ev @ 342 NONAME
-	_ZThn16_N18CPhoneUIControllerD1Ev @ 343 NONAME
-	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 344 NONAME
-	_ZThn16_N19CPhoneStateIncomingD0Ev @ 345 NONAME
-	_ZThn16_N19CPhoneStateIncomingD1Ev @ 346 NONAME
-	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 347 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 348 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 349 NONAME
-	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 350 NONAME
-	_ZThn20_N11CPhoneStateD0Ev @ 351 NONAME
-	_ZThn20_N11CPhoneStateD1Ev @ 352 NONAME
-	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 353 NONAME
-	_ZThn20_N15CPhoneStateIdleD0Ev @ 354 NONAME
-	_ZThn20_N15CPhoneStateIdleD1Ev @ 355 NONAME
-	_ZThn20_N17CPhoneStateInCallD0Ev @ 356 NONAME
-	_ZThn20_N17CPhoneStateInCallD1Ev @ 357 NONAME
-	_ZThn20_N18CPhoneStateStartupD0Ev @ 358 NONAME
-	_ZThn20_N18CPhoneStateStartupD1Ev @ 359 NONAME
-	_ZThn20_N19CPhoneStateIncomingD0Ev @ 360 NONAME
-	_ZThn20_N19CPhoneStateIncomingD1Ev @ 361 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 362 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 363 NONAME
-	_ZThn24_N11CPhoneState19SetDivertIndicationEi @ 364 NONAME
-	_ZThn24_N11CPhoneStateD0Ev @ 365 NONAME
-	_ZThn24_N11CPhoneStateD1Ev @ 366 NONAME
-	_ZThn24_N15CPhoneStateIdleD0Ev @ 367 NONAME
-	_ZThn24_N15CPhoneStateIdleD1Ev @ 368 NONAME
-	_ZThn24_N17CPhoneStateInCallD0Ev @ 369 NONAME
-	_ZThn24_N17CPhoneStateInCallD1Ev @ 370 NONAME
-	_ZThn24_N18CPhoneStateStartupD0Ev @ 371 NONAME
-	_ZThn24_N18CPhoneStateStartupD1Ev @ 372 NONAME
-	_ZThn24_N19CPhoneStateIncomingD0Ev @ 373 NONAME
-	_ZThn24_N19CPhoneStateIncomingD1Ev @ 374 NONAME
-	_ZThn24_N20CPhoneStateCallSetupD0Ev @ 375 NONAME
-	_ZThn24_N20CPhoneStateCallSetupD1Ev @ 376 NONAME
-	_ZThn28_N11CPhoneState25HandleNumberEntryClearedLEv @ 377 NONAME
-	_ZThn28_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 378 NONAME
-	_ZThn28_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 379 NONAME
-	_ZThn28_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 380 NONAME
-	_ZThn28_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 381 NONAME
-	_ZThn32_N11CPhoneState23HandleNumberEntryEditedEv @ 382 NONAME
-	_ZThn32_N11CPhoneStateD0Ev @ 383 NONAME
-	_ZThn32_N11CPhoneStateD1Ev @ 384 NONAME
-	_ZThn32_N15CPhoneStateIdleD0Ev @ 385 NONAME
-	_ZThn32_N15CPhoneStateIdleD1Ev @ 386 NONAME
-	_ZThn32_N17CPhoneStateInCallD0Ev @ 387 NONAME
-	_ZThn32_N17CPhoneStateInCallD1Ev @ 388 NONAME
-	_ZThn32_N18CPhoneStateStartupD0Ev @ 389 NONAME
-	_ZThn32_N18CPhoneStateStartupD1Ev @ 390 NONAME
-	_ZThn32_N19CPhoneStateIncomingD0Ev @ 391 NONAME
-	_ZThn32_N19CPhoneStateIncomingD1Ev @ 392 NONAME
-	_ZThn32_N20CPhoneStateCallSetupD0Ev @ 393 NONAME
-	_ZThn32_N20CPhoneStateCallSetupD1Ev @ 394 NONAME
-	_ZThn36_NK11CPhoneState11IsKeyLockOnEv @ 395 NONAME
-	_ZThn36_NK11CPhoneState12IsAutoLockOnEv @ 396 NONAME
-	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 397 NONAME
-	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 398 NONAME
-	_ZThn4_N11CPhoneStateD0Ev @ 399 NONAME
-	_ZThn4_N11CPhoneStateD1Ev @ 400 NONAME
-	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 401 NONAME
-	_ZThn4_N15CPhoneStateIdleD0Ev @ 402 NONAME
-	_ZThn4_N15CPhoneStateIdleD1Ev @ 403 NONAME
-	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 404 NONAME
-	_ZThn4_N17CPhoneStateInCallD0Ev @ 405 NONAME
-	_ZThn4_N17CPhoneStateInCallD1Ev @ 406 NONAME
-	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 407 NONAME
-	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 408 NONAME
-	_ZThn4_N18CPhoneStateMachine12SecurityModeEv @ 409 NONAME
-	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 410 NONAME
-	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 411 NONAME
-	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 412 NONAME
-	_ZThn4_N18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 413 NONAME
-	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 414 NONAME
-	_ZThn4_N18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 415 NONAME
-	_ZThn4_N18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 416 NONAME
-	_ZThn4_N18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 417 NONAME
-	_ZThn4_N18CPhoneStateMachine5StateEv @ 418 NONAME
-	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 419 NONAME
-	_ZThn4_N18CPhoneStateMachineD0Ev @ 420 NONAME
-	_ZThn4_N18CPhoneStateMachineD1Ev @ 421 NONAME
-	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 422 NONAME
-	_ZThn4_N18CPhoneStateStartupD0Ev @ 423 NONAME
-	_ZThn4_N18CPhoneStateStartupD1Ev @ 424 NONAME
-	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 425 NONAME
-	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 426 NONAME
-	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 427 NONAME
-	_ZThn4_N19CPhoneStateIncomingD0Ev @ 428 NONAME
-	_ZThn4_N19CPhoneStateIncomingD1Ev @ 429 NONAME
-	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 430 NONAME
-	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 431 NONAME
-	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 432 NONAME
-	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 433 NONAME
-	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 434 NONAME
-	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 435 NONAME
-	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 436 NONAME
-	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 437 NONAME
-	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 438 NONAME
-	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 439 NONAME
-	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 440 NONAME
-	_ZThn8_N11CPhoneStateD0Ev @ 441 NONAME
-	_ZThn8_N11CPhoneStateD1Ev @ 442 NONAME
-	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 443 NONAME
-	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 444 NONAME
-	_ZThn8_N15CPhoneStateIdleD0Ev @ 445 NONAME
-	_ZThn8_N15CPhoneStateIdleD1Ev @ 446 NONAME
-	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 447 NONAME
-	_ZThn8_N17CPhoneStateInCallD0Ev @ 448 NONAME
-	_ZThn8_N17CPhoneStateInCallD1Ev @ 449 NONAME
-	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 450 NONAME
-	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 451 NONAME
-	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 452 NONAME
-	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 453 NONAME
-	_ZThn8_N18CPhoneStateStartupD0Ev @ 454 NONAME
-	_ZThn8_N18CPhoneStateStartupD1Ev @ 455 NONAME
-	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 456 NONAME
-	_ZThn8_N18CPhoneUIControllerD0Ev @ 457 NONAME
-	_ZThn8_N18CPhoneUIControllerD1Ev @ 458 NONAME
-	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 459 NONAME
-	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 460 NONAME
-	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 461 NONAME
-	_ZThn8_N19CPhoneStateIncomingD0Ev @ 462 NONAME
-	_ZThn8_N19CPhoneStateIncomingD1Ev @ 463 NONAME
-	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 464 NONAME
-	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 465 NONAME
-	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 466 NONAME
-	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 467 NONAME
-	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 468 NONAME
-	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 469 NONAME
-	_ZN11CPhoneState37ForwardPEMessageToPhoneCustomizationLEii @ 470 NONAME
+	_ZN11CPhoneState30SetToolbarButtonHandsetEnabledEv @ 91 NONAME
+	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 92 NONAME
+	_ZN11CPhoneState33DisplayHeaderForInitializingCallLEi @ 93 NONAME
+	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 94 NONAME
+	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 95 NONAME
+	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 96 NONAME
+	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 97 NONAME
+	_ZN11CPhoneState37ForwardPEMessageToPhoneCustomizationLEii @ 98 NONAME
+	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 99 NONAME
+	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 100 NONAME
+	_ZN11CPhoneState7IsSimOkEv @ 101 NONAME
+	_ZN11CPhoneState9ShowNoteLEi @ 102 NONAME
+	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 103 NONAME
+	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 104 NONAME
+	_ZN11CPhoneStateD0Ev @ 105 NONAME
+	_ZN11CPhoneStateD1Ev @ 106 NONAME
+	_ZN11CPhoneStateD2Ev @ 107 NONAME
+	_ZN15CPhoneStateIdle10ConstructLEv @ 108 NONAME
+	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 109 NONAME
+	_ZN15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 110 NONAME
+	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 111 NONAME
+	_ZN15CPhoneStateIdle14HandleCommandLEi @ 112 NONAME
+	_ZN15CPhoneStateIdle14HandleDialingLEi @ 113 NONAME
+	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 114 NONAME
+	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 115 NONAME
+	_ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 116 NONAME
+	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 117 NONAME
+	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 118 NONAME
+	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 119 NONAME
+	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 120 NONAME
+	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 121 NONAME
+	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 122 NONAME
+	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 123 NONAME
+	_ZN15CPhoneStateIdle24CanTransEffectTypeBeUsedE21TStateTransEffectType @ 124 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 125 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 126 NONAME
+	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 127 NONAME
+	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 128 NONAME
+	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 129 NONAME
+	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 130 NONAME
+	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 131 NONAME
+	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 132 NONAME
+	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 133 NONAME
+	_ZN15CPhoneStateIdleD0Ev @ 134 NONAME
+	_ZN15CPhoneStateIdleD1Ev @ 135 NONAME
+	_ZN15CPhoneStateIdleD2Ev @ 136 NONAME
+	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 137 NONAME
+	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 138 NONAME
+	_ZN16CPhoneCbaManager7SetCbaLEi @ 139 NONAME
+	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 140 NONAME
+	_ZN17CPhoneStateHandle8InstanceEv @ 141 NONAME
+	_ZN17CPhoneStateInCall10ConstructLEv @ 142 NONAME
+	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 143 NONAME
+	_ZN17CPhoneStateInCall11HandleIdleLEi @ 144 NONAME
+	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 145 NONAME
+	_ZN17CPhoneStateInCall14HandleCommandLEi @ 146 NONAME
+	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 147 NONAME
+	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 148 NONAME
+	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 149 NONAME
+	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 150 NONAME
+	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 151 NONAME
+	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 152 NONAME
+	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 153 NONAME
+	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 154 NONAME
+	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 155 NONAME
+	_ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 156 NONAME
+	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 157 NONAME
+	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 158 NONAME
+	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 159 NONAME
+	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 160 NONAME
+	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 161 NONAME
+	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 162 NONAME
+	_ZN17CPhoneStateInCallD0Ev @ 163 NONAME
+	_ZN17CPhoneStateInCallD1Ev @ 164 NONAME
+	_ZN17CPhoneStateInCallD2Ev @ 165 NONAME
+	_ZN18CPhoneStateMachine11ChangeStateEi @ 166 NONAME
+	_ZN18CPhoneStateMachine11PhoneEngineEv @ 167 NONAME
+	_ZN18CPhoneStateMachine12SecurityModeEv @ 168 NONAME
+	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 169 NONAME
+	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 170 NONAME
+	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 171 NONAME
+	_ZN18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 172 NONAME
+	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 173 NONAME
+	_ZN18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 174 NONAME
+	_ZN18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 175 NONAME
+	_ZN18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 176 NONAME
+	_ZN18CPhoneStateMachine5StateEv @ 177 NONAME
+	_ZN18CPhoneStateMachine9SetCallIdEi @ 178 NONAME
+	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 179 NONAME
+	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 180 NONAME
+	_ZN18CPhoneStateMachineD0Ev @ 181 NONAME
+	_ZN18CPhoneStateMachineD1Ev @ 182 NONAME
+	_ZN18CPhoneStateMachineD2Ev @ 183 NONAME
+	_ZN18CPhoneStateStartup10ConstructLEv @ 184 NONAME
+	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 185 NONAME
+	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 186 NONAME
+	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 187 NONAME
+	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 188 NONAME
+	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 189 NONAME
+	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 190 NONAME
+	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 191 NONAME
+	_ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 192 NONAME
+	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 193 NONAME
+	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 194 NONAME
+	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 195 NONAME
+	_ZN18CPhoneStateStartupD0Ev @ 196 NONAME
+	_ZN18CPhoneStateStartupD1Ev @ 197 NONAME
+	_ZN18CPhoneStateStartupD2Ev @ 198 NONAME
+	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 199 NONAME
+	_ZN18CPhoneUIController13HandleMessageEii @ 200 NONAME
+	_ZN18CPhoneUIController14HandleCommandLEi @ 201 NONAME
+	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 202 NONAME
+	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 203 NONAME
+	_ZN18CPhoneUIController15ProcessCommandLEi @ 204 NONAME
+	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 205 NONAME
+	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 206 NONAME
+	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 207 NONAME
+	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 208 NONAME
+	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 209 NONAME
+	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 210 NONAME
+	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 211 NONAME
+	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 212 NONAME
+	_ZN18CPhoneUIController4NewLER20CPhoneViewController @ 213 NONAME
+	_ZN18CPhoneUIControllerD0Ev @ 214 NONAME
+	_ZN18CPhoneUIControllerD1Ev @ 215 NONAME
+	_ZN18CPhoneUIControllerD2Ev @ 216 NONAME
+	_ZN19CPhoneStateIncoming10ConstructLEv @ 217 NONAME
+	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 218 NONAME
+	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 219 NONAME
+	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 220 NONAME
+	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 221 NONAME
+	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 222 NONAME
+	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 223 NONAME
+	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 224 NONAME
+	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 225 NONAME
+	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 226 NONAME
+	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 227 NONAME
+	_ZN19CPhoneStateIncomingD0Ev @ 228 NONAME
+	_ZN19CPhoneStateIncomingD1Ev @ 229 NONAME
+	_ZN19CPhoneStateIncomingD2Ev @ 230 NONAME
+	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 231 NONAME
+	_ZN20CPhoneReconnectQuery9InstanceLEv @ 232 NONAME
+	_ZN20CPhoneStateCallSetup10ConstructLEv @ 233 NONAME
+	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 234 NONAME
+	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 235 NONAME
+	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 236 NONAME
+	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 237 NONAME
+	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 238 NONAME
+	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 239 NONAME
+	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 240 NONAME
+	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 241 NONAME
+	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 242 NONAME
+	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 243 NONAME
+	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 244 NONAME
+	_ZN20CPhoneStateCallSetupD0Ev @ 245 NONAME
+	_ZN20CPhoneStateCallSetupD1Ev @ 246 NONAME
+	_ZN20CPhoneStateCallSetupD2Ev @ 247 NONAME
+	_ZNK11CPhoneState11IsKeyLockOnEv @ 248 NONAME
+	_ZNK11CPhoneState12IsAutoLockOnEv @ 249 NONAME
+	_ZNK11CPhoneState14IsSwivelClosedEv @ 250 NONAME
+	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 251 NONAME
+	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 252 NONAME
+	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 253 NONAME
+	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 254 NONAME
+	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 255 NONAME
+	_ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 256 NONAME
+	_ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 257 NONAME
+	_ZNK11CPhoneState8SimStateEv @ 258 NONAME
+	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 259 NONAME
+	_ZTI11CPhoneState @ 260 NONAME
+	_ZTI15CPhoneStateIdle @ 261 NONAME
+	_ZTI17CPhoneStateHandle @ 262 NONAME
+	_ZTI17CPhoneStateInCall @ 263 NONAME
+	_ZTI18CPhoneStateMachine @ 264 NONAME
+	_ZTI18CPhoneStateStartup @ 265 NONAME
+	_ZTI18CPhoneUIController @ 266 NONAME
+	_ZTI19CPhoneStateIncoming @ 267 NONAME
+	_ZTI20CPhoneReconnectQuery @ 268 NONAME
+	_ZTI20CPhoneStateCallSetup @ 269 NONAME
+	_ZTI23CPhoneDtmfWaitCharTimer @ 270 NONAME
+	_ZTI23CPhoneKeyEventForwarder @ 271 NONAME
+	_ZTI24CPhoneSystemEventHandler @ 272 NONAME
+	_ZTI26CPhoneRemoteControlHandler @ 273 NONAME
+	_ZTI27CPhoneBtaaDisconnectHandler @ 274 NONAME
+	_ZTV11CPhoneState @ 275 NONAME
+	_ZTV15CPhoneStateIdle @ 276 NONAME
+	_ZTV17CPhoneStateHandle @ 277 NONAME
+	_ZTV17CPhoneStateInCall @ 278 NONAME
+	_ZTV18CPhoneStateMachine @ 279 NONAME
+	_ZTV18CPhoneStateStartup @ 280 NONAME
+	_ZTV18CPhoneUIController @ 281 NONAME
+	_ZTV19CPhoneStateIncoming @ 282 NONAME
+	_ZTV20CPhoneReconnectQuery @ 283 NONAME
+	_ZTV20CPhoneStateCallSetup @ 284 NONAME
+	_ZTV23CPhoneDtmfWaitCharTimer @ 285 NONAME
+	_ZTV23CPhoneKeyEventForwarder @ 286 NONAME
+	_ZTV24CPhoneSystemEventHandler @ 287 NONAME
+	_ZTV26CPhoneRemoteControlHandler @ 288 NONAME
+	_ZTV27CPhoneBtaaDisconnectHandler @ 289 NONAME
+	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 290 NONAME
+	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 291 NONAME
+	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 292 NONAME
+	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 293 NONAME
+	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 294 NONAME
+	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 295 NONAME
+	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 296 NONAME
+	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 297 NONAME
+	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 298 NONAME
+	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 299 NONAME
+	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 300 NONAME
+	_ZThn12_N11CPhoneStateD0Ev @ 301 NONAME
+	_ZThn12_N11CPhoneStateD1Ev @ 302 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 303 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 304 NONAME
+	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 305 NONAME
+	_ZThn12_N15CPhoneStateIdleD0Ev @ 306 NONAME
+	_ZThn12_N15CPhoneStateIdleD1Ev @ 307 NONAME
+	_ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 308 NONAME
+	_ZThn12_N17CPhoneStateInCallD0Ev @ 309 NONAME
+	_ZThn12_N17CPhoneStateInCallD1Ev @ 310 NONAME
+	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 311 NONAME
+	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 312 NONAME
+	_ZThn12_N18CPhoneStateStartupD0Ev @ 313 NONAME
+	_ZThn12_N18CPhoneStateStartupD1Ev @ 314 NONAME
+	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 315 NONAME
+	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 316 NONAME
+	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 317 NONAME
+	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 318 NONAME
+	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 319 NONAME
+	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 320 NONAME
+	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 321 NONAME
+	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 322 NONAME
+	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 323 NONAME
+	_ZThn12_N18CPhoneUIControllerD0Ev @ 324 NONAME
+	_ZThn12_N18CPhoneUIControllerD1Ev @ 325 NONAME
+	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 326 NONAME
+	_ZThn12_N19CPhoneStateIncomingD0Ev @ 327 NONAME
+	_ZThn12_N19CPhoneStateIncomingD1Ev @ 328 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 329 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 330 NONAME
+	_ZThn16_N11CPhoneState14HandleCommandLEi @ 331 NONAME
+	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 332 NONAME
+	_ZThn16_N11CPhoneStateD0Ev @ 333 NONAME
+	_ZThn16_N11CPhoneStateD1Ev @ 334 NONAME
+	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 335 NONAME
+	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 336 NONAME
+	_ZThn16_N15CPhoneStateIdleD0Ev @ 337 NONAME
+	_ZThn16_N15CPhoneStateIdleD1Ev @ 338 NONAME
+	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 339 NONAME
+	_ZThn16_N17CPhoneStateInCallD0Ev @ 340 NONAME
+	_ZThn16_N17CPhoneStateInCallD1Ev @ 341 NONAME
+	_ZThn16_N18CPhoneStateStartupD0Ev @ 342 NONAME
+	_ZThn16_N18CPhoneStateStartupD1Ev @ 343 NONAME
+	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 344 NONAME
+	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 345 NONAME
+	_ZThn16_N18CPhoneUIControllerD0Ev @ 346 NONAME
+	_ZThn16_N18CPhoneUIControllerD1Ev @ 347 NONAME
+	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 348 NONAME
+	_ZThn16_N19CPhoneStateIncomingD0Ev @ 349 NONAME
+	_ZThn16_N19CPhoneStateIncomingD1Ev @ 350 NONAME
+	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 351 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 352 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 353 NONAME
+	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 354 NONAME
+	_ZThn20_N11CPhoneStateD0Ev @ 355 NONAME
+	_ZThn20_N11CPhoneStateD1Ev @ 356 NONAME
+	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 357 NONAME
+	_ZThn20_N15CPhoneStateIdleD0Ev @ 358 NONAME
+	_ZThn20_N15CPhoneStateIdleD1Ev @ 359 NONAME
+	_ZThn20_N17CPhoneStateInCallD0Ev @ 360 NONAME
+	_ZThn20_N17CPhoneStateInCallD1Ev @ 361 NONAME
+	_ZThn20_N18CPhoneStateStartupD0Ev @ 362 NONAME
+	_ZThn20_N18CPhoneStateStartupD1Ev @ 363 NONAME
+	_ZThn20_N19CPhoneStateIncomingD0Ev @ 364 NONAME
+	_ZThn20_N19CPhoneStateIncomingD1Ev @ 365 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 366 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 367 NONAME
+	_ZThn24_N11CPhoneState19SetDivertIndicationEi @ 368 NONAME
+	_ZThn24_N11CPhoneStateD0Ev @ 369 NONAME
+	_ZThn24_N11CPhoneStateD1Ev @ 370 NONAME
+	_ZThn24_N15CPhoneStateIdleD0Ev @ 371 NONAME
+	_ZThn24_N15CPhoneStateIdleD1Ev @ 372 NONAME
+	_ZThn24_N17CPhoneStateInCallD0Ev @ 373 NONAME
+	_ZThn24_N17CPhoneStateInCallD1Ev @ 374 NONAME
+	_ZThn24_N18CPhoneStateStartupD0Ev @ 375 NONAME
+	_ZThn24_N18CPhoneStateStartupD1Ev @ 376 NONAME
+	_ZThn24_N19CPhoneStateIncomingD0Ev @ 377 NONAME
+	_ZThn24_N19CPhoneStateIncomingD1Ev @ 378 NONAME
+	_ZThn24_N20CPhoneStateCallSetupD0Ev @ 379 NONAME
+	_ZThn24_N20CPhoneStateCallSetupD1Ev @ 380 NONAME
+	_ZThn28_N11CPhoneState25HandleNumberEntryClearedLEv @ 381 NONAME
+	_ZThn28_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 382 NONAME
+	_ZThn28_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 383 NONAME
+	_ZThn28_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 384 NONAME
+	_ZThn28_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 385 NONAME
+	_ZThn32_N11CPhoneState23HandleNumberEntryEditedEv @ 386 NONAME
+	_ZThn32_N11CPhoneStateD0Ev @ 387 NONAME
+	_ZThn32_N11CPhoneStateD1Ev @ 388 NONAME
+	_ZThn32_N15CPhoneStateIdleD0Ev @ 389 NONAME
+	_ZThn32_N15CPhoneStateIdleD1Ev @ 390 NONAME
+	_ZThn32_N17CPhoneStateInCallD0Ev @ 391 NONAME
+	_ZThn32_N17CPhoneStateInCallD1Ev @ 392 NONAME
+	_ZThn32_N18CPhoneStateStartupD0Ev @ 393 NONAME
+	_ZThn32_N18CPhoneStateStartupD1Ev @ 394 NONAME
+	_ZThn32_N19CPhoneStateIncomingD0Ev @ 395 NONAME
+	_ZThn32_N19CPhoneStateIncomingD1Ev @ 396 NONAME
+	_ZThn32_N20CPhoneStateCallSetupD0Ev @ 397 NONAME
+	_ZThn32_N20CPhoneStateCallSetupD1Ev @ 398 NONAME
+	_ZThn36_NK11CPhoneState11IsKeyLockOnEv @ 399 NONAME
+	_ZThn36_NK11CPhoneState12IsAutoLockOnEv @ 400 NONAME
+	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 401 NONAME
+	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 402 NONAME
+	_ZThn4_N11CPhoneStateD0Ev @ 403 NONAME
+	_ZThn4_N11CPhoneStateD1Ev @ 404 NONAME
+	_ZThn4_N15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 405 NONAME
+	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 406 NONAME
+	_ZThn4_N15CPhoneStateIdleD0Ev @ 407 NONAME
+	_ZThn4_N15CPhoneStateIdleD1Ev @ 408 NONAME
+	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 409 NONAME
+	_ZThn4_N17CPhoneStateInCallD0Ev @ 410 NONAME
+	_ZThn4_N17CPhoneStateInCallD1Ev @ 411 NONAME
+	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 412 NONAME
+	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 413 NONAME
+	_ZThn4_N18CPhoneStateMachine12SecurityModeEv @ 414 NONAME
+	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 415 NONAME
+	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 416 NONAME
+	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 417 NONAME
+	_ZThn4_N18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 418 NONAME
+	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 419 NONAME
+	_ZThn4_N18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 420 NONAME
+	_ZThn4_N18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 421 NONAME
+	_ZThn4_N18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 422 NONAME
+	_ZThn4_N18CPhoneStateMachine5StateEv @ 423 NONAME
+	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 424 NONAME
+	_ZThn4_N18CPhoneStateMachineD0Ev @ 425 NONAME
+	_ZThn4_N18CPhoneStateMachineD1Ev @ 426 NONAME
+	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 427 NONAME
+	_ZThn4_N18CPhoneStateStartupD0Ev @ 428 NONAME
+	_ZThn4_N18CPhoneStateStartupD1Ev @ 429 NONAME
+	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 430 NONAME
+	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 431 NONAME
+	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 432 NONAME
+	_ZThn4_N19CPhoneStateIncomingD0Ev @ 433 NONAME
+	_ZThn4_N19CPhoneStateIncomingD1Ev @ 434 NONAME
+	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 435 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 436 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 437 NONAME
+	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 438 NONAME
+	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 439 NONAME
+	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 440 NONAME
+	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 441 NONAME
+	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 442 NONAME
+	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 443 NONAME
+	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 444 NONAME
+	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 445 NONAME
+	_ZThn8_N11CPhoneStateD0Ev @ 446 NONAME
+	_ZThn8_N11CPhoneStateD1Ev @ 447 NONAME
+	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 448 NONAME
+	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 449 NONAME
+	_ZThn8_N15CPhoneStateIdleD0Ev @ 450 NONAME
+	_ZThn8_N15CPhoneStateIdleD1Ev @ 451 NONAME
+	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 452 NONAME
+	_ZThn8_N17CPhoneStateInCallD0Ev @ 453 NONAME
+	_ZThn8_N17CPhoneStateInCallD1Ev @ 454 NONAME
+	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 455 NONAME
+	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 456 NONAME
+	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 457 NONAME
+	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 458 NONAME
+	_ZThn8_N18CPhoneStateStartupD0Ev @ 459 NONAME
+	_ZThn8_N18CPhoneStateStartupD1Ev @ 460 NONAME
+	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 461 NONAME
+	_ZThn8_N18CPhoneUIControllerD0Ev @ 462 NONAME
+	_ZThn8_N18CPhoneUIControllerD1Ev @ 463 NONAME
+	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 464 NONAME
+	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 465 NONAME
+	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 466 NONAME
+	_ZThn8_N19CPhoneStateIncomingD0Ev @ 467 NONAME
+	_ZThn8_N19CPhoneStateIncomingD1Ev @ 468 NONAME
+	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 469 NONAME
+	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 470 NONAME
+	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 471 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 472 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 473 NONAME
+	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 474 NONAME
 
--- a/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp	Mon Jul 12 15:53:34 2010 +0100
@@ -81,6 +81,7 @@
 LIBRARY         avkon.lib // AknTextUtils
 LIBRARY         ProfileEngine.lib
 LIBRARY         hal.lib
+LIBRARY         eikcoctl.lib 
 
 // RemCon
 LIBRARY         remconcoreapi.lib
@@ -102,3 +103,5 @@
 LIBRARY         starterclient.lib
 
 LIBRARY         phonemediatorcenter.lib
+
+LIBRARY         peninputclient.lib
--- a/phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h	Mon Jul 12 15:53:34 2010 +0100
@@ -86,6 +86,12 @@
         */
         void DisplayHeaderForOutgoingCallL(
                 const TInt aCallId );
+        
+        /**
+        * Display initializing call header (phone number isn't initially
+        * displayed)
+        */
+        void DisplayHeaderForInitializingCallL( TInt aCallId );
        
         /**
         * Sets the call header type used in the call bubble.
--- a/phoneapp/phoneuicontrol/inc/cphonekeyeventforwarder.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/inc/cphonekeyeventforwarder.h	Mon Jul 12 15:53:34 2010 +0100
@@ -22,6 +22,8 @@
 // INCLUDES
 #include    <bldvariant.hrh> //Feature flags
 #include    <coecntrl.h>
+#include    <peninputsrveventhandler.h>
+#include    <peninputclient.h>
  
 // FORWARD DECLARATIONS
 class MPhoneStateMachine;
@@ -30,6 +32,7 @@
 class CPhoneTimer;
 class CPhoneQwertyHandler;
 class MPhoneQwertyModeObserver;
+class CEikMenuBar;
 
 // CLASS DECLARATION
 
@@ -38,7 +41,8 @@
 *
 */
 class CPhoneKeyEventForwarder 
-    : public CCoeControl 
+    : public CCoeControl,
+    public MPenUiActivationHandler
     {
     public:  // Constructors and destructor      
         
@@ -115,6 +119,17 @@
                 const TKeyEvent& aKeyEvent,
                 TEventCode aType );
 
+        /**
+         * @see MPenUiActivationHandler
+         */
+        void OnPeninputUiDeactivated();
+
+        /**
+         * @see MPenUiActivationHandler
+         */        
+        void OnPeninputUiActivated();
+        
+
     private:
 
         /**
@@ -271,6 +286,22 @@
          * Needed to detect situations where key up event is handled before key event.
          */
         TBool iExpectKeyUpEvent;
+        
+        /**
+         * Server that sends events via callback when the virtual keyboard is opened/closed.
+         */     
+        RPeninputServer iPeninputServer;
+        
+        /**
+         * Status of virtual keyboard.
+         */     
+        TBool iVirtualKeyBoardOpen;
+        
+        /**
+         * Application menu.
+         * Not owned.
+         */     
+        CEikMenuBar* iMenu;
     };
 
 #endif      // CPHONEKEYEVENTFORWARDER_H
--- a/phoneapp/phoneuicontrol/inc/cphonestate.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/inc/cphonestate.h	Mon Jul 12 15:53:34 2010 +0100
@@ -434,6 +434,12 @@
         * @param aCallid call id
         */
         IMPORT_C void DisplayHeaderForOutgoingCallL( TInt aCallId );
+        
+        /**
+        * Display initializing call header (phone number isn't initially
+        * displayed)
+        */
+        IMPORT_C void DisplayHeaderForInitializingCallL( TInt aCallId );
 
         /**
         * Update Single Active Call
@@ -517,8 +523,8 @@
         IMPORT_C TBool NeedToReturnToForegroundAppL() const;
 
         /**
-        * Check if the top application is currently displayed in the foreground
-        * @return boolean value indicating that top app is displayed
+        * Check if the top application is idle or phone app.
+        * @return boolean value indicating that top app is idle/phone application.
         */
         IMPORT_C TBool TopAppIsDisplayedL() const;
 
@@ -831,6 +837,11 @@
          */
          IMPORT_C void SetToolbarButtonLoudspeakerEnabled();
 
+         /**
+         * Sets toolbar handset button enabled.
+         */
+         IMPORT_C void SetToolbarButtonHandsetEnabled();
+
     protected:
 
        /**
@@ -1094,6 +1105,11 @@
         * @param aCommandId - command id to be handled
         */
         void HandleEasyDialingCommandsL( TInt aCommandId );
+        
+        /**
+        * Sets little bubble value if dialler is open.
+        */
+        void SetLittleBubbleVisibilityL(TPhoneCommandParam* aCommandParam);
 
     private: // NumberEntry functions.
 
--- a/phoneapp/phoneuicontrol/inc/cphonestateidle.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/inc/cphonestateidle.h	Mon Jul 12 15:53:34 2010 +0100
@@ -46,7 +46,6 @@
         EDialMethodSendCommand      = 2,
         /** Dial is initiated by one key dialing. */
         EDialMethodOneKeyDialing    = 3
-
         };
     
         /**
@@ -80,7 +79,7 @@
         */
         IMPORT_C virtual void HandlePhoneEngineMessageL(
             const TInt aMessage, 
-            TInt aCallId );       
+            TInt aCallId );
             
         IMPORT_C virtual TBool HandleCommandL( TInt aCommand );
         
@@ -99,7 +98,15 @@
         /**
         * Indicates when the Phone app has lost focus.
         */
-		IMPORT_C virtual void HandlePhoneFocusLostEventL();
+        IMPORT_C virtual void HandlePhoneFocusLostEventL();
+        
+        /**
+        * HandleError
+        * Implements error handling framework
+        * @param aErrorInfo: the error info
+        */
+        IMPORT_C virtual void HandleErrorL( 
+                const TPEErrorInfo& aErrorInfo );
 
     protected:
 
@@ -211,8 +218,20 @@
         */
         IMPORT_C virtual void HandleSendCommandL();
         
+    protected:
+        
+        /**
+        * Sets iBubbleInitialized value.
+        */
+        void SetBubbleInitialized( TBool aValue );
+         
+        /**
+        * Gets iBubbleInitialized value.
+        */
+        TBool IsBubbleInitialized();
+        
     private: // New functions
-
+        
         /**
         * A message handling function for EPEMessageIncoming
         * @param aCallId: the call id of the call
@@ -292,15 +311,38 @@
 
          /**
           * Returns options menu id when number entry is visible.
-		  * If easydialing is in focus, id is asked from it.
+          * If easydialing is in focus, id is asked from it.
           * @return Menu resource id.
           */   
          TInt GetNumberAcqMenuIdL();
          
+         /**
+          * Launches initializing call bubble.
+          */
+         void DisplayInitializingCallL( TInt aCallId );
+         
+         /**
+          * Updates existing call bubble.
+          */
+         TBool UpdateCallBubbleL( TInt aCallId );
+         
+         /**
+          * Handles initialized call error.
+          */
+         void HandleInitializingCallErrorL( TInt aCallId );
+         
+         /**
+          * Changes state to aState and resets iBubbleInitialized
+          * value to false.
+          */
+         void ChangeTo( TInt aState );
+         
     private:
-        // indicates that incomming call is arrived.
-        TBool iIncommingCall;
-  
+         // indicates that incomming call is arrived.
+         TBool iIncommingCall;
+        
+         // Indicates call bubble is already initiliazed.
+         TBool iBubbleInitialized;
     };
 
 #endif // CPHONESTATEIDLE
--- a/phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h	Mon Jul 12 15:53:34 2010 +0100
@@ -70,6 +70,17 @@
         void SetOutgoingCallHeaderParamsL(
                 const TInt aCallId,
                 TPhoneCmdParamCallHeaderData* aCallHeaderData );
+        
+       /**
+       * Sets info to initializing call header.
+       * @param aCallId - call id.
+       * @param aCallHeaderData - Call header parameter into which the text/picture
+       *                          parameters will be set.
+       */
+        void SetIniticalizingCallHeaderParamsL(
+                const TInt aCallId,
+                TPhoneCmdParamCallHeaderData* aCallHeaderData );
+				
         /**
         * Updates call header info. 
         * NOTE: This method is used when state receives
@@ -141,7 +152,8 @@
         */
         void SetBasicCallHeaderParamsL(
             const TInt aCallId, 
-            TPhoneCmdParamCallHeaderData* aCallHeaderData );
+            TPhoneCmdParamCallHeaderData* aCallHeaderData,
+            TBool aInitializing );
         
         /**
         * Sets divert indication to call header if necessary
@@ -246,7 +258,14 @@
         void SetPhoneNumberAvailabilityL( 
                 const TInt aNumberLength,
                 const TBool aContactInfoAvailable );
-                
+        
+        /**
+        * Set call header labels.
+        * @param aCallHeaderData - call header params.
+        */
+        void SetCallHeaderLabels( 
+               TPhoneCmdParamCallHeaderData* aCallHeaderData );
+        
     private:
         
         MPhoneCallHeaderManagerUtility& iManagerUtility;
--- a/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -223,6 +223,38 @@
             &callHeaderParam );
     }
 
+
+// ---------------------------------------------------------------------------
+//  CPhoneCallHeaderManager::DisplayHeaderForInitializingCallL
+// ---------------------------------------------------------------------------
+//
+void CPhoneCallHeaderManager::DisplayHeaderForInitializingCallL( TInt aCallId )
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, "CPhoneCallHeaderManager::DisplayHeaderForInitializingCallL() ");
+    __ASSERT_DEBUG( iStateMachine.PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
+    
+    TPhoneCmdParamCallHeaderData callHeaderParam;
+    
+    iCallHeaderParam->SetIniticalizingCallHeaderParamsL( 
+            aCallId,
+            &callHeaderParam );
+            
+    if( iCustomization )
+        {
+        // to do modifications to call header parameters
+        // if VoIP call in question
+        iCustomization->ModifyCallHeaderTexts( aCallId, &callHeaderParam,
+            KNullDesC );
+        }
+    
+    // Display call header for outgoing call
+    iViewCommandHandle.ExecuteCommandL( 
+            EPhoneViewCreateCallHeader, 
+            aCallId, 
+            &callHeaderParam );
+    
+    }
+
 // ---------------------------------------------------------------------------
 //  CPhoneCallHeaderManager::IsWaitingCallL
 // ---------------------------------------------------------------------------
--- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -22,6 +22,7 @@
 #include <bldvariant.hrh>
 #include <featmgr.h>
 #include <PtiDefs.h>
+#include <AknUtils.h>
 
 #include "mphonestatemachine.h"
 #include "mphonekeyeventhandler.h"
@@ -34,6 +35,7 @@
 #include "mphoneviewcommandhandle.h"
 #include "cphoneqwertyhandler.h"
 #include "tphonecmdparampointer.h"
+#include "tphonecmdparamboolean.h"
 #include "mphoneqwertymodeobserver.h"
 #include "cdialer.h"
 
@@ -79,6 +81,13 @@
     {
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneKeyEventForwarder::~CPhoneKeyEventForwarder");
 
+    if ( AknLayoutUtils::PenEnabled() ) 
+        {
+        iPeninputServer.RemovePenUiActivationHandler( this );
+        }
+    
+    iPeninputServer.Close();
+    
     if ( iEikonEnv )
         {
         iEikonEnv->EikAppUi()->RemoveFromStack( this );
@@ -227,6 +236,19 @@
             static_cast<CDialer*>( ptrParam.Pointer() );
             
     iQwertyHandler->AddQwertyModeObserverL( *qwertyObserver );
+    
+    if ( AknLayoutUtils::PenEnabled() )
+        {
+        User::LeaveIfError( iPeninputServer.Connect() );
+        iPeninputServer.AddPenUiActivationHandler( this, EPluginInputModeAll );
+        iVirtualKeyBoardOpen = iPeninputServer.IsVisible();
+        }
+    
+    CEikonEnv* env = static_cast<CEikonEnv*>( ControlEnv() );
+    if ( env )
+        {
+        iMenu = env->AppUiFactory()->MenuBar();
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -419,6 +441,32 @@
     return EKeyWasNotConsumed;
     }
 
+// ---------------------------------------------------------------------------
+// CPhoneKeyEventForwarder::OnPeninputUiDeactivated
+//
+// Gets called when the virtual keyboard editor is closed.
+// ---------------------------------------------------------------------------
+//
+void CPhoneKeyEventForwarder::OnPeninputUiDeactivated()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl,
+            "CPhoneKeyEventForwarder::OnPeninputUiDeactivated");
+    iVirtualKeyBoardOpen = EFalse;
+    }
+
+// ---------------------------------------------------------------------------
+// CPhoneKeyEventForwarder::OnPeninputUiActivated
+//
+// Gets called when the virtual keyboard editor is opened.
+// ---------------------------------------------------------------------------
+//
+void CPhoneKeyEventForwarder::OnPeninputUiActivated()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl,
+            "CPhoneKeyEventForwarder::OnPeninputUiActivated");
+    iVirtualKeyBoardOpen = ETrue;
+    }
+
 // -----------------------------------------------------------
 // CPhoneKeyEventForwarder::HandleEventKeyDownBeforeControlStackL
 // -----------------------------------------------------------
@@ -457,6 +505,11 @@
             !IsKeySimulatedByTouchDialer( aKeyEvent ) && 
             iQwertyHandler->IsQwertyInput() &&
             iViewCommandHandle->HandleCommandL( EPhoneViewIsNumberEntryNumericMode ) != EPhoneViewResponseSuccess;
+    
+    // Prevent long tap functionality for key events coming from virtual touch keyboard.
+    // Virtual touch keyboard has own editing functionality for long presses, and telephony
+    // should not add conflicting behaviour on top of that.
+    preventLongTap = preventLongTap || iVirtualKeyBoardOpen;
 
     if ( !preventLongTap ) 
         {
@@ -501,27 +554,42 @@
         iMultitapIndex = 0;
         iPreviousScanCode = 0;
         }
-
+    
     // Special handling for QWERTY numeric mode key events
     if ( response == EKeyWasNotConsumed )
         {
-        // FEP treats numeric QWERTY mode of Phone editor as a special case where most
-        // key events flow through directly to the Phone app (but some don't).
-        // To ensure consistent handling of numeric mode keys and QWERTY modifiers, 
-        // handle those keys manually before FEP has a chance to mess things up.
+        // FEP does not handle numeric characters 0123456789+*#pw correctly
+        // when in QWERTY mode and number mode. If nothing is done about it, 
+        // these problems result in non-hybrid mode qwerty:
+        //      +, # and * cannot be typed without pressing Fn-key
+        //      Fn + <p/0> produces 0 although p is expected.
+        //      Fn + <w/2> produces 2 although w is expected.
+        // To avoid this problems we do the following.
+    
+        // Take numeric keyevent, pass it to number entry and consume it.
         TBool numericMode = iViewCommandHandle->HandleCommandL(
               EPhoneViewIsNumberEntryNumericMode ) == EPhoneViewResponseSuccess;
+        
+        TPhoneCmdParamBoolean blockingDialog;
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewGetBlockingDialogStatus, 
+            &blockingDialog );
 
-        if ( iQwertyHandler->IsQwertyInput() && numericMode )
+        // Handle and consume keyevent only if in qwerty mode, editor is 
+        // in numeric mode, menu is not shown and there is no blocking dialog.
+        if ( iQwertyHandler->IsQwertyInput() && numericMode && 
+             ( !iMenu || !iMenu->IsDisplayed() ) && !blockingDialog.Boolean() )
             {
             iQwertyHandler->ConvertToNumeric( keyEvent );
-            // Send key to editor unless this is a repeat event for dtmf character
-            if ( aKeyEvent.iRepeats == 0 ||
-                 !CPhoneKeys::IsDtmfTone( keyEvent, EEventKey ) )
+            
+            // Send key to editor only if a) it is not a repeating keyevent and 
+            // it is a valid number entry character (0123456789+*#pw).
+            if ( aKeyEvent.iRepeats == 0 &&
+                 ( CPhoneKeys::IsDtmfTone( keyEvent, EEventKey ) ||
+                   CPhoneKeys::IsExtraChar( keyEvent.iCode ) ) )
                 {
                 iStateMachine->State()->HandleKeyEventL( keyEvent, EEventKey );
+                response = EKeyWasConsumed;
                 }
-            response = EKeyWasConsumed;
             }
         }
     
--- a/phoneapp/phoneuicontrol/src/cphonestate.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -371,6 +371,11 @@
             accessoryBtHandler->SetBTDebugModeL();
             CleanupStack::PopAndDestroy( accessoryBtHandler );
             break;
+        
+        case MEngineMonitor::EPEMessageInitiatedMoCall:
+            // Message should be only handled by CPhoneStateIdle, 
+            // if state is something else than idle then do nothing.
+            break;
 
         default:
 
@@ -738,35 +743,40 @@
             }
             break;
 
-            case ECCPErrorCCServiceNotAvailable:
-                {
-                if( IsVideoCall( aErrorInfo.iCallId ) )
-    				{
-    			    CPhoneReconnectQuery::InstanceL()->ShowReconnectQueryL( EFalse );
-    				}
-                }
-                break;
-
-            case ECCPErrorBadRequest:
+        case ECCPErrorCCServiceNotAvailable:
+            {
+            if( IsVideoCall( aErrorInfo.iCallId ) )
                 {
-                TPECallType callType =
-                    iStateMachine->PhoneEngineInfo()->CallTypeCommand();
-
-                if( callType == EPECallTypeVideo )
-                    {
-                        // Dialling MO video call cannot reach 3G network.
-                        __PHONELOG1( EBasic, EPhoneControl,
-                            "PhoneUIControl: CPhoneState::HandleErrorL - ShowReconnectQueryL vid 2, callid%d ",
-                            aErrorInfo.iCallId );
-                        CPhoneReconnectQuery::InstanceL()->ShowReconnectQueryL( ETrue );
-                    }
+                CPhoneReconnectQuery::InstanceL()->ShowReconnectQueryL( EFalse );
                 }
-                break;
-
-        case ECCPErrorVideoCallNotSupportedByNetwork:
+            }
+            break;
+
+        case ECCPErrorBadRequest:
+            {
+            TPECallType callType =
+                iStateMachine->PhoneEngineInfo()->CallTypeCommand();
+
+            if( callType == EPECallTypeVideo )
+                {
+                    // Dialling MO video call cannot reach 3G network.
+                    __PHONELOG1( EBasic, EPhoneControl,
+                        "PhoneUIControl: CPhoneState::HandleErrorL - ShowReconnectQueryL vid 2, callid%d ",
+                        aErrorInfo.iCallId );
+                    CPhoneReconnectQuery::InstanceL()->ShowReconnectQueryL( ETrue );
+                }
+            }
+            break;
+
+        case ECCPErrorVideoCallNotSupportedByNetwork: // Flow trough
         case ECCPErrorVideoCallSetupFailed:
         case ECCPErrorNotReached:
-           // If call id found and seems to be Video Call
+        case ECCPErrorCCBearerCapabilityNotCurrentlyAvailable:
+        case ECCPErrorCCBearerCapabilityNotAuthorised:
+        case ECCPErrorServiceSettingError:
+        case ECCPErrorNoAnswerForVideo:
+            {
+            // If call id found and seems to be Video Call
             if ( IsVideoCall( aErrorInfo.iCallId ) )
                 {
                 // Get active call count
@@ -788,6 +798,7 @@
                               ECCPErrorNotReached == aErrorInfo.iErrorCode );
                     }
                 }
+            }
             break;
 
         case ECCPErrorNoService:
@@ -1359,6 +1370,14 @@
             }
         }
 
+    if( NumberEntryManagerL()->IsNumberEntryUsedL() )
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetIncallBubbleTrue );
+        }
+    else
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetIncallBubbleFalse );
+        }
      }
 
 // -----------------------------------------------------------
@@ -1380,6 +1399,8 @@
         {
         CloseCustomizedDialerL();
         }
+
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetIncallBubbleTrue );
     }
 // ---------------------------------------------------------
 // CPhoneState::HandleIdleForegroundEventL
@@ -1762,7 +1783,7 @@
 //
 EXPORT_C TBool CPhoneState::ProcessCommandL( TInt /*aCommand*/ )
     {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::ProcessCommandL() ");
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::ProcessCommandL() ");
     // no implementation.
     return EFalse;
     }
@@ -2189,6 +2210,17 @@
     CallheaderManagerL()->DisplayHeaderForOutgoingCallL(aCallId);
     }
 
+
+// -----------------------------------------------------------
+// CPhoneState::DisplayHeaderForInitializingCallL
+// -----------------------------------------------------------
+//
+EXPORT_C void CPhoneState::DisplayHeaderForInitializingCallL( TInt aCallId )
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DisplayHeaderForInitializingCallL( ) ");
+    CallheaderManagerL()->DisplayHeaderForInitializingCallL( aCallId );
+    }
+	
 // -----------------------------------------------------------
 // CPhoneState::UpdateSingleActiveCallL
 // -----------------------------------------------------------
@@ -2202,6 +2234,8 @@
 
     BeginUiUpdateLC();
 
+    SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
+
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
     callHeaderParam.SetCallState( EPEStateConnected );
@@ -2717,16 +2751,25 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateIncallIndicatorL( ) ");
     TPhoneCmdParamIncallIndicatorData incallIndicatorParam;
-
-    // Set the state
+    // Set the state.
     incallIndicatorParam.SetCallState( aCallState );
 
+    if((aCallState == EPSCTsyCallStateUninitialized) || 
+       (aCallState == EPSCTsyCallStateNone))
+        {
+        incallIndicatorParam.SetLittleBubbleVisible( EFalse );
+        }
+    else
+        {
+        SetLittleBubbleVisibilityL(&incallIndicatorParam);
+        }
+    
     // Set mode
     incallIndicatorParam.SetMode(
        CPhonePubSubProxy::Instance()->Value(
             KPSUidCtsyCallInformation,
             KCTsyCallType ) );
-
+            
     TInt activeCallId = GetActiveCallIdL();
     if ( activeCallId > KErrNone )
         {
@@ -2742,8 +2785,7 @@
     incallIndicatorParam.SetMute( audioMute );
 
     // Set the voice privacy status
-    if ( activeCallId > KErrNotFound &&
-         activeCallId != KConferenceCallId  )
+    if ( activeCallId > KErrNotFound && activeCallId != KConferenceCallId  )
         {
         incallIndicatorParam.SetCiphering(
             iStateMachine->PhoneEngineInfo()->IsSecureCall( activeCallId ) );
@@ -2761,27 +2803,7 @@
         {
         incallIndicatorParam.SetEmergency( ETrue );
         }
-
-    if( aCallState == EPSCTsyCallStateDisconnecting )
-        {
-        if ( TopAppIsDisplayedL() )
-            {
-            if ( ( !IsOnScreenDialerSupported() ) ||
-                 ( IsOnScreenDialerSupported() && !IsNumberEntryVisibleL() ) )
-                {
-                // Phone application is in the foreground so we don't need to
-                // display the little bubble. If we don't hide it here then
-                // it will appear for a short time. We don't want that.
-                incallIndicatorParam.SetLittleBubbleVisible( EFalse );
-                }
-            }
-        }
-    // TODO: Refactor -> this looks really dubious.
-    else
-        {
-        incallIndicatorParam.SetLittleBubbleVisible( ETrue );
-        }
-
+    
     // Update the in-call indicator
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateIncallIndicator,
         &incallIndicatorParam );
@@ -3053,14 +3075,15 @@
 
     // We have existing video call so need to release dataport before continuing
     // emergency call. Otherwise we will face problems with dataport use later.
-    CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
-                                                                     KCatPhoneToVideotelCommands,
-                                                                     EVtCmdReleaseDataport,
-                                                               TVersion( KPhoneToVideotelCmdVersionMajor,
-                                                                         KPhoneToVideotelCmdVersionMinor,
-                                                                         KPhoneToVideotelCmdVersionBuild ),
-                                                               KNullDesC8,
-                                                               CPhoneContinueEmergencyCallCommand::NewL( *iStateMachine ) );
+    CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( 
+            KMediatorVideoTelephonyDomain,
+            KCatPhoneToVideotelCommands,
+            EVtCmdReleaseDataport,
+            TVersion( KPhoneToVideotelCmdVersionMajor,
+                    KPhoneToVideotelCmdVersionMinor,
+                    KPhoneToVideotelCmdVersionBuild ),
+            KNullDesC8,
+            CPhoneContinueEmergencyCallCommand::NewL( *iStateMachine ) );
     }
 
 // -----------------------------------------------------------
@@ -3744,6 +3767,15 @@
     {
     if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
         {
+        // Display Video Share button instead of Hold Button if
+        // the feature is enabled and video sharing is currently available.
+        if ( aResourceId == EPhoneIncallButtons &&
+             FeatureManager::FeatureSupported( KFeatureIdFfEntryPointForVideoShare ) &&
+             CPhonePubSubProxy::Instance()->Value
+                ( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator ) )
+            {
+            aResourceId = EPhoneIncallVideoShareButtons;
+            }
         TPhoneCmdParamInteger integerParam;
         integerParam.SetInteger( CPhoneMainResourceResolver::Instance()->
                                  ResolveResourceID( aResourceId ) );
@@ -4394,7 +4426,6 @@
     booleanParam.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible,
                                          &booleanParam );
-
     if ( IsNumberEntryUsedL() )
         {
         // Store the number entry content to cache
@@ -4414,6 +4445,16 @@
 
     // Update CBA
     iCbaManager->UpdateInCallCbaL();
+    
+    if( EPSCTsyCallStateDialling == 
+        CPhonePubSubProxy::Instance()->Value(KPSUidCtsyCallInformation, KCTsyCallState ) )
+        {
+        // Call indicator update to ensure that small call 
+        // bubble is shown in dtmf dialer during dialing
+        // call this needs to be done because when call is 
+        // initialized small call bubble visibility is set to false.
+        UpdateIncallIndicatorL(EPSCTsyCallStateDialling);
+        }
     }
 
 // -----------------------------------------------------------
@@ -4733,6 +4774,21 @@
     }
 
 // ---------------------------------------------------------
+// CPhoneState::SetToolbarButtonHandsetEnabled
+// ---------------------------------------------------------
+//
+EXPORT_C void CPhoneState::SetToolbarButtonHandsetEnabled()
+    {
+    if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
+        {
+        TPhoneCmdParamInteger integerParam;
+        integerParam.SetInteger( EPhoneInCallCmdHandset );
+        iViewCommandHandle->ExecuteCommand(
+            EPhoneViewEnableToolbarButton, &integerParam );
+        }
+    }
+
+// ---------------------------------------------------------
 // CPhoneState::HandleEasyDialingCommandsL
 // ---------------------------------------------------------
 //
@@ -4801,5 +4857,40 @@
     return handled;
     }
 
+// -----------------------------------------------------------
+// CPhoneState::SetLittleBubbleVisibilityL
+// -----------------------------------------------------------
+//
+void CPhoneState::SetLittleBubbleVisibilityL(
+        TPhoneCommandParam* aCommandParam)
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::SetLittleBubbleVisibilityL() " );
+    // If user has opened dtmfeditor(dtmfdialer) then do not make any changes 
+    // to SetLittleBubbleVisible value. SetLittleBubbleVisible value is true by default.
+    if( !IsDTMFEditorVisibleL() )
+        {
+        TPhoneCmdParamIncallIndicatorData* incallIndicatorParam =
+                   static_cast<TPhoneCmdParamIncallIndicatorData*>( aCommandParam );
+        TInt activeCallId = GetActiveCallIdL();
+        switch( incallIndicatorParam->CallState() )
+           {
+           case EPSCTsyCallStateRinging:
+           case EPSCTsyCallStateDialling:
+               {
+               // If we have single ringing or dialling call then it is ok
+               // to set visibility to false.
+               if ( activeCallId < KErrNone )
+                   {
+                   incallIndicatorParam->SetLittleBubbleVisible( EFalse );
+                   }
+               }
+               break;
+           default:
+               incallIndicatorParam->SetLittleBubbleVisible( ETrue );
+               break;
+           }
+        } 
+    }
+
 //  End of File
 
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -50,6 +50,7 @@
 #include "cphonekeys.h"
 
 #include "tphonecmdparamcallstatedata.h"
+#include "tphonecmdparamcallheaderdata.h"
 #include "phoneviewcommanddefinitions.h"
 #include "phoneui.hrh"
 #include "phonerssbase.h"
@@ -138,7 +139,7 @@
         HandleNumericKeyEventL( aKeyEvent, aEventCode );  
         }
     else if ( iStateMachine->SecurityMode()->IsSecurityMode()
-    	&& CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
+        && CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
         // Handle numeric keys when key events are received in single state
@@ -188,9 +189,9 @@
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleKeyMessageL( ) ");
 
     if( aMessage == EPhoneKeyLongPress && CheckAppLaunchingL( aCode ) )
-    	{
+        {
         return;
-    	}
+        }
 
     switch ( aCode )
         {
@@ -202,7 +203,7 @@
             
         // end-key
         case EKeyNo:
-            HandleEndKeyPressL( aMessage );            
+            HandleEndKeyPressL( aMessage );
             break;
 
         // send-key
@@ -244,9 +245,9 @@
                 else if ( !IsNumberEntryUsedL() ) 
                     {
                    if ( iStateMachine->SecurityMode()->IsSecurityMode() )
-						{
-						iViewCommandHandle->HandleCommandL( EPhoneViewOpenNumberEntry );
-						}
+                        {
+                        iViewCommandHandle->HandleCommandL( EPhoneViewOpenNumberEntry );
+                        }
                     }           
                 }
             else // iOnScreenDialer false, non-touch.
@@ -301,7 +302,16 @@
                     }
                 else
                     {
-                    HandleCommandL( EPhoneCmdOptions );
+                    TPhoneCmdParamInteger numberEntryCountParam;
+                    iViewCommandHandle->ExecuteCommandL( 
+                            EPhoneViewGetNumberEntryCount,
+                            &numberEntryCountParam );
+                    
+                    TInt neLength( numberEntryCountParam.Integer() );
+                    if ( neLength > 0 )
+                        {
+                        HandleSendCommandL();
+                        }
                     }               
                 }
             break;
@@ -323,6 +333,16 @@
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandlePhoneEngineMessageL( ) ");
     switch ( aMessage )
         {
+        case MEngineMonitor::EPEMessageInitiatedMoCall:
+           if( !IsBubbleInitialized() &&
+              ( EPECallTypeCSVoice == 
+                iStateMachine->PhoneEngineInfo()->CallType(aCallId) ) )
+                {
+                // Display call setup ASAP.
+                DisplayInitializingCallL( aCallId );
+                }
+            break;
+                    
         case MEngineMonitor::EPEMessageIncoming:
             HandleIncomingL( aCallId );
             break;
@@ -343,7 +363,7 @@
                 if ( IsNumberEntryUsedL() )
                     {
                     // Show the number entry if it exists
-                    SetNumberEntryVisibilityL(ETrue);    
+                    SetNumberEntryVisibilityL(ETrue);
                     }    
                 else if ( NeedToReturnToForegroundAppL() )
                     {
@@ -363,14 +383,31 @@
             HandleIdleL( aCallId );
             break;
             
-        case MEngineMonitor::EPEMessageInValidEmergencyNumber:                
-            SendGlobalWarningNoteL( EPhoneEmergencyCallsOnly );                           
+        case MEngineMonitor::EPEMessageInValidEmergencyNumber:
+            // if sim is ok then there is no need show this note.
+            if ( !IsSimOk() )
+                {
+                SendGlobalWarningNoteL( EPhoneEmergencyCallsOnly );
+                }
             break;
             
         case MEngineMonitor::EPEMessageValidEmergencyNumber:
-            DialVoiceCallL();
+            /* DisplayInitializingCallL calls EPEMessageCheckEmergencyNumber which
+            means that engine will send EPEMessageInValidEmergencyNumber or
+            EPEMessageValidEmergencyNumber response to phoneapp. If phoneengine
+            sends EPEMessageValidEmergencyNumber then iBubbleInitialized should be
+            set to EFalse this way we dont initializing call bubble behind attempting emergency 
+            call dialog.*/
+            if ( IsBubbleInitialized() )
+                {
+                SetBubbleInitialized( EFalse );
+                }
+            else
+                {
+                DialVoiceCallL();
+                }
             break; 
-                        
+        
         default:
             CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId );
             break;
@@ -412,6 +449,7 @@
     // Show incoming call buttons
     SetTouchPaneButtons( EPhoneIncomingCallButtons );
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
+    SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
     
     // Display incoming call
     DisplayIncomingCallL( aCallId );
@@ -426,7 +464,8 @@
     SetToolbarDimming( ETrue );
     //request that dimmed toolbar is visible.
     iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
-    iStateMachine->ChangeState( EPhoneStateIncoming );
+    
+    ChangeTo( EPhoneStateIncoming );
          
     // Reset divert indication
     SetDivertIndication( EFalse );
@@ -448,6 +487,7 @@
 
     // Show call setup buttons
     SetTouchPaneButtons( EPhoneCallSetupButtons );
+    SetTouchPaneButtonDisabled( EPhoneInCallCmdHold );    
 
     // Display call setup 
     DisplayCallSetupL( aCallId );            
@@ -461,8 +501,11 @@
     iCbaManager->UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
 
     SetToolbarDimming( ETrue );
+
+    SetToolbarButtonLoudspeakerEnabled();
+    SetToolbarButtonHandsetEnabled();
     
-    iStateMachine->ChangeState( EPhoneStateCallSetup );
+    ChangeTo( EPhoneStateCallSetup );
     }
 
 // -----------------------------------------------------------
@@ -506,7 +549,7 @@
   
     // Go to single state
     iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
-    iStateMachine->ChangeState( EPhoneStateSingle );
+    ChangeTo( EPhoneStateSingle );
     }
 
 // -----------------------------------------------------------
@@ -631,7 +674,7 @@
         }
     else
         {
-        DialVoiceCallL();                
+        DialVoiceCallL();
         }
     }
     
@@ -789,8 +832,93 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
         &uidParam ); 
     
-    // Display call setup header
-    DisplayHeaderForOutgoingCallL( aCallId );
+    if ( !UpdateCallBubbleL( aCallId ) )
+        {
+        // Create and Display call setup header if update was not done.
+        DisplayHeaderForOutgoingCallL( aCallId );
+        }
+    }
+
+// -----------------------------------------------------------
+// CPhoneStateIdle::UpdateCallBubbleL
+// -----------------------------------------------------------
+//
+TBool CPhoneStateIdle::UpdateCallBubbleL( TInt aCallId )
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, 
+                "CPhoneStateIdle::UpdateCallBubbleL( )");
+    TBool retValue(EFalse);
+    if( IsBubbleInitialized() )
+        {
+        // Call bubble is already initialized so it is 
+        // enough just to update existing header with 
+        // contacts,number...etc info.
+        TPhoneCmdParamCallHeaderData callHeaderParam = 
+                UpdateCallHeaderInfoL( aCallId );
+        iViewCommandHandle->ExecuteCommandL( 
+                EPhoneViewUpdateCallHeaderRemoteInfoData, 
+                aCallId, 
+                &callHeaderParam );
+        // reset flag.
+        SetBubbleInitialized( EFalse );
+        retValue = ETrue;
+        }
+    __PHONELOG1( EBasic, EPhoneControl, 
+            "PhoneUIControl: CPhoneStateIdle::UpdateCallBubbleL - retValue =%d ",
+            retValue );
+    return retValue;
+    }
+
+// -----------------------------------------------------------
+// CPhoneStateIdle::DisplayInitializingCallL
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::DisplayInitializingCallL( TInt aCallId )
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DisplayInitializingCallL( )");
+    /*Set flag value to true before SendPhoneEngineMessage because if phone number
+    is emergency number then EPEMessageValidEmergencyNumber message handling sets 
+    iBubbleInitialized to false value and if value is false then initializing call 
+    bubble shouldnt be shown.*/
+    SetBubbleInitialized( ETrue );
+    iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageCheckEmergencyNumber );
+    if ( IsBubbleInitialized() )
+        {
+        BeginUiUpdateLC();
+        
+        SetNumberEntryVisibilityL(EFalse);
+        
+        // Show call setup buttons
+        SetTouchPaneButtons( EPhoneCallSetupButtons );
+        
+        // Close menu bar, if it is displayed
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+
+        // Capture keys when the phone is dialling
+        CaptureKeysDuringCallNotificationL( ETrue );
+        
+        // Bring Phone app in the foreground
+        TPhoneCmdParamInteger uidParam;
+        uidParam.SetInteger( KUidPhoneApplication.iUid );
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
+            &uidParam );
+
+        // Set Phone as the top application
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
+            &uidParam ); 
+        
+        DisplayHeaderForInitializingCallL( aCallId );
+            
+        EndUiUpdate();
+        
+        // Remove any phone dialogs if they are displayed
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+                
+        // Go to call setup state
+        iCbaManager->UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
+
+        SetToolbarDimming( ETrue );
+        }
     }
 
 // -----------------------------------------------------------
@@ -817,7 +945,7 @@
     else if ( !IsAnyQueryActiveL() )
         {
         // Set idle as top application
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );            
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
         }
     }
 
@@ -856,11 +984,15 @@
         // If dialer is open add icon to FSW list.
         iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
         }
-    else if ( !IsNumberEntryUsedL() && !iStateMachine->SecurityMode()->IsSecurityMode() )
+    /*iBubbleInitialized has to be checked because if it true then phoneapp 
+    is already showing call bubble and we cant bring idle to screen. */
+    else if ( !IsNumberEntryUsedL() && 
+              !iStateMachine->SecurityMode()->IsSecurityMode() &&
+              !IsBubbleInitialized() )
         {
         // Bring Idle app to the foreground
         iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-		}
+        }
     }
 
 // -----------------------------------------------------------
@@ -883,17 +1015,18 @@
 //
 void CPhoneStateIdle::HandleIdleL( TInt /*aCallId*/ )
     {
-    __LOGMETHODSTARTEND(EPhoneControl,  
-        "CPhoneStateIdle::HandleIdleL()" );
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleL()" );
         
     // Remove all call headers
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveAllCallHeaders );
     
     // Close number entry
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );    
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 
     // Remove all notes and dialogs
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );    
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+    // Reset flag.
+    SetBubbleInitialized( EFalse );
     }
  
 // -----------------------------------------------------------
@@ -1278,17 +1411,8 @@
 EXPORT_C void CPhoneStateIdle::DialVoiceCallL()
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DialVoiceCallL() ");
-    __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(),
-        Panic( EPhoneCtrlInvariant ) );
-        
-    // Disable global notes
-    TPhoneCmdParamBoolean globalNotifierParam;
-    globalNotifierParam.SetBoolean( ETrue );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
-        &globalNotifierParam );
-    
+    __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
     CPhoneState::DialVoiceCallL();
- 
     }
 
 // -----------------------------------------------------------------------------
@@ -1472,4 +1596,122 @@
     return menuId;
     }
 
+// -----------------------------------------------------------
+// CPhoneStateIdle::HandleErrorL
+// -----------------------------------------------------------
+//
+EXPORT_C void CPhoneStateIdle::HandleErrorL( const TPEErrorInfo& aErrorInfo )
+    {
+    __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneStateIdle::HandleErrorL() ");
+    __PHONELOG1( EBasic, EPhoneControl, 
+            "PhoneUIControl: CPhoneStateIdle::HandleErrorL - aErrorInfo.iErrorCode =%d ",
+            aErrorInfo.iErrorCode );
+    __PHONELOG1( EBasic, EPhoneControl,
+            "PhoneUIControl: CPhoneStateIdle::HandleErrorL - aErrorInfo.iCallId =%d ",
+            aErrorInfo.iCallId );
+    if( ( ECCPErrorNone != aErrorInfo.iErrorCode ) &&
+            IsBubbleInitialized() )
+        {
+        HandleInitializingCallErrorL( aErrorInfo.iCallId );
+        SetBubbleInitialized( EFalse );
+        }
+    CPhoneState::HandleErrorL( aErrorInfo );
+    }
+
+// -----------------------------------------------------------
+// CPhoneStateIdle::HandleInitializingCallErrorL
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::HandleInitializingCallErrorL( TInt aCallId )
+    {
+    __LOGMETHODSTARTEND(
+            EPhoneControl, 
+            "CPhoneStateIdle::HandleInitializingCallErrorL()" );
+    // Remove call 
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
+    BeginUiUpdateLC();
+    SetDefaultFlagsL();
+    if ( IsNumberEntryUsedL() )
+        {
+        if ( NeedToReturnToForegroundAppL() )
+            {
+            iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
+            iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
+            iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
+            }
+        else
+            {
+            // Show the number entry if it exists and update cba's.
+            SetNumberEntryVisibilityL( ETrue );
+            if ( IsDTMFEditorVisibleL() )
+                {
+                CloseDTMFEditorL();
+                DisplayIdleScreenL();
+                }
+            else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
+                {
+                CloseCustomizedDialerL();
+                DisplayIdleScreenL();
+                } 
+            }
+        }
+    else
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+        if ( !TopAppIsDisplayedL() || IsAutoLockOn() || NeedToReturnToForegroundAppL() )
+            {
+            // Continue displaying current app but set up the 
+            // idle screen in the background
+            SetupIdleScreenInBackgroundL();
+            }
+        else
+            {
+            DisplayIdleScreenL();
+            }
+        }
+    DeleteTouchPaneButtons();
+    EndUiUpdate();
+    
+    // Display call termination note, if necessary
+    DisplayCallTerminationNoteL();
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
+    }
+
+// -----------------------------------------------------------
+// CPhoneStateIdle::SetBubbleInitialized
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::SetBubbleInitialized( TBool aValue )
+    {
+    __PHONELOG1( EBasic, EPhoneControl, 
+            "PhoneUIControl: CPhoneStateIdle::SetBubbleInitialized - aValue =%d ",
+            aValue );
+    iBubbleInitialized = aValue;
+    }
+
+// -----------------------------------------------------------
+// CPhoneStateIdle::IsBubbleInitialized
+// -----------------------------------------------------------
+//
+TBool CPhoneStateIdle::IsBubbleInitialized()
+    {
+    __PHONELOG1( EBasic, EPhoneControl, 
+            "PhoneUIControl: CPhoneStateIdle::IsBubbleInitialized - iBubbleInitialized =%d ",
+            iBubbleInitialized );
+    return iBubbleInitialized;
+    }
+
+// -----------------------------------------------------------
+// CPhoneStateIdle::ChangeTo
+// -----------------------------------------------------------
+//
+void CPhoneStateIdle::ChangeTo( TInt aState )
+    {
+    __PHONELOG1( EBasic, EPhoneControl, 
+           "PhoneUIControl: CPhoneStateIdle::ChangeTo - aState =%d ",
+           aState );
+    SetBubbleInitialized( EFalse );
+    iStateMachine->ChangeState( aState );
+    }
+
 // End of File
--- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -154,8 +154,17 @@
                     }
                 else
                     {
-                    HandleCommandL( EPhoneCmdOptions );
-                    }
+                    TPhoneCmdParamInteger numberEntryCountParam;
+                    iViewCommandHandle->ExecuteCommandL( 
+                           EPhoneViewGetNumberEntryCount,
+                           &numberEntryCountParam );
+                    
+                    TInt neLength( numberEntryCountParam.Integer() );
+                    if ( neLength > 0 )
+                       {
+                       HandleCommandL( EPhoneNumberAcqCmdSendCommand );
+                       }
+                    }      
                 }
             break;
 #endif            
--- a/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -226,14 +226,23 @@
 //
 void TPhoneCallHeaderParam::SetBasicCallHeaderParamsL(
         const TInt aCallId, 
-        TPhoneCmdParamCallHeaderData* aCallHeaderData )
+        TPhoneCmdParamCallHeaderData* aCallHeaderData,
+        TBool aInitializing )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetBasicCallHeaderParamsL( ) ");
     // Set call header call state
-    aCallHeaderData->SetCallState( 
-        iStateMachine.PhoneEngineInfo()->CallState( aCallId ) );
-
-    // Set call header type            
+    if( aInitializing )
+        {
+        // fake state to initializing call this way we get correct bubble to screen.
+        aCallHeaderData->SetCallState( EPEStateDialing );
+        }
+    else
+        {
+        aCallHeaderData->SetCallState( 
+                iStateMachine.PhoneEngineInfo()->CallState( aCallId ) );
+        }
+    
+    // Set call header type.
     aCallHeaderData->SetCallType( GetCallType( aCallId, aCallHeaderData ) );
     aCallHeaderData->SetCallFlag( CallHeaderType() );
     
@@ -527,7 +536,7 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetIncomingCallHeaderParamsL( ) ");
     // Set basic params must be called before update is called.
-    SetBasicCallHeaderParamsL( aCallId, aCallHeaderData );
+    SetBasicCallHeaderParamsL( aCallId, aCallHeaderData, EFalse );
     
     // Set call header labels
     SetCallHeaderTexts( 
@@ -552,9 +561,34 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetOutgoingCallHeaderParamsL( ) ");
     // Set basic params must be called before update is called.
-    SetBasicCallHeaderParamsL( aCallId, aCallHeaderData );
-    
+    SetBasicCallHeaderParamsL( aCallId, aCallHeaderData, EFalse );
     // Set call header labels
+    SetCallHeaderLabels( aCallHeaderData );
+    SetCliParamatersL( aCallId, aCallHeaderData );
+    }
+
+// ---------------------------------------------------------------------------
+//  TPhoneCallHeaderParam::SetIniticalizingCallHeaderParamsL
+// ---------------------------------------------------------------------------
+//
+void TPhoneCallHeaderParam::SetIniticalizingCallHeaderParamsL(
+        const TInt aCallId,
+        TPhoneCmdParamCallHeaderData* aCallHeaderData )
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetIniticalizingCallHeaderParamsL( ) ");
+    // Set basic params must be called before update is called.
+    SetBasicCallHeaderParamsL( aCallId, aCallHeaderData, ETrue );
+    // Set call header labels
+    SetCallHeaderLabels( aCallHeaderData );
+    }
+
+// ---------------------------------------------------------------------------
+//  TPhoneCallHeaderParam::SetCallHeaderLabels
+// ---------------------------------------------------------------------------
+//
+void TPhoneCallHeaderParam::SetCallHeaderLabels( 
+       TPhoneCmdParamCallHeaderData* aCallHeaderData )
+    {
     if ( aCallHeaderData->CallType() == EPECallTypeVideo )
         {
         iManagerUtility.LoadCallHeaderTexts( 
@@ -569,8 +603,6 @@
                 EPhoneOutgoingCallLabelShort, 
                 aCallHeaderData );
         }
-    
-    SetCliParamatersL( aCallId, aCallHeaderData );
     }
 
 // ---------------------------------------------------------------------------
--- a/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h	Mon Jul 12 15:53:34 2010 +0100
@@ -109,6 +109,11 @@
         * Return ETrue if video call.
         */
         TBool IsVideoCall( const TInt aCallId ) const;
+        
+        /**
+        * Return ETrue if voice call.
+        */
+        TBool IsVoiceCall( const TInt aCallId ) const;
  
     protected:
 		
--- a/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -17,6 +17,7 @@
 
 
 // INCLUDES
+#include <ScreensaverInternalPSKeys.h>
 #include <eikmenub.h> 
 #include <eikenv.h>
 #include <StringLoader.h>
@@ -41,6 +42,7 @@
 #include "tphonecmdparamcallstatedata.h"
 #include "cphonekeys.h"
 #include "phonelogger.h"
+#include "cphonepubsubproxy.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -81,6 +83,10 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
     
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverAllowed ); 
   
     DefineAndSetHoldFlagL();
     
@@ -461,7 +467,12 @@
                 EPhoneViewGetCallIdByState, &callStateData );
                 
             if( callStateData.CallId() > KErrNotFound )
-                {
+                {            
+                CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                                KPSUidScreenSaver,
+                                KScreenSaverAllowScreenSaver,
+                                EPhoneScreensaverNotAllowed );
+            
                 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
                 iStateMachine->ChangeState( EPhoneStateWaitingInSingle );    
                 }
@@ -839,6 +850,11 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleDiallingL()");
     
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverNotAllowed );
+    
     BeginUiUpdateLC(); 
     
     CloseSelectionListL(); 
@@ -922,6 +938,11 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleIncomingL()");
     
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverNotAllowed );
+    
     BeginUiUpdateLC();
     
     // Hide the number entry if it exists
--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -172,11 +172,11 @@
             CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
             if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
                 {
-                TPhoneCmdParamBoolean isProgressNoteVisible;
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsProgressNoteVisible,
-                      &isProgressNoteVisible );
+                TPhoneCmdParamBoolean isNoteVisible;
+                iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsNoteVisible,
+                      &isNoteVisible );
 
-                if ( !isProgressNoteVisible.Boolean() )
+                if ( !isNoteVisible.Boolean() )
                     {
                     ShowNoteL( EPhoneEmergencyConnectWaitNote );
                     UpdateSetupCbaL();
@@ -667,15 +667,6 @@
 
     switch( aCommand )
         {
-        case EPhoneInCallCmdDtmfManualQuery:
-            if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
-                {
-                // Remove emergency connecting note
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
-                }
-            commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
-            break;
-
         case EPhoneDtmfDialerExit:      // fall through
         case EPhoneDtmfDialerCancel:
              {
@@ -683,11 +674,11 @@
                  {
                  CloseDTMFEditorL();
 
-                 TPhoneCmdParamBoolean isProgressNoteVisible;
-                 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsProgressNoteVisible,
-                        &isProgressNoteVisible );
+                 TPhoneCmdParamBoolean isNoteVisible;
+                 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsNoteVisible,
+                        &isNoteVisible );
 
-                 if ( !isProgressNoteVisible.Boolean() )
+                 if ( !isNoteVisible.Boolean() )
                      {
                      ShowNoteL( EPhoneEmergencyConnectWaitNote );
                      UpdateSetupCbaL();
--- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -383,6 +383,10 @@
                 {
                 SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls );
                 }
+            else if ( IsVoiceCall( aErrorInfo.iCallId ))
+                {
+                SendGlobalWarningNoteL( EPhoneNoteCallInfoCauseValue21 );
+                }
             break;
             
         case ECCPErrorMovedPermanently:
@@ -578,4 +582,23 @@
         ->CallType( aCallId )== EPECallTypeVideo );
     }
     
+// -----------------------------------------------------------
+// CPhoneErrorMessagesHandler::IsVoiceCall
+// -----------------------------------------------------------
+//
+TBool CPhoneErrorMessagesHandler::IsVoiceCall( const TInt aCallId ) const
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, "CPhoneErrorMessagesHandler::IsVoiceCall() ");
+
+    if( aCallId == KErrNotFound )
+        {
+       // Illegal call id, check call type command
+        return ( iStateMachine->PhoneEngineInfo()->CallTypeCommand()
+            == EPECallTypeCSVoice );  
+        }
+     
+    return ( iStateMachine->PhoneEngineInfo()
+            ->CallType( aCallId )== EPECallTypeCSVoice );
+	}
+
 // End of File
--- a/phoneapp/phoneuistates/src/cphoneidle.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneidle.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -188,7 +188,7 @@
             &blockingDialogStatus );
         }
     
-    CPhoneState::HandleErrorL( aErrorInfo );
+    CPhoneStateIdle::HandleErrorL( aErrorInfo );
     }
 
 // End of File
--- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -27,6 +27,7 @@
 #include <connect/sbdefs.h>
 #include <videotelcontrolmediatorapi.h>
 #include <MediatorDomainUIDs.h>
+#include <ScreensaverInternalPSKeys.h>
 
 #include "cphonesinglecall.h"
 #include "tphonecmdparamstring.h"
@@ -114,6 +115,10 @@
     iCallId = callStateData.CallId();
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverAllowed );
     
     // Update phone number availability for menu use
     PhoneNumberAvailableInPhoneEngineL( callStateData.CallId() );
@@ -494,6 +499,11 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleCall::HandleIncomingL()");
     
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverNotAllowed );
+    
     BeginUiUpdateLC();
     
     // Hide the number entry if it exists
@@ -608,6 +618,11 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleCall::HandleDiallingL()");
     
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverNotAllowed );
+    
     BeginUiUpdateLC();
     
     SetNumberEntryVisibilityL(EFalse);
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -17,6 +17,7 @@
 
 
 // INCLUDES
+#include <ScreensaverInternalPSKeys.h>
 #include <eikmenub.h> 
 #include <eikenv.h>
 #include <StringLoader.h>
@@ -39,6 +40,7 @@
 #include "tphonecmdparamcallstatedata.h"
 #include "phonestatedefinitionsgsm.h"
 #include "phonelogger.h"
+#include "cphonepubsubproxy.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -78,6 +80,11 @@
     globalNotifierParam.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
+    
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverAllowed );
     }
 
 // -----------------------------------------------------------
@@ -389,6 +396,11 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSingles::HandleIncomingL()");
     
+    CPhonePubSubProxy::Instance()->ChangePropertyValue(
+                    KPSUidScreenSaver,
+                    KScreenSaverAllowScreenSaver,
+                    EPhoneScreensaverNotAllowed );
+    
     BeginUiUpdateLC();
     
     // Hide the number entry if it exists
--- a/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h	Mon Jul 12 15:53:34 2010 +0100
@@ -1,24 +1,21 @@
 /*
-* ============================================================================
-*  Name     : phoneloggerviewcommands.h
-*  Part of  : PhoneUI / phoneuiutils.dll
-*
-*  Description:
-*     Macro definition file for logging.
-*  Version:
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright © 2007 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
-* ============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Macro definition file for logging.
+*
 */
-// Autogenerated from phoneloggerviewcommands.st by the stringtable tool - Do not edit
+
+// Autogenerated from .\phoneloggerviewcommands.st by the stringtable tool - Do not edit
 
 #ifndef STRINGTABLE_PhoneLoggerviewCommands
 #define STRINGTABLE_PhoneLoggerviewCommands
@@ -435,6 +432,10 @@
 		EPhoneViewSetNeedToReturnToForegroundAppStatus,
 		/** EPhoneViewGetQwertyModeObserver */
 		EPhoneViewGetQwertyModeObserver,
+		/** EPhoneViewSetIncallBubbleTrue */
+		EPhoneViewSetIncallBubbleTrue,
+		/** EPhoneViewSetIncallBubbleFalse */
+		EPhoneViewSetIncallBubbleFalse,
 		/** , // Don't remove this, this should always be the last in list. */
 		EPhoneAmountOfCommands
 		};
--- a/phoneapp/phoneuiutils/inc/phonerssbase.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/phonerssbase.h	Mon Jul 12 15:53:34 2010 +0100
@@ -347,6 +347,7 @@
     EPhoneNoteNoService,
     EPhoneNoteCallInfoCauseValue16,
     EPhoneNoteCallInfoCauseValue18,
+    EPhoneNoteCallInfoCauseValue21,
     EPhoneNoteCallInfoCauseValue22,
     EPhoneNoteCallInfoCauseValue34,
     EPhoneNoteCallInfoCauseValue38,
--- a/phoneapp/phoneuiutils/inc/phonestatestrings.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/phonestatestrings.h	Mon Jul 12 15:53:34 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description: 
-*     Macro definition file for logging.
+* Description:  Macro definition file for logging.
 *
 */
 
-// Autogenerated from phonestatestrings.st by the stringtable tool - Do not edit
+// Autogenerated from .\phonestatestrings.st by the stringtable tool - Do not edit
 
 #ifndef STRINGTABLE_PhoneStateStrings
 #define STRINGTABLE_PhoneStateStrings
--- a/phoneapp/phoneuiutils/inc/phonestatestringsgsm.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/phonestatestringsgsm.h	Mon Jul 12 15:53:34 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description: 
-*     Macro definition file for logging.
+* Description:  Macro definition file for logging.
 *
 */
 
-// Autogenerated from phonestatestringsgsm.st by the stringtable tool - Do not edit
+// Autogenerated from .\phonestatestringsgsm.st by the stringtable tool - Do not edit
 
 #ifndef STRINGTABLE_PhoneStateStringsGSM
 #define STRINGTABLE_PhoneStateStringsGSM
--- a/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -1443,7 +1443,11 @@
         case EPhoneNoteCalledNumberHasBarredIncomingCalls:
             retVal = R_NOTE_CALLED_NUMBER_HAS_BARRED_INCOMING_CALLS;
             break;
-
+            
+        case EPhoneNoteCallInfoCauseValue21:
+            retVal = R_CALL_INFO_CAUSE_VALUE21;
+            break;
+            
         case EPhoneNoteCallInfoCauseValue22:
             retVal = R_CALL_INFO_CAUSE_VALUE22;
             break;
--- a/phoneapp/phoneuiutils/src/generate.bat	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/src/generate.bat	Mon Jul 12 15:53:34 2010 +0100
@@ -14,9 +14,9 @@
 rem Description: Generate string tables and move headers.
 rem
 
-perl %EPOCROOT%epoc32\tools\stringtable.pl phoneloggerviewcommands.st
-perl %EPOCROOT%epoc32\tools\stringtable.pl phonestatestrings.st
-perl %EPOCROOT%epoc32\tools\stringtable.pl phonestatestringsgsm.st
+perl %EPOCROOT%epoc32\tools\stringtable.pl .\phoneloggerviewcommands.st
+perl %EPOCROOT%epoc32\tools\stringtable.pl .\phonestatestrings.st
+perl %EPOCROOT%epoc32\tools\stringtable.pl .\phonestatestringsgsm.st
 
 perl ..\..\phoneui\internal\tools\add_copyright.pl
 
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -1,24 +1,21 @@
 /*
-* ============================================================================
-*  Name     : phoneloggerviewcommands.cpp
-*  Part of  : PhoneUI / phoneuiutils.dll
-*
-*  Description:
-*     Macro definition file for logging.
-*  Version:
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright © 2007 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
-* ============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Macro definition file for logging.
+*
 */
-// Autogenerated from phoneloggerviewcommands.st by the stringtable tool - Do not edit
+
+// Autogenerated from .\phoneloggerviewcommands.st by the stringtable tool - Do not edit
 #include <e32std.h>
 #include <stringpool.h>
 #include <stringtablesupport.h>
@@ -228,7 +225,9 @@
 _STLIT8(K199, "EPhoneViewGetNeedToReturnToForegroundAppStatus");
 _STLIT8(K200, "EPhoneViewSetNeedToReturnToForegroundAppStatus");
 _STLIT8(K201, "EPhoneViewGetQwertyModeObserver");
-_STLIT8(K202, ", // Don't remove this, this should always be the last in list.");
+_STLIT8(K202, "EPhoneViewSetIncallBubbleTrue");
+_STLIT8(K203, "EPhoneViewSetIncallBubbleFalse");
+_STLIT8(K204, ", // Don't remove this, this should always be the last in list.");
 
 // Intermediate
 const void * const KStringPointers[] =
@@ -434,8 +433,10 @@
 	(const void*)&K199,
 	(const void*)&K200,
 	(const void*)&K201,
-	(const void*)&K202
+	(const void*)&K202,
+	(const void*)&K203,
+	(const void*)&K204
 	};
 
-const TStringTable PhoneLoggerviewCommands::Table = {202, KStringPointers, EFalse};
+const TStringTable PhoneLoggerviewCommands::Table = {204, KStringPointers, EFalse};
 
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st	Mon Jul 12 15:53:34 2010 +0100
@@ -201,4 +201,6 @@
 EPhoneViewGetNeedToReturnToForegroundAppStatus EPhoneViewGetNeedToReturnToForegroundAppStatus
 EPhoneViewSetNeedToReturnToForegroundAppStatus EPhoneViewSetNeedToReturnToForegroundAppStatus
 EPhoneViewGetQwertyModeObserver EPhoneViewGetQwertyModeObserver
+EPhoneViewSetIncallBubbleTrue EPhoneViewSetIncallBubbleTrue
+EPhoneViewSetIncallBubbleFalse EPhoneViewSetIncallBubbleFalse
 EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list.
--- a/phoneapp/phoneuiutils/src/phonestatestrings.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/src/phonestatestrings.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description: 
-*     Macro definition file for logging.
+* Description:  Macro definition file for logging.
 *
 */
 
-// Autogenerated from phonestatestrings.st by the stringtable tool - Do not edit
+// Autogenerated from .\phonestatestrings.st by the stringtable tool - Do not edit
 #include <e32std.h>
 #include <stringpool.h>
 #include <stringtablesupport.h>
--- a/phoneapp/phoneuiutils/src/phonestatestringsgsm.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiutils/src/phonestatestringsgsm.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005 - 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description: 
-*     Macro definition file for logging.
+* Description:  Macro definition file for logging.
 *
 */
 
-// Autogenerated from phonestatestringsgsm.st by the stringtable tool - Do not edit
+// Autogenerated from .\phonestatestringsgsm.st by the stringtable tool - Do not edit
 #include <e32std.h>
 #include <stringpool.h>
 #include <stringtablesupport.h>
--- a/phoneapp/phoneuiview/group/phoneuiview.mmp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/group/phoneuiview.mmp	Mon Jul 12 15:53:34 2010 +0100
@@ -171,3 +171,5 @@
 LIBRARY         serviceprovidersettings.lib
 
 LIBRARY         musmanagerclient.lib
+
+LIBRARY         aknskinsrv.lib
--- a/phoneapp/phoneuiview/inc/cphonebuttonscontroller.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/inc/cphonebuttonscontroller.h	Mon Jul 12 15:53:34 2010 +0100
@@ -189,7 +189,8 @@
         EButtonsDimJoin    = 512,
         EButtonsVideoCallOngoing = 1024,
         EButtonsDimSilence  = 2048,
-        EButtonsDimCreateConference = 4096  
+        EButtonsDimCreateConference = 4096,  
+        EButtonsDimHold = 8192
         };
     TInt iFlags;
     };
--- a/phoneapp/phoneuiview/inc/cphoneviewcontroller.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/inc/cphoneviewcontroller.h	Mon Jul 12 15:53:34 2010 +0100
@@ -24,6 +24,7 @@
 #include <e32base.h>
 #include <cntdef.h>
 #include <cphcntspeeddialmonitor.h>
+#include <AknsSrvClient.h>
 
 #include "mphoneviewcommandhandle.h"
 #include "cphonerecoverysystem.h"
@@ -89,8 +90,9 @@
     public MPhoneStatusPaneObserver,
     public MPhoneViewBlockingDialogObserver,
     public MNumberEntryObserver,
-	public MPhoneSecurityModeChangeObserver,
-	public MPhoneViewControllerObserver
+    public MPhoneSecurityModeChangeObserver,
+    public MPhoneViewControllerObserver,
+    public MAknsSkinChangeObserver
     {
     public:  // Constructors and destructor
 
@@ -577,9 +579,9 @@
         void SwitchLayoutToFlatStatusPaneL( TBool aSwitch );
 
         /**
-        * Swap empty indicator pane when secure state.
+        * Swap empty indicator pane.
         */
-        void SwapEmptyIndicatorPaneInSecureStateL ( const TBool aSwapEmpty );
+        void SwapEmptyIndicatorPaneL( const TBool aSwapEmpty );
 
         /**
         * Handles transition effect.
@@ -664,6 +666,33 @@
          */
         static void EffectCleanup(TAny* aThis );
         
+    private: 
+        /**
+         * Called by the skin server when skin content is changed and the
+         * connected client wants to be informed.
+         *
+         * @see MAknsSkinChangeObserver
+         */
+         void SkinContentChanged();
+
+         /**
+         * Called by the skin server to indicate that the current skin
+         * configuration has changed.
+         *
+         * @see MAknsSkinChangeObserver
+         */
+         void SkinConfigurationChanged(
+             const TAknsSkinStatusConfigurationChangeReason aReason );
+
+         /**
+         * Called by the skin server to indicate that the available
+         * skin packages have changed.
+         *
+         * @see MAknsSkinChangeObserver
+         */
+         void SkinPackageChanged(
+             const TAknsSkinStatusPackageChangeReason aReason );
+        
     private:    // Data
 
         CPhoneView* iPhoneView;
@@ -812,6 +841,9 @@
         TBool iNeedToReturnToForegroundAppAfterCall;
         
         CAknIncallBubble* iIncallBubble;
+        
+        // Server wich sends events about background image changes
+        RAknsSrvSession iSkinServerSession;
     };
 
 #endif // CPHONEVIEWCONTROLLER_H
--- a/phoneapp/phoneuiview/inc/mphoneviewcontrollerobserver.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/inc/mphoneviewcontrollerobserver.h	Mon Jul 12 15:53:34 2010 +0100
@@ -38,11 +38,6 @@
     * Sets incall small bubble´s visibility in special cases.
     */
     virtual void AllowInCallBubbleInSpecialCases() = 0;
-	 
-    /**
-    * Sets Incall bubble´s visibility.
-    */   
-    virtual void SetIncallBubbleVisibility( TBool aIncallBubbleVisible ) = 0;
     };
 
 #endif /* MPHONEVIEWCONTROLLEROBSERVER_H_ */
--- a/phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h	Mon Jul 12 15:53:34 2010 +0100
@@ -233,6 +233,8 @@
     EPhoneViewSetConferenceAndWaitingVideo,
     EPhoneViewLaunchMultimediaSharing,
     EPhoneViewGetQwertyModeObserver,
+    EPhoneViewSetIncallBubbleTrue,
+    EPhoneViewSetIncallBubbleFalse,
 
     EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list.
 };
--- a/phoneapp/phoneuiview/src/cphonebuttonscontroller.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphonebuttonscontroller.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -353,6 +353,9 @@
             case EPhoneInCallCmdCreateConference:
                 iFlags &= ~EButtonsDimCreateConference;
                 break;
+            case EPhoneInCallCmdHold:
+                iFlags &= ~EButtonsDimHold;
+                break;
             default:
                 break;                
             }
@@ -388,6 +391,9 @@
            case EPhoneInCallCmdCreateConference:
                 iFlags |= EButtonsDimCreateConference;
                 break;
+           case EPhoneInCallCmdHold:
+                iFlags |= EButtonsDimHold;
+                break;
             default:
                 break;                
             }
@@ -626,7 +632,7 @@
                 }
             case EPhoneInCallCmdHold:
                 {
-                if ( iFlags & EButtonsVideoCallOngoing )
+                if ( iFlags & EButtonsVideoCallOngoing || iFlags & EButtonsDimHold )
                     {
                     iTouchPane.SetButtonDimmed( commandId, ETrue );
                     }
--- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -228,13 +228,6 @@
         {
         switch( menuItemArray[ i ] )
             {
-            case EPhoneDialerCallSettings:
-                if ( iSecurityMode )
-                    {
-                    menuPane->DeleteMenuItem( menuItemArray[ i ] );
-                    }
-                break;
-
             case EPhoneInCallCmdAnswer:
                 if ( iConferenceAndWaitingVideoFlag )
                     {
@@ -299,15 +292,6 @@
                     }
                 break;    
                 
-            case EPhoneInCallCmdSendToCallerMenu:
-            	{
-            	if ( iSecurityMode )
-            		{
-            		menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
-            		}
-            	}
-            break;
-                                
             case EPhoneNumberAcqCmdSendCommand:
                 if ( !iServiceCodeFlag || iNumberEntryEmpty || iInvalidCsPhoneNumber )
                     {
@@ -520,7 +504,7 @@
                 break;
             case EPhoneCmdDtmfOk:
                 {
-                if ( onScreenDialer && iNumberEntryEmpty )
+                if ( ( onScreenDialer && iNumberEntryEmpty ) || iSecurityMode )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[i] );                     
                     }
@@ -561,18 +545,19 @@
                     }
                 }
                 break;
-			
+
+            case EPhoneDialerCallSettings: // Fall through
+            case EPhoneInCallCmdSendToCallerMenu: // Fall through
+            case EAknCmdEditItemPlaceHolder: // Fall through
             case EPhoneDialerCmdHelp: // Fall through 
             case EPhoneDialerCmdHelpDtmf: // Fall through
             case EPhoneInCallCmdHelp:
-                {
                 if ( iSecurityMode )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[i] );
                     }
-                }
-			break;
-			
+                break;
+
             default:
                 break;                                                                                                
              
--- a/phoneapp/phoneuiview/src/cphonenote.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphonenote.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -88,7 +88,9 @@
     // Let the command observer process the command
     iCommandObserver.ProcessCommandL( aCommand );
 
-    return EFalse; // so that the dialog will not disappear
+    // So that the dialog will not disappear, or must disappear
+    // EPhoneInCallCmdDtmfManualQuery since it can be already deleted.
+    return ( aCommand == EPhoneInCallCmdDtmfManualQuery ); 
     }
     
 // ---------------------------------------------------------
--- a/phoneapp/phoneuiview/src/cphoneview.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphoneview.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -192,7 +192,6 @@
     {
     __LOGMETHODSTARTEND(EPhoneUIView, "CPhoneView::ViewDeactivated()");
     SetActivatePreviousApp( EFalse );
-    iViewControllerObserver->SetIncallBubbleVisibility( EFalse );
     DrawDeferred();
     }
 
--- a/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -34,6 +34,7 @@
 #include "tphonecommandparam.h"
 #include "cphonebubblewrapper.h"
 #include "tphonecmdparamcallstatedata.h"
+#include "tphonecmdparamKeycapture.h"
 #include "tphonecmdparaminteger.h"
 #include "tphonecmdparamboolean.h"
 #include "tphonecmdparamstring.h"
@@ -265,6 +266,8 @@
     iAknUiServerClient = CAknSgcClient::AknSrv();
     
     iIncallBubble = CAknIncallBubble::NewL();
+    
+    User::LeaveIfError( iSkinServerSession.Connect( this ) );
     }
 
 // -----------------------------------------------------------------------------
@@ -290,6 +293,8 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIView,
                         "CPhoneViewController::~CPhoneViewController()" );
+    iSkinServerSession.Close();
+    
     delete iButtonsController;
     delete iDialerController;
     delete iToolbarController;
@@ -645,6 +650,20 @@
             }
             break;
 
+        case EPhoneViewSetIncallBubbleTrue:
+            {
+            // Allow small call bubble, if call handling view is in background and allow for dialer also
+            SetIncallBubbleVisibility( ETrue );
+            }
+            break;
+
+        case EPhoneViewSetIncallBubbleFalse:
+            {
+            // Don't allow small call bubble, if call handling view is not in foreground
+            SetIncallBubbleVisibility( EFalse );
+            }
+            break;
+
         default:
             __PHONELOG( EBasic, EPhonePhoneapp,
                 "CPhoneViewController::ExecuteCommandL -> UnKnownMessage !");
@@ -2169,42 +2188,75 @@
     iToolbarController->DimToolbar( aIsEnabled );			
 	iPhoneView->SetSecurityMode( aIsEnabled );
 	iMenuController->SetSecurityMode( aIsEnabled );
+	
+	TBool securityModeChanged = ( iSecurityMode != aIsEnabled );
+	
+	iSecurityMode = aIsEnabled;
+	
 	if ( iDialer )
 		{
-        CDialingExtensionInterface* easyDialing = iDialer->GetEasyDialingInterface();
-        if ( easyDialing )
+        iDialerController->SetRestrictedDialer( aIsEnabled );
+	
+        if ( iDialerActive && securityModeChanged )
             {
+            CDialingExtensionInterface* easyDialing = iDialer->GetEasyDialingInterface();
+            if ( easyDialing )
+                {
+                if ( aIsEnabled )
+                    {
+                    // Reset the Easy Dialing just in case, this clears the existing matches
+                    // when restricted mode is activated
+                    easyDialing->Reset();
+                    }
+                else
+                    {
+                    if ( easyDialing->IsEnabled() )
+                        {
+                        // If Easy Dialing is enabled, set the input from the numeric entry
+                        // field for updating the search result when restricted mode is
+                        // deactivated.
+                        TBuf<KDialerInputMaxChars> buf;
+                        iDialer->NumberEntry()->GetTextFromNumberEntry( buf );
+                        TRAP_IGNORE( easyDialing->SetInputL( buf ) );
+                        }
+                    }
+                }
+            iDialer->RelayoutAndDraw();
+            
+            // also update cba if security mode changes while dialer is open
+            TPhoneCmdParamInteger integerParam;
             if ( aIsEnabled )
                 {
-                // Reset the Easy Dialing just in case, this clears the existing matches
-                // when restricted mode is activated
-                easyDialing->Reset();
+                iNoteController->DestroyNote();
+                integerParam.SetInteger( CPhoneMainResourceResolver::Instance()->
+                        ResolveResourceID( EPhoneEmergencyModeNoteCBA ) );
                 }
             else
                 {
-                if ( easyDialing->IsEnabled() )
-                    {
-                    // If Easy Dialing is enabled, set the input from the numeric entry
-                    // field for updating the search result when restricted mode is
-                    // deactivated.
-                    TBuf<KDialerInputMaxChars> buf;
-                    iDialer->NumberEntry()->GetTextFromNumberEntry( buf );
-                    easyDialing->SetInputL( buf );
-                    }
+                integerParam.SetInteger( CPhoneMainResourceResolver::Instance()->
+                        ResolveResourceID( EPhoneNumberAcqCBA ) );
+                }
+            TRAP_IGNORE( ExecuteCommandL( EPhoneViewUpdateCba, &integerParam ) );
+            
+            if ( !aIsEnabled )
+                {
+                TRAP_IGNORE( SwitchLayoutToFlatStatusPaneL( ETrue ) );
                 }
             }
-        iDialerController->SetRestrictedDialer( aIsEnabled );
-		if ( iSecurityMode != aIsEnabled )
-			{
-			iDialer->RelayoutAndDraw();
-			}
 		}
-    if ( iSecurityMode != aIsEnabled )
+    if ( securityModeChanged )
         {
         // Update status pane dimming
         iStatusPane->StatusPane().SetDimmed( aIsEnabled );
+
+        // Uncapture the App key for sure
+        TPhoneCmdParamKeyCapture appKeyCaptureParam;
+        appKeyCaptureParam.SetKey( EStdKeyApplication0 );
+        appKeyCaptureParam.SetKeyCode( EKeyApplication0 );
+        appKeyCaptureParam.SetCaptureType( EPhoneKeyAllEvents );
+
+        iKeyCaptureController->StopCapturingKey( &appKeyCaptureParam );
         }
-	iSecurityMode = aIsEnabled;
 	}
 
 // ---------------------------------------------------------------------------
@@ -3656,7 +3708,7 @@
 
     if ( aSwitch )
         {
-        SwapEmptyIndicatorPaneInSecureStateL( ETrue );
+        SwapEmptyIndicatorPaneL( ETrue );
         if ( !Layout_Meta_Data::IsLandscapeOrientation() )
             {
             iStatusPane->StatusPane().SwitchLayoutL
@@ -3670,7 +3722,7 @@
         }
     else
         {
-        SwapEmptyIndicatorPaneInSecureStateL( EFalse );
+        SwapEmptyIndicatorPaneL( EFalse );
         if ( !Layout_Meta_Data::IsLandscapeOrientation() )
             {
             iStatusPane->StatusPane().SwitchLayoutL
@@ -3689,14 +3741,14 @@
     }
 
 // ---------------------------------------------------------------------------
-// CPhoneViewController::SwapEmptyIndicatorPaneInSecureStateL
+// CPhoneViewController::SwapEmptyIndicatorPaneL
 // ---------------------------------------------------------------------------
 //
-void CPhoneViewController::SwapEmptyIndicatorPaneInSecureStateL(
+void CPhoneViewController::SwapEmptyIndicatorPaneL(
                                     const TBool aSwapEmpty )
     {
     __LOGMETHODSTARTEND(EPhoneUIView,
-        "CPhoneViewController::SwapEmptyIndicatorPaneInSecureStateL()" );
+        "CPhoneViewController::SwapEmptyIndicatorPaneL()" );
     if ( iSecurityMode )
         {
         if ( aSwapEmpty )
@@ -3711,13 +3763,24 @@
                                     iStatusPane->StatusPane().SwapControlL(
             TUid::Uid( EEikStatusPaneUidIndic ), iIndiContainer );
             }
-        else
+        else if ( iPreviousIndicatorControl )
             {
             //Restore previous indicator control
             iStatusPane->StatusPane().SwapControlL(
             TUid::Uid( EEikStatusPaneUidIndic ), iPreviousIndicatorControl );
             }
         }
+    else if ( iPreviousIndicatorControl 
+              && iIndiContainer
+              && ( iIndiContainer ==
+                      iStatusPane->StatusPane().ControlL(
+                              TUid::Uid( EEikStatusPaneUidIndic ) ) ) )
+        {
+        //Restore previous indicator control if security mode is not on anymore 
+        // and empty indicator pane is still in status pane.
+        iStatusPane->StatusPane().SwapControlL(
+        TUid::Uid( EEikStatusPaneUidIndic ), iPreviousIndicatorControl );
+        }
     }
 
 
@@ -4128,7 +4191,36 @@
         "CPhoneViewController::SetIncallBubbleVisibility(%d)",
         aVisible );
 
-        TRAP_IGNORE( iIncallBubble->SetIncallBubbleAllowedInUsualL( aVisible ) ); 
+    TRAP_IGNORE( iIncallBubble->SetIncallBubbleAllowedInUsualL( aVisible ) ); 
+    }
+
+// ---------------------------------------------------------------------------
+// CPhoneViewController::SkinContentChanged
+// ---------------------------------------------------------------------------
+//
+void CPhoneViewController::SkinContentChanged()
+    {
+    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneViewController::SkinContentChanged()" );
+    iPhoneView->DrawNow();
     }
 
+// ---------------------------------------------------------------------------
+// CPhoneViewController::SkinConfigurationChanged
+// ---------------------------------------------------------------------------
+//
+void CPhoneViewController::SkinConfigurationChanged( const TAknsSkinStatusConfigurationChangeReason /*aReason*/ )
+    {
+    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneViewController::SkinConfigurationChanged()" );
+    iPhoneView->DrawNow();
+    }
+
+// ---------------------------------------------------------------------------
+// CPhoneViewController::SkinPackageChanged
+// ---------------------------------------------------------------------------
+//
+void CPhoneViewController::SkinPackageChanged( const TAknsSkinStatusPackageChangeReason /*aReason*/ )
+    {
+    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneViewController::SkinPackageChanged()" );
+    iPhoneView->DrawNow();
+    }
 // End of File
--- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -37,6 +37,7 @@
 #include "tphonecmdparamstring.h"
 #include "cphonemainresourceresolver.h"
 #include "mphonestatemachine.h"
+#include "mphonesecuritymodeobserver.h"
 #include "cphonelogger.h"
 #include "cphonecenrepproxy.h"
 #include "phoneui.pan"
@@ -210,7 +211,7 @@
             {
             case EPhoneDialerCmdTouchInput:
                 {
-                if ( !VoIPSupportedL() )
+                if ( !VoIPSupportedL() || iStateMachine.SecurityMode()->IsSecurityMode() )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
                     }
--- a/phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h	Mon Jul 12 15:53:34 2010 +0100
@@ -55,12 +55,14 @@
      * @param aContactManager Contact manager.
      * @param aUriArray Array of contact store URI's used.
      * @param aObserver Observer for finding contacts.
+     * @param aMatchFlags A bitset of flags for matching strategy. Has zero or
+     * more CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags flags set.
      */
     static CPhCntContactMatchStrategy* NewL(
         CVPbkContactManager& aContactManager,
         CPhCntContactStoreUris& aContactStoreUris,
         MVPbkContactFindObserver& aObserver,
-        CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags aMatchFlag );
+        TUint32 aMatchFlags );
 
     /**
      * Destructor.
@@ -135,13 +137,10 @@
         CVPbkContactManager& aContactManager,
         CPhCntContactStoreUris& aContactStoreUris,
         MVPbkContactFindObserver& aObserver,
-        CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags aMatchFlag );
+        TUint32 aMatchFlags );
 
     void ConstructL();
 
-protected: // data
-    CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags iMatchFlag;
-	
 private: // data
 
     /**
@@ -200,6 +199,18 @@
      */
     CCntRawPhoneNumberExtractor* iNumberExtractor;
 
+protected:  // data
+
+    /**
+     * A bitset of matching strategy flags. Changed from
+     * CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags enum to TUint32
+     * in order to support multiple flags, as in
+     * CVPbkPhoneNumberMatchStrategy::TConfig.
+	 * 
+	 * Protected because a unit test class derives from this class.
+     */
+    TUint32 iMatchFlags;
+
     };
 
 
--- a/phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -118,13 +118,16 @@
     MVPbkContactFindObserver& aObserver,
     TBool aRemoveDuplicates )
     {
+    TUint32 dupesMatch =
+        CVPbkPhoneNumberMatchStrategy::EVPbkDuplicatedContactsMatchFlag |
+        CVPbkPhoneNumberMatchStrategy::EVPbkBestMatchingFlag;
+    TUint32 noDupesMatch = CVPbkPhoneNumberMatchStrategy::EVPbkBestMatchingFlag;
+    
     return CPhCntContactMatchStrategy::NewL(
         *iContactManager,
         *iContactStoreUris,
         aObserver,
-        aRemoveDuplicates ?
-        CVPbkPhoneNumberMatchStrategy::EVPbkDuplicatedContactsMatchFlag :
-        CVPbkPhoneNumberMatchStrategy::EVPbkMatchFlagsNone );
+        aRemoveDuplicates ? dupesMatch : noDupesMatch );
     }
 
 // ---------------------------------------------------------------------------
--- a/phoneengine/PhoneCntFinder/ContactService/src/cphcntcontactmatchstrategy.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/PhoneCntFinder/ContactService/src/cphcntcontactmatchstrategy.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -20,11 +20,13 @@
 #include <centralrepository.h>
 #include <telconfigcrkeys.h>
 #include <CVPbkContactStoreUriArray.h>
+#include <cntdb.h>  // KBestMatchingPhoneNumbers
 
 #include "cphcntcontactmatchstrategy.h"
 #include "cphcntcontactstoreuris.h"
 #include "CPhoneRawMatchNumberExtractor.h"
 
+
 // Digit count used to match CS number.
 const TInt KPhCntMatchMin = 7;
 const TInt KPhCntMatchMax = 11;
@@ -37,11 +39,11 @@
     CVPbkContactManager& aContactManager,
     CPhCntContactStoreUris& aContactStoreUris,
     MVPbkContactFindObserver& aObserver,
-    CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags aMatchFlag ) :
+    TUint32 aMatchFlags ) :
     iContactManager( aContactManager ),
     iContactStoreUris( aContactStoreUris ),
     iObserver( aObserver ),
-    iMatchFlag( aMatchFlag )
+    iMatchFlags( aMatchFlags )
     {
     iContactStoreUris.SetObserver( *this );
     }
@@ -91,14 +93,14 @@
     CVPbkContactManager& aContactManager,
     CPhCntContactStoreUris& aContactStoreUris,
     MVPbkContactFindObserver& aObserver,
-    CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags aMatchFlag )
+    TUint32 aMatchFlags )
     {
     CPhCntContactMatchStrategy* self = 
         new( ELeave ) CPhCntContactMatchStrategy( 
             aContactManager,
             aContactStoreUris, 
             aObserver,
-            aMatchFlag );
+            aMatchFlags );
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
@@ -242,10 +244,10 @@
 TInt CPhCntContactMatchStrategy::DoCreateMatchStrategy()
     {
     CVPbkPhoneNumberMatchStrategy::TConfig config( 
-            iNumberOfDigits,
+            KBestMatchingPhoneNumbers,
             *iUriArray,
             CVPbkPhoneNumberMatchStrategy::EVPbkSequentialMatch, 
-            iMatchFlag
+            iMatchFlags
             );
     TRAPD( err, iMatchStrategy = CVPbkPhoneNumberMatchStrategy::NewL( 
                     config, 
--- a/phoneengine/callhandling/src/cpecallhandling.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/callhandling/src/cpecallhandling.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -675,6 +675,7 @@
                 {
                 // Dial request passed on successfully: forward new call id
                 aCallId = callData->GetCallId();
+                iModel.SendMessage( MEngineMonitor::EPEMessageInitiatedMoCall, aCallId );
                 }
             }
         }
--- a/phoneengine/phonemodel/inc/cpemessagehandler.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/phonemodel/inc/cpemessagehandler.h	Mon Jul 12 15:53:34 2010 +0100
@@ -593,6 +593,13 @@
         * Handle disable service
         */     
         void HandleDisableService();
+        
+        /**
+        * Adds SIM rejected MO CS call to logs. 
+        * @param aCallId is the identification number of the call.   
+        * @return KErrNone if succesfull
+        */
+        TInt AddSIMRejectedMoCsCallToLog( const TInt aCallId );
    
     private: // New functions
         
--- a/phoneengine/phonemodel/inc/pevirtualengine.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/phonemodel/inc/pevirtualengine.h	Mon Jul 12 15:53:34 2010 +0100
@@ -395,6 +395,7 @@
         EPEMessageIncoming,
         EPEMessageInitiatedEmergencyCall,
         EPEMessageInitiatedEmergencyWhileActiveVideo,
+        EPEMessageInitiatedMoCall, // MO call setup has started but not yet in Dialing state
         EPEMessageInvalidSpeedDial,
         EPEMessageIssuingUSSDRequest,
         EPEMessageIssuedUSSDRequest,
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -3009,5 +3009,42 @@
         mediatorUpdater->UpdateRemotePartyInfo();
         }
     }
-	
+
+// -----------------------------------------------------------------------------
+// CPEMessageHandler::AddSIMRejectedMoCsCallToLog
+// -----------------------------------------------------------------------------
+//	
+TInt CPEMessageHandler::AddSIMRejectedMoCsCallToLog( const TInt aCallId )
+    {
+    TInt errorCode( ECCPErrorGeneral );
+    
+    errorCode = iCallHandling.GetCallInfo( *iCallInfo, aCallId );
+    
+    if ( errorCode == ECCPErrorNone )
+        {
+        TPEState callState;
+        callState = iCallHandling.GetCallState( aCallId );
+        TPECallType callType;
+		callType = iDataStore.CallType( aCallId );
+
+	    errorCode = ECCPErrorNotFound;
+	            
+        if ( EPEStateIdle == callState 
+             && EPECallTypeCSVoice == callType )
+            {
+            SetPhoneNumberForCallLogging( aCallId );
+            
+            errorCode = UpdateClientInfo( aCallId );       
+            
+            // Calls have to log also without a contact (ECCPErrorNotFound).
+            if ( errorCode == ECCPErrorNone || errorCode == ECCPErrorNotFound )
+                {
+                // Save the rest of information to EngineInfo.
+                SetLoggingInfo( aCallId, callState );
+                errorCode = iLogHandling.SaveCallEntry( aCallId );
+                }
+            }
+        }
+    return errorCode;
+    }
 //  End of File  
--- a/phoneengine/phonemodel/src/cpephonemodel.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneengine/phonemodel/src/cpephonemodel.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -428,6 +428,8 @@
             return MESSAGE("EPEMessageInitiatedEmergencyCall");
         case MEngineMonitor::EPEMessageInitiatedEmergencyWhileActiveVideo:
             return MESSAGE("EPEMessageInitiatedEmergencyWhileActiveVideo");
+        case MEngineMonitor::EPEMessageInitiatedMoCall:
+            return MESSAGE("EPEMessageInitiatedMoCall");
         case MEngineMonitor::EPEMessagePacketNetworkDetached:
             return MESSAGE("EPEMessagePacketNetworkDetached");
         case MEngineMonitor::EPEMessageRemoteBusy:
@@ -980,8 +982,15 @@
 	    TPEErrorInfo errorInfo = iEngineInfo->ErrorInfo();
     	errorInfo.iCallId = aCallId;
     	errorInfo.iErrorType = EPECcp;
-        iEngineMonitor.HandleError( errorInfo );
-	    }
+
+        if ( ECCPErrorCCCallRejected == errorInfo.iErrorCode )
+            {
+            // Call direction is not set if the call was rejected before Dialing-state
+            iEngineInfo->SetCallDirection( RMobileCall::EMobileOriginated, aCallId );
+            iMessageHandler->AddSIMRejectedMoCsCallToLog( aCallId );
+            }
+    	iEngineMonitor.HandleError( errorInfo );
+  	    }
     else if ( message == MEngineMonitor::EPEMessageServiceHandlingError )
         {
         TEFLOGSTRING( 
--- a/phoneuis/BubbleManager/Src/BMBubbleManager.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/BubbleManager/Src/BMBubbleManager.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -350,8 +350,13 @@
                 BubbleLayout6::call6_windows_pane(variety));
 
             iMainPaneControl->SetRect( windowsPane.Rect() );
-            
-            DoLayoutCall4Bubbles( windowsPane.Rect() );    
+                
+            TAknLayoutRect bubblePane;        
+            bubblePane.LayoutRect( 
+                Rect(), 
+                BubbleLayout4::call4_windows_pane(variety));
+
+            DoLayoutCall4Bubbles( bubblePane.Rect() );    
             }
         else
             {
--- a/phoneuis/BubbleManager/bmcustomization/src/telbubblecallimage.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/BubbleManager/bmcustomization/src/telbubblecallimage.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -21,6 +21,24 @@
 
 // ======== LOCAL FUNCTIONS ========
 
+/**
+ * Draws rounded rect. Used for drawing frame to caller image bitmap.
+ */
+void DrawRoundRect(CWindowGc& aGC, TPoint aTopLeft, TSize aSize )
+    {   
+    const TRgb white( 255, 255, 255);
+    aGC.SetPenColor( white );
+    aGC.SetPenSize( TSize( 5, 5 ) );
+    
+    TPoint bottomRight = aTopLeft + aSize;
+    TRect decoratorRect( aTopLeft, bottomRight );
+    // Make rect litle larger so that it will be outside of the caller image, 
+    // so that bitmap's corners are hidden.
+    decoratorRect.Grow( 2, 2 ); 
+    const TSize ellipsesSize( 10, 10 );
+    aGC.DrawRoundRect( decoratorRect, ellipsesSize );
+    }
+
 // ---------------------------------------------------------------------------
 // Constructor
 // ---------------------------------------------------------------------------
@@ -219,24 +237,27 @@
 //
 EXPORT_C void CTelBubbleCallImage::Draw( const TRect& /*aRect*/ ) const
     {
-    CWindowGc& gc = SystemGc();
-    
-    TPoint topLeft = IsFullScreenImage() ? Rect().iTl : iImagePlacingArea.iTl;
-    
-    
-    if ( iImage && iMask )
+    if ( iImage ) 
         {
-        gc.BitBltMasked( topLeft + iOffset,
-                         iImage, 
-                         iSourceRect, 
-                         iMask, 
-                         EFalse );
-        }
-    else if ( iImage )
-        {
-        gc.BitBlt( topLeft + iOffset, 
-                   iImage,
-                   iSourceRect );    
+        CWindowGc& gc = SystemGc();
+        const TPoint topLeft = IsFullScreenImage() ? Rect().iTl : iImagePlacingArea.iTl;
+        const TPoint bitmapTopLeft = topLeft + iOffset;
+       
+        if( iMask ) 
+            {
+            gc.BitBltMasked( bitmapTopLeft,
+                             iImage, 
+                             iSourceRect, 
+                             iMask, 
+                             EFalse );
+            }
+        else            
+            {
+            gc.BitBlt( bitmapTopLeft,
+                       iImage,
+                       iSourceRect );    
+            }
+        DrawRoundRect( gc, bitmapTopLeft, iSourceRect.Size() );
         }
     }
 
--- a/phoneuis/dialer/src/cdialernumberentry.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/dialer/src/cdialernumberentry.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -153,14 +153,25 @@
         
 // ---------------------------------------------------------------------------
 // CDialerNumberEntry::SetFocus
+// 
+// IsFocused() and iEditor->IsFocused() may return other values besides ETrue
+// and EFalse. This is why we need to check their return values against zero
+// and use the result in comparison against aFocus.
 // ---------------------------------------------------------------------------
 //
 void CDialerNumberEntry::SetFocus( TBool aFocus, TDrawNow aDrawNow )
     {
     DIALER_PRINT("numberentry::SetFocus<");
     
-    CCoeControl::SetFocus( aFocus, aDrawNow );
-    iEditor->SetFocus( aFocus );
+    if ( aFocus != ( IsFocused() ? ETrue : EFalse ) )
+        {
+        CCoeControl::SetFocus( aFocus, aDrawNow );
+        }
+    
+    if ( aFocus != ( iEditor->IsFocused() ? ETrue : EFalse ) )
+        {
+        iEditor->SetFocus( aFocus );
+        }
     
     DIALER_PRINT("numberentry::SetFocus>");
     }
--- a/phoneuis/easydialing/inc/easydialinglistbox.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/inc/easydialinglistbox.h	Mon Jul 12 15:53:34 2010 +0100
@@ -148,10 +148,11 @@
     TInt CurrentContactDataIndex();
     
     /**
-     * Return contact link of current item packaged in HBufC object. 
-     * @return  Contact link.
+     * Return contact link of current item packaged in HBufC object. If no item is
+	 * selected in listbox returns NULL.
+     * @return  Contact link. Ownership is transferred to the caller.
      */
-    HBufC8* CurrentContactLinkLC();
+    HBufC8* CurrentContactLinkL();
     
 public:
     /**
@@ -185,7 +186,7 @@
     
     /** Background control context. Owned. */
     CAknsFrameBackgroundControlContext* iBGContext;
-        
+    
     /** Pointer to a contact data manager; Not Own. */
     CEasyDialingContactDataManager* iContactDataManager;
     
--- a/phoneuis/easydialing/inc/easydialinglistboxdata.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/inc/easydialinglistboxdata.h	Mon Jul 12 15:53:34 2010 +0100
@@ -62,20 +62,15 @@
     
     
     /**
-    * Constructor.
-    */
-    CEasyDialingListBoxData();
-       
-    /**
      * Destructor
      */
     ~CEasyDialingListBoxData();
        
     /**
-    * Second phase constructor of the class.
+    * Two phased constructor of the class.
     * @return   Pointer to the instance. 
     */
-    static CEasyDialingListBoxData* NewL();
+    static CEasyDialingListBoxData* NewL( CCoeEnv& aCoeEnv );
      
     /**
     * Draws selected item.
@@ -100,7 +95,7 @@
     * @param    aContactDataManager Contact data manager.
     */
     void SetContactDataManager( CEasyDialingContactDataManager* aContactDataManager );
-
+    
     /**
     * Sets a pointer to listbox class. Called from listbox constructor.
     * @param    aControl    Pointer to easy dialing listbox cotrol.
@@ -114,6 +109,14 @@
     
 protected:
         
+    /**
+    * C++ Constructor
+    */
+    CEasyDialingListBoxData( CCoeEnv& aCoeEnv );
+    
+    /**
+     * Second phase constructor 
+     */
     void ConstructLD();
    
 private:
@@ -150,7 +153,7 @@
         const TRect& aItemRect,
         TBool aHighlight,
         const TExtendedColors& aColors ) const;
-
+    
     /**
      * Draws the Contact Thumbnail Icon if any else draws the dummy contact thumbnail.
      * @param   aGc Graphics context.
@@ -174,7 +177,7 @@
      * must be unmirrored, because the mirroring is done as the last thing
      * before drawing.
      * @param   aGc Graphics context.
-     * @param   aNameRectUnMirrored Name rect, where fav star is contained
+     * @param   aNameRectUnMirrored Name rect, after which the icon is drawn
      * @param   aEffectiveRect The whole listbox item rect. Used for mirroring.
      */
     void DrawFavouriteIcon(
@@ -184,6 +187,9 @@
     
 private:
     
+    /** Control environment */
+    CCoeEnv& iCoeEnv;
+    
     /** Font to be used showing contact name. Not owned. */
     CFont* iContactNameFont;
     
@@ -198,10 +204,10 @@
     
     /** Action Menu RightPointing Arrow. Owned. */
     CGulIcon* iArrowPointingLeft;
-
+    
     /** Action icon color bitmap. Owned. */
     CFbsBitmap* iColorBitmap;
-
+    
     /** Default image for contacts with no own thumbnail. Owned. */
     CGulIcon* iDummyThumbnail;
     
--- a/phoneuis/easydialing/inc/easydialingplugin.h	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/inc/easydialingplugin.h	Mon Jul 12 15:53:34 2010 +0100
@@ -30,9 +30,6 @@
 #include "medcontactorobserver.h"
 #include "easydialingcontactdatamanager.h"  // for TNameOrder
 
-// Phonebook engine API
-#include <MVPbkContactStoreListObserver.h>
-
 // ListBox Observer API
 #include <eiklbo.h>
 
@@ -78,7 +75,6 @@
 * Easy dialing plugin.
 */
 class CEasyDialingPlugin : public CDialingExtensionInterface,
-                           public MVPbkContactStoreListObserver,
                            public MPsResultsObserver,
                            public MCCAObserver,
                            public MEasyDialingCenrepListenerObserver,
@@ -220,27 +216,6 @@
 public:
 
     /**
-     * From MVPbkContactStoreListObserver.
-     */
-    void StoreReady(MVPbkContactStore& aContactStore);
-    
-    /**
-     * From MVPbkContactStoreListObserver.
-     */
-    void StoreUnavailable(MVPbkContactStore& aContactStore, TInt aReason);
-    
-    /**
-     * From MVPbkContactStoreListObserver.
-     */
-    void HandleStoreEventL( MVPbkContactStore& aContactStore, 
-                            TVPbkContactStoreEvent aStoreEvent);
-    
-    /**
-     * From MVPbkContactStoreListObserver.
-     */
-    void OpenComplete();
-    
-    /**
     * From MEasyDialingCenrepListenerObserver.
     */
     void EasyDialingSettingsChanged( TInt aValue );
@@ -446,6 +421,11 @@
      */  
     void SetInfoLabelColourL();
     
+    /**
+     * Sets info label visibility.
+     */  
+    void SetInfoLabelVisibleL( TBool aVisible );
+    
 private:
 
     /** Textual version of current search string. */
--- a/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -610,15 +610,12 @@
     {
     LOGSTRING( "CEasyDialingContactDataManager: ContactLinkLC" );
 
-    if( aIndex >= 0 )
+    if ( aIndex < 0 || aIndex >= iContactDataArray.Count() )
         {
-        // If the parsed index is valid, return the availability.
-        return iContactDataArray[ aIndex ]->ContactLink()->PackLC();
+        User::Leave( KErrArgument );
         }
-    else 
-        {
-        return NULL; 
-        }
+    
+    return iContactDataArray[ aIndex ]->ContactLink()->PackLC();
     }
 
 
--- a/phoneuis/easydialing/src/easydialinglistbox.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/src/easydialinglistbox.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -98,7 +98,7 @@
 //
 CEasyDialingListBox::~CEasyDialingListBox()
     {
-    delete iBGContext;    
+    delete iBGContext;
     delete iLongTapDetector;
     }
 
@@ -121,7 +121,7 @@
     
     iBGContext = CAknsFrameBackgroundControlContext::NewL( KAknsIIDQsnFrPopupSub,
             Rect(), Rect(), EFalse );
-       
+    
     // ContactDataManager is accessed from SizeChanged. If list item size
     // changes -> thumbnail size changes
     iContactDataManager = aContactDataManager;
@@ -178,7 +178,7 @@
 //
 void CEasyDialingListBox::CreateItemDrawerL()
     {
-    CEasyDialingListBoxData* celldata = CEasyDialingListBoxData::NewL();
+    CEasyDialingListBoxData* celldata = CEasyDialingListBoxData::NewL( *iEikonEnv );
     CleanupStack::PushL( celldata );
     iItemDrawer = new(ELeave) CEasyDialingListBoxItemDrawer(Model(), iEikonEnv->NormalFont(), celldata);
     CleanupStack::Pop( celldata );  
@@ -491,14 +491,23 @@
 
 
 // -----------------------------------------------------------------------------
-// CurrentContactLinkLC
+// CurrentContactLinkL
 // 
 // -----------------------------------------------------------------------------
 //
-HBufC8* CEasyDialingListBox::CurrentContactLinkLC()
+HBufC8* CEasyDialingListBox::CurrentContactLinkL()
     {
     TInt index = CurrentContactDataIndex();
-    return iContactDataManager->ContactLinkLC( index );
+    if ( index >= 0 )
+        {
+        HBufC8* packedContact = iContactDataManager->ContactLinkLC( index );
+        CleanupStack::Pop( packedContact );
+        return packedContact;
+        }
+    else
+        {
+        return NULL;
+        }
     }
 
 
@@ -533,7 +542,18 @@
         iPointerLongPressHandled = EFalse;
         }
     
-    iLongTapDetector->PointerEventL(aPointerEvent);
+    // check if pointer event is over item
+    TInt itemIndex( KErrNotFound );
+    TPoint pointerPos( aPointerEvent.iPosition );
+    TBool pointerIsOverAnItem = iView->XYPosToItemIndex( pointerPos, itemIndex );
+    
+    // long tap is started only if pointer is over an actual item
+    // (not over margin or other empty listbox area)
+    if ( pointerIsOverAnItem || aPointerEvent.iType != TPointerEvent::EButton1Down )
+        {
+        iLongTapDetector->PointerEventL(aPointerEvent);
+        }
+    
     if ( iPointerLongPressHandled )
         {
         // No further handling is made after long tap on list item
--- a/phoneuis/easydialing/src/easydialinglistboxdata.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/src/easydialinglistboxdata.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -60,14 +60,14 @@
 const TInt KContactNameFontHeightPercent = 35;
 
 // KCompanyNameFontHeightPercent is company name font height relative to list item height.
-const TInt KCompanyNameFontHeightPercent = 30;
+const TInt KCompanyNameFontHeightPercent = 28;
 
-// KTextBoundingBoxHeightPercent gives the text bounding box height in percentages 
+// KTextBoundingBoxHeightPercent gives the text bounding box height in percents
 // relative to font height. This must be over 100, or part of the text cuts off.
 const TInt KTextBoundingBoxHeightPercent = 120;
 
 // KTextPlacementPercent controls how text is placed vertically within its bounding box. 
-// The value is between 0 and 100. 0 means in top part, 50 mean in the middle, 100 means in the
+// The value is between 0 and 100. 0 means in top part, 50 means in the middle, 100 means in the
 // bottom. 
 const TInt KTextPlacementPercent = 70;
 
@@ -228,8 +228,8 @@
 // 
 // -----------------------------------------------------------------------------
 //
-CEasyDialingListBoxData::CEasyDialingListBoxData() :
-CFormattedCellListBoxData()
+CEasyDialingListBoxData::CEasyDialingListBoxData( CCoeEnv& aCoeEnv ) :
+CFormattedCellListBoxData(), iCoeEnv( aCoeEnv )
     {
     }
 
@@ -242,7 +242,7 @@
     {
     // Release fonts. ReleaseFont function can cope with null pointer
     // so we don't need to null check them.
-    CWsScreenDevice& screenDev = *( CEikonEnv::Static()->ScreenDevice() );
+    CWsScreenDevice& screenDev = *( iCoeEnv.ScreenDevice() );
     screenDev.ReleaseFont( iContactNameFont );
     screenDev.ReleaseFont( iCompanyNameFont );
     
@@ -260,9 +260,9 @@
 // 
 // -----------------------------------------------------------------------------
 //
-CEasyDialingListBoxData* CEasyDialingListBoxData::NewL()
+CEasyDialingListBoxData* CEasyDialingListBoxData::NewL( CCoeEnv& aCoeEnv )
     {
-    CEasyDialingListBoxData* self = new (ELeave) CEasyDialingListBoxData();
+    CEasyDialingListBoxData* self = new (ELeave) CEasyDialingListBoxData( aCoeEnv );
     
     CleanupStack::PushL( self );
     self->ConstructLD();
@@ -562,8 +562,8 @@
 //
 void CEasyDialingListBoxData::DrawFavouriteIcon(
         CWindowGc& aGc, 
-         TRect aNameRectUnMirrored,
-         TRect aEffectiveRect) const
+        TRect aNameRectUnMirrored,
+        TRect aEffectiveRect ) const
     {
     TRect favouriteIconBoundingBox;
 
@@ -577,7 +577,7 @@
     aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
     TRect sourceRect( TPoint(0,0), favouriteIconBoundingBox.Size() );
 
-    if( AknsUtils::SkinInstance()->GetCachedItemData(KAknsIIDQgnFsContactsFavorite) )
+    if ( AknsUtils::SkinInstance()->GetCachedItemData(KAknsIIDQgnFsContactsFavorite) )
         {
         AknsDrawUtils::DrawCachedImage( AknsUtils::SkinInstance(), aGc, sourceRect, 
                 KAknsIIDQgnFsContactsFavorite );
@@ -587,8 +587,8 @@
         // Set size for the bitmap and mask
         AknIconUtils::SetSize( iFavouriteIcon->Bitmap(), favouriteIconBoundingBox.Size() );
         AknIconUtils::SetSize( iFavouriteIcon->Mask(), favouriteIconBoundingBox.Size() );
-        aGc.BitBltMasked( favouriteIconBoundingBox.iTl , iFavouriteIcon->Bitmap(), 
-                sourceRect, iFavouriteIcon->Mask(), ETrue);
+        aGc.BitBltMasked( favouriteIconBoundingBox.iTl, iFavouriteIcon->Bitmap(), 
+                sourceRect, iFavouriteIcon->Mask(), ETrue );
         }
     }
 // -----------------------------------------------------------------------------
@@ -625,7 +625,7 @@
 //
 void CEasyDialingListBoxData::ObtainFonts( TInt aItemHeight )
     {
-    CWsScreenDevice& screenDev = *( CEikonEnv::Static()->ScreenDevice() );
+    CWsScreenDevice& screenDev = *( iCoeEnv.ScreenDevice() );
     
     // Release previous fonts. ReleaseFont function can cope with null pointers
     // so we don't need to null check them.
@@ -1078,7 +1078,7 @@
     aGc.UseFont( aFont );
     aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
 
-    while ( TextUtils::ColumnText( textPiece , textPieceIndex, visualBuf, KHighlightSeparatorChar) == KErrNone ) 
+    while ( TextUtils::ColumnText( textPiece, textPieceIndex, visualBuf, KHighlightSeparatorChar) == KErrNone ) 
         {
         if (! DrawPieceOfText( aBoundingBox, xOffset, aGc, textPiece, match, aFont, aColors, aHighLight ))
             {
--- a/phoneuis/easydialing/src/easydialinglistboxitemdrawer.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/src/easydialinglistboxitemdrawer.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -123,8 +123,6 @@
         transApi->StopDrawing();
         }
 
-//    TBool removeicon = (!aItemIsSelected && !ItemMarkReverse()) || (aItemIsSelected && ItemMarkReverse());
-
     CEasyDialingListBoxData::TExtendedColors colors;
     colors.iText = iTextColor;
     colors.iBack = iBackColor;
--- a/phoneuis/easydialing/src/easydialingplugin.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/easydialing/src/easydialingplugin.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -61,10 +61,6 @@
 // Service provider settings api
 #include <spsettingsvoiputils.h>
 
-// AIW header files
-#include <AiwContactAssignDataTypes.h>
-#include <AiwContactSelectionDataTypes.h>
-
 #include <StringLoader.h>
 
 // CCA contactor service.
@@ -136,7 +132,7 @@
 
 TBool IsStrictlyBidirectional( const TDesC& aText );
 
-static HBufC* AllocWithoutHighlightSeparatorsLC( TDesC& aDesc );
+static HBufC* AllocWithoutHighlightSeparatorsLC( const TDesC& aDesc );
 
 static TBool IsItuTCharacter( TChar aChar );
 
@@ -195,9 +191,6 @@
     iContactStoreUriArray->AppendL( TVPbkContactStoreUriPtr( VPbkContactStoreUris::DefaultCntDbUri() ) );
     iContactManager = CVPbkContactManager::NewL( *iContactStoreUriArray );
     
-    // Set contact store observer to listen to contact store events.
-    iContactManager->ContactStoresL().OpenAllL( *this );
-    
     iContactDataManager = new (ELeave) CEasyDialingContactDataManager(iContactManager);
     iContactDataManager->ConstructL();
     iContactDataManager->SetObserver(this);
@@ -246,11 +239,6 @@
     {
     iObservers.Reset();
     
-    if ( iContactManager )
-        {
-        TRAP_IGNORE( iContactManager->ContactStoresL().CloseAll( *this ) );
-        }
-
     delete iCenrepListener;
     delete iContactDataManager;
     delete iPredictiveSearchQuery;
@@ -258,7 +246,7 @@
     delete iContactStoreUriArray;
     iContactDataStores.ResetAndDestroy();
 
-    if (iPredictiveContactSearchHandler)
+    if ( iPredictiveContactSearchHandler )
         {
         iPredictiveContactSearchHandler->RemoveObserver(this);
         }
@@ -278,7 +266,7 @@
 
     delete iContactListBox;
 
-    if (iContactLauncher)
+    if ( iContactLauncher )
         {
         iContactLauncher->Close();
         }
@@ -719,7 +707,7 @@
 void CEasyDialingPlugin::FocusChanged( TDrawNow aDrawNow )
     {
     iContactListBox->SetFocus( IsFocused() );
-    if( !IsFocused() )
+    if ( !IsFocused() )
         {
         // To be on the safe side, cancel async callback and reset input block.
         CancelActionLaunchAndInputBlock();
@@ -763,18 +751,12 @@
         // However if user empties number entry, then it's feasible to show
         // effect.
         HideContactListBoxWithEffect();
-        iInfoLabelLine1->SetTextL( *iInfoLabelTextLine1 );
-        iInfoLabelLine2->SetTextL( *iInfoLabelTextLine2 );
-        iInfoLabelLine1->DrawDeferred();
-        iInfoLabelLine2->DrawDeferred();
+        SetInfoLabelVisibleL( ETrue );
         Reset();
         }
     else // proper search string
         {
-        iInfoLabelLine1->SetTextL( KNullDesC );
-        iInfoLabelLine2->SetTextL( KNullDesC );
-        iInfoLabelLine1->DrawDeferred();
-        iInfoLabelLine2->DrawDeferred();
+        SetInfoLabelVisibleL( EFalse );
         iSearchString.Copy( aSearchString.Left( iSearchString.MaxLength() ) );
         LaunchSearchL();
         }
@@ -793,69 +775,6 @@
 
 
 // -----------------------------------------------------------------------------
-// CEasyDialingPlugin::StoreReady
-// From MVPbkContactStoreListObserver.
-//
-// -----------------------------------------------------------------------------
-//
-void CEasyDialingPlugin::StoreReady(MVPbkContactStore& /* aContactStore */)
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEasyDialingPlugin::StoreUnavailable
-// From MVPbkContactStoreListObserver.
-//
-// -----------------------------------------------------------------------------
-//
-void CEasyDialingPlugin::StoreUnavailable(MVPbkContactStore& /* aContactStore */, TInt /* aReason */)
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CEasyDialingPlugin::HandleStoreEventL
-// From MVPbkContactStoreListObserver.
-//
-// -----------------------------------------------------------------------------
-//
-void CEasyDialingPlugin::HandleStoreEventL( MVPbkContactStore& /* aContactStore */, 
-                        TVPbkContactStoreEvent aStoreEvent)
-    {
-    // Store's observers are informed one by one using active object so one shouldn't
-    // perform search syncronously as one must try to ensure that PCS has had a
-    // chance to update its store. However there seems to be no way to be
-    // 100% sure that PCS is up-to-date when search is launched: telephony app
-    // has such a high priority and there are no APIs to query PCS' status.
-    switch ( aStoreEvent.iEventType )
-        {
-        case TVPbkContactStoreEvent::EContactAdded:
-        case TVPbkContactStoreEvent::EContactDeleted:
-        case TVPbkContactStoreEvent::EContactChanged:
-            {
-            DoHandleContactsChangedL();
-            }
-            break;
-       
-        default:
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CEasyDialingPlugin::OpenComplete
-// From MVPbkContactStoreListObserver.
-//
-// -----------------------------------------------------------------------------
-//
-void CEasyDialingPlugin::OpenComplete()
-    {
-    }
-
-// -----------------------------------------------------------------------------
 // EasyDialingSettingsChanged
 // From MEasyDialingCenrepListenerObserver
 // -----------------------------------------------------------------------------
@@ -866,10 +785,15 @@
         {
         Reset();
         InformObservers( MDialingExtensionObserver::EEasyDialingDisabled );
+        TRAP_IGNORE( SetInfoLabelVisibleL( EFalse ) );
         }
     else if ( aValue == 1 )
         {
         InformObservers( MDialingExtensionObserver::EEasyDialingEnabled );
+        if ( iSearchString.Length() == 0 )
+            {
+            TRAP_IGNORE( SetInfoLabelVisibleL( ETrue ) );
+            }
         }
     MakeVisible( aValue );
     }
@@ -906,6 +830,8 @@
     if ( iPredictiveContactSearchHandler )
         {
         TRAP_IGNORE( SetSortOrderL( iContactDataManager->NameOrder() ) );
+        // Refresh current results if needed
+        TRAP_IGNORE( DoHandleContactsChangedL() );
         }
     }
 
@@ -926,7 +852,6 @@
 //
 void CEasyDialingPlugin::InformContactorEvent( MEDContactorObserver::TEvent aEvent )
     {
-
     // This callback function simply propagates the events to its own listener.
     switch ( aEvent )
         {
@@ -958,7 +883,6 @@
 //
 void CEasyDialingPlugin::Draw( const TRect& /* aRect */ ) const
     {
-    return;
     }
 
 
@@ -1054,6 +978,18 @@
 void CEasyDialingPlugin::CachingStatus( TCachingStatus& aStatus, TInt& aError )
     {
     OstTraceExt2( TRACE_NORMAL, CEASYDIALINGPLUGIN_CACHINGSTATUS, "PCS CachingStatus: %d, error: %d", ( TUint )( aStatus ), aError );
+    
+    switch ( aStatus )
+        {
+        case ECacheUpdateContactRemoved:
+        case ECacheUpdateContactModified:
+        case ECacheUpdateContactAdded:
+            TRAP_IGNORE( DoHandleContactsChangedL() );
+            break;
+        default:
+            break;
+        }
+    
     LOGSTRING2("EasyDialingPlugin: PCS CachingStatus: %d, error: %d", aStatus, aError );
     }
 
@@ -1255,17 +1191,6 @@
 
     CAknAppUi* appUi = static_cast<CAknAppUi*>( iCoeEnv->AppUi() );
     appUi->HandleCommandL( EPhoneCmdBlockingDialogClosed );
-    
-    // If contacts have been edited during contact launcher being open, a new search
-    // needs to be done.
-    if ( iNewSearchNeeded )
-        {
-        // The cached information in contact data manager may be outdated. Call to reload makes sure that when the 
-        // search is made, all data is loaded again.
-        iContactDataManager->Reload();
-        
-        LaunchSearchL();
-        }
 
     // Give up focus, if iRememberFocus flag is not set.
     if ( !iRememberFocus )
@@ -1730,8 +1655,14 @@
         {
         // Need to save current contact link and name. Listbox current item
         // index might not be correct when callback is handled.
-        iContactToBeLaunched = iContactListBox->CurrentContactLinkLC();
-        CleanupStack::Pop( iContactToBeLaunched );
+        TRAPD( err, iContactToBeLaunched = iContactListBox->CurrentContactLinkL() );
+        if ( err || !iContactToBeLaunched )
+            {
+            // Can't find contact for the action - probably because listbox
+            // has lost the selection somehow. This shouldn't happen, but if it does
+            // return without trying to launch any action.
+            return;
+            }
         
         TPtrC contactString( iListBoxModel->MdcaPoint( iContactListBox->CurrentItemIndex() ) );
         TPtrC fullNameSeparators;
@@ -1986,6 +1917,14 @@
 //
 void CEasyDialingPlugin::HandleGainingForeground()
     {
+    if ( iNewSearchNeeded && IsEnabled() )
+        {
+        // The cached information in contact data manager may be outdated. Call to reload makes sure that when the 
+        // search is made, all data is loaded again.
+        iContactDataManager->Reload();
+        
+        LaunchSearchL();
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -2023,19 +1962,29 @@
 //
 void CEasyDialingPlugin::DoHandleContactsChangedL()
     {
-    if ( iSearchString.Length() > 0 )
+    if ( iSearchString.Length() > 0 && IsEnabled() )
         {
-        if ( iContactLauncherActive )
+        CAknAppUi* appUi = static_cast<CAknAppUi*>( iCoeEnv->AppUi() );
+        if ( appUi->IsForeground() )
             {
-            // Set the flag to make a search when communication launcher exits.
-            iNewSearchNeeded = ETrue;
+            // Do new search immediately, if contacts change while we are on the
+            // foreground. This can happen for example if view is switched to
+            // dialer while deletion of multiple contacts is still ongoing or if
+            // PCS takes so long to update the cache that view gets changed 
+            // before the update is ready.
+            iContactDataManager->Reload(); // to update thumbnails
+            AsyncActionLaunchL( ELaunchSearch );
             }
         else
             {
-            // We get here if user e.g. leaves dialer open and goes to Contacts
-            // application and does some editing.
-            iContactDataManager->Reload(); // to update thumbnails
-            AsyncActionLaunchL( ELaunchSearch );
+            // Set the flag to make a search when we come back to foreground.
+            // This way, we don't make unnecessary searches when several
+            // contacts are imported or deleted, for example.
+            iNewSearchNeeded = ETrue;
+            
+            // Hide previous results so that they won't show up before the
+            // the new search is ready.
+            iContactListBox->MakeVisible( EFalse );
             }
         }
     }
@@ -2129,6 +2078,26 @@
         }    
     }
 
+// -----------------------------------------------------------------------------
+// CEasyDialingPlugin::SetInfoLabelVisibleL
+// -----------------------------------------------------------------------------
+//
+void CEasyDialingPlugin::SetInfoLabelVisibleL( TBool aVisible )
+    {
+    if ( aVisible )
+        {
+        iInfoLabelLine1->SetTextL( *iInfoLabelTextLine1 );
+        iInfoLabelLine2->SetTextL( *iInfoLabelTextLine2 );
+        }
+    else
+        {
+        iInfoLabelLine1->SetTextL( KNullDesC );
+        iInfoLabelLine2->SetTextL( KNullDesC );
+        }    
+    iInfoLabelLine1->DrawDeferred();
+    iInfoLabelLine2->DrawDeferred();
+    }
+
 
 /*
  * ==============================================================================
@@ -2319,7 +2288,7 @@
 // removed.
 // -----------------------------------------------------------------------------
 //
-static HBufC* AllocWithoutHighlightSeparatorsLC( TDesC& aDesc )
+static HBufC* AllocWithoutHighlightSeparatorsLC( const TDesC& aDesc )
     {
     HBufC* resultDesc = aDesc.AllocLC();
     TPtr ptr = resultDesc->Des();
--- a/phoneuis/vmbx/src/VmAppUi.cpp	Fri May 28 11:56:00 2010 +0100
+++ b/phoneuis/vmbx/src/VmAppUi.cpp	Mon Jul 12 15:53:34 2010 +0100
@@ -154,26 +154,16 @@
 
     iTextExit = iEikonEnv->AllocReadResourceL( R_MENU_EXIT );
 
-    if ( !iAppContainer->IsVideoSupported() )
+    if ( !IsIpVoiceMailboxServices() && 
+        ( ( !iAppContainer->Number().Length() &&
+        !iAppContainer->VideoNumber().Length() ) || 
+        ( !iAppContainer->Number().Length() && 
+        !iAppContainer->IsVideoSupported() ) ) )
         {
         // If the vmbx number is not defined, query it as soon as
         // the app has been fully constructed.
-        if ( !iAppContainer->Number().Length() &&
-             !IsIpVoiceMailboxServices() )
-            {
-            // Query cs vmbx number since ip vmbx address cannot be asked
-            iAppContainer->QueryNumberL( EVmbxNotDefinedQuery );
-            }
-        }
-    else
-        {
-        if ( !iAppContainer->Number().Length() &&
-             !iAppContainer->VideoNumber().Length() &&
-             !IsIpVoiceMailboxServices() )
-            {
-            iQueryLauncher = CVmQueryLauncher::NewL( *iAppContainer, *this );
-            iAppUiState = ELauncherQueryingNumber;
-            }
+        iQueryLauncher = CVmQueryLauncher::NewL( *iAppContainer, *this );
+        iAppUiState = ELauncherQueryingNumber;
         }
 
     DrawCbaButtonsL();
FCL/sf/app/phone