# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286969482 -10800 # Node ID c26cc2a7c548ae8551eeae5e1316c47ec4526dee # Parent e30d4a1b8bad3d88dcdf2057dcc0b625d0bf3cf1 Revision: 201039 Kit: 201041 diff -r e30d4a1b8bad -r c26cc2a7c548 phone_plat/telephony_configuration_api/inc/telconfigcrkeys.h --- a/phone_plat/telephony_configuration_api/inc/telconfigcrkeys.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phone_plat/telephony_configuration_api/inc/telconfigcrkeys.h Wed Oct 13 14:31:22 2010 +0300 @@ -31,8 +31,7 @@ /** * Amount of digits to be used in contact matching. * This allows a customer to variate the amount of digits to be matched. -* Note that altough PhoneApp doesn't use this value anymore, there are other -* users for it in S60 SW. +* Legal values: 7-11. */ const TUint32 KTelMatchDigits = 0x00000001; diff -r e30d4a1b8bad -r c26cc2a7c548 phone_plat/telephony_matching_extension_api/inc/telmatchingextension.h --- a/phone_plat/telephony_matching_extension_api/inc/telmatchingextension.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phone_plat/telephony_matching_extension_api/inc/telmatchingextension.h Wed Oct 13 14:31:22 2010 +0300 @@ -69,14 +69,9 @@ * of address will be used for matching (e.g. by value 0). * If length of the address is less than value of the parameter the whole * of address will be used for matching. - * @param aAllowUserNameMatch - ETrue on return if matching using the user name part of - * the address is allowed. * @return - Return KErrNone if operation succeed. */ - virtual TInt GetAddressForMatching( - RBuf& aParsedAddress, - TInt& aMeaningfulDigits, - TBool& aAllowUserNameMatch ) = 0; + virtual TInt GetAddressForMatching( RBuf& aParsedAddress, TInt& aMeaningfulDigits ) = 0; /** * Returns contact store uris which are opened and will be used for matching. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneui/group/bld.inf --- a/phoneapp/phoneui/group/bld.inf Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneui/group/bld.inf Wed Oct 13 14:31:22 2010 +0300 @@ -50,7 +50,7 @@ ../loc/phone.loc APP_LAYER_LOC_EXPORT_PATH(phone.loc) ../loc/voip.loc APP_LAYER_LOC_EXPORT_PATH(voip.loc) ../loc/dialer.loc APP_LAYER_LOC_EXPORT_PATH(dialer.loc) -../loc/variedcallhandling.loc APP_LAYER_LOC_EXPORT_PATH(variedcallhandling.loc) + PRJ_EXTENSIONS START EXTENSION s60/mifconv diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneui/help/data/xhtml.zip Binary file phoneapp/phoneui/help/data/xhtml.zip has changed diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneui/loc/incalloperations.loc --- a/phoneapp/phoneui/loc/incalloperations.loc Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneui/loc/incalloperations.loc Wed Oct 13 14:31:22 2010 +0300 @@ -541,13 +541,6 @@ // #define qtn_incal_tooltip_handset "Activate handset" -// d: Tooltip text for callhandling toolbar 'BT handsfree' button. -// l: popup_preview_text_window_t1 -// w: -// r: 9.2 -// -#define qtn_incal_tooltip_bt_handsfree "Activate BT handsfree" - // d: Tooltip text for callhandling toolbar 'Mute' button. // l: popup_preview_text_window_t1 // w: diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneui/loc/variedcallhandling.loc --- a/phoneapp/phoneui/loc/variedcallhandling.loc Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,225 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* This is a localisation file for Phone -* A .loc file is the one and only place where the logical strings -* to be localised are defined. -* -*/ - - -// LOCALISATION STRINGS - - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCUnassignedNumber. -// l: popup_note_window -// w: -// -#define qtn_var_cause_1 "Dialled number is unavailable -01-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCNoRouteToDestination. -// l: popup_note_window -// w: -// -#define qtn_var_cause_3 "Unavailable -03-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCOperatorDeterminedBarring. -// l: popup_note_window -// w: -// -#define qtn_var_cause_8 "Unavailable -08-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCUserBusy. -// l: popup_note_window -// w: -// -#define qtn_var_cause_17 "User busy" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCUserNotResponding. -// l: popup_note_window -// w: -// -#define qtn_var_cause_18 "No answer -18-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCCallRejected. -// l: popup_note_window -// w: -// -#define qtn_var_cause_21 "Unavailable -21-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCNumberChanged. -// l: popup_note_window -// w: -// -#define qtn_var_cause_22 "Dialled number is unavailable -22-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCDestinationOutOfOrder. -// l: popup_note_window -// w: -// -#define qtn_var_cause_27 "Unavailable -27-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCFacilityRejected. -// l: popup_note_window -// w: -// -#define qtn_var_cause_29 "Call ended -29-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCNetworkOutOfOrder. -// l: popup_note_window -// w: -// -#define qtn_var_cause_38 "Call ended -38-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCTemporaryFailure. -// l: popup_note_window -// w: -// -#define qtn_var_cause_41 "Call ended -41-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCSwitchingEquipmentCongestion. -// l: popup_note_window -// w: -// -#define qtn_var_cause_42 "Call ended -42-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCAccessInformationDiscarded. -// l: popup_note_window -// w: -// -#define qtn_var_cause_43 "Call ended -43-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCRequestedChannelNotAvailable. -// l: popup_note_window -// w: -// -#define qtn_var_cause_44 "Call ended -44-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCResourceNotAvailable. -// l: popup_note_window -// w: -// -#define qtn_var_cause_47 "Call ended -47-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCIncomingCallsBarredInCug. -// l: popup_note_window -// w: -// -#define qtn_var_cause_55 "Call ended -55-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCBearerCapabilityNotAuthorised. -// l: popup_note_window -// w: -// -#define qtn_var_cause_57 "Call ended -57-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCServiceNotAvailable. -// l: popup_note_window -// w: -// -#define qtn_var_cause_63 "Call ended -63-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCBearerServiceNotImplemented. -// l: popup_note_window -// w: -// -#define qtn_var_cause_65 "Call ended -65-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCRequestedFacilityNotImplemented. -// l: popup_note_window -// w: -// -#define qtn_var_cause_69 "Call ended -69-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCUserNotInCug. -// l: popup_note_window -// w: -// -#define qtn_var_cause_87 "Call ended -87-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCIncompatibleDestination. -// l: popup_note_window -// w: -// -#define qtn_var_cause_88 "Call ended -88-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCSemanticallyIncorrectMessage. -// l: popup_note_window -// w: -// -#define qtn_var_cause_95 "Call ended -95-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCUnspecifiedProtocolError. -// l: popup_note_window -// w: -// -#define qtn_var_cause_111 "Call ended -111-" - -// d: It is used in varied error note when -// d: call termination cause is KErrGsmCCUnspecifiedInterworkingError. -// l: popup_note_window -// w: -// -#define qtn_var_cause_127 "Call ended -127-" - -// d: It is used in varied error note -// l: popup_note_window -// w: -// -#define qtn_var_number_unassigned_param "Dialled number is unavailable -%d-" - -// d: It is used in varied error note -// l: popup_note_window -// w: -// -#define qtn_var_unavailable_param "Unavailable -%d-" - -// d: It is used in varied error note -// l: popup_note_window -// w: -// -#define qtn_var_no_answer_param "No answer -%d-" - -// d: It is used in varied error note -// l: popup_note_window -// w: -// -#define qtn_var_call_ended_param "Call ended -%d-" - - - diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneui/srcdata/phoneui.rss --- a/phoneapp/phoneui/srcdata/phoneui.rss Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneui/srcdata/phoneui.rss Wed Oct 13 14:31:22 2010 +0300 @@ -48,7 +48,6 @@ #include #include #include -#include #include @@ -152,6 +151,19 @@ } +// --------------------------------------------------------- +// +// r_phone_incall_muted_pane +// +// --------------------------------------------------------- +// +RESOURCE TBUF64 r_phone_incall_muted_pane + { + buf = qtn_incal_muted_pane; + } + + + // ---------------------------------------------------------------- // // r_phoneui_idle_menubar @@ -7581,17 +7593,6 @@ // ---------------------------------------------------------------- // -// r_phoneui_tooltip_bt_handsfree -// -// ---------------------------------------------------------------- -// -RESOURCE TBUF r_phoneui_tooltip_bt_handsfree - { - buf = qtn_incal_tooltip_bt_handsfree; - } - -// ---------------------------------------------------------------- -// // r_phoneui_tooltip_mute // // ---------------------------------------------------------------- @@ -7637,10 +7638,6 @@ MENU_TITLE { menu_pane = r_phoneuidialer_options_menu; - }, - MENU_TITLE - { - menu_pane = r_phoneui_numberacq_options_call_menu; } }; } @@ -7699,6 +7696,12 @@ }, MENU_ITEM { + command = EPhoneNumberAcqCmdCall; + cascade = r_phoneui_numberacq_options_call_menu; + txt = text_number_call; + }, + MENU_ITEM + { command = EPhoneNumberAcqCmdSendMessage; txt = qtn_nren_send_message; }, @@ -8184,322 +8187,5 @@ buf = qtn_called_number_has_barred_incoming_calls; } -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_1 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_1 - { - buf = qtn_var_cause_1; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_3 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_3 - { - buf = qtn_var_cause_3; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_8 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_8 - { - buf = qtn_var_cause_8; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_17 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_17 - { - buf = qtn_var_cause_17; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_18 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_18 - { - buf = qtn_var_cause_18; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_21 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_21 - { - buf = qtn_var_cause_21; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_22 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_22 - { - buf = qtn_var_cause_22; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_27 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_27 - { - buf = qtn_var_cause_27; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_29 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_29 - { - buf = qtn_var_cause_29; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_38 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_38 - { - buf = qtn_var_cause_38; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_41 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_41 - { - buf = qtn_var_cause_41; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_42 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_42 - { - buf = qtn_var_cause_42; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_43 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_43 - { - buf = qtn_var_cause_43; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_44 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_44 - { - buf = qtn_var_cause_44; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_47 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_47 - { - buf = qtn_var_cause_47; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_55 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_55 - { - buf = qtn_var_cause_55; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_57 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_57 - { - buf = qtn_var_cause_57; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_63 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_63 - { - buf = qtn_var_cause_63; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_65 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_65 - { - buf = qtn_var_cause_65; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_69 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_69 - { - buf = qtn_var_cause_69; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_87 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_87 - { - buf = qtn_var_cause_87; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_88 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_88 - { - buf = qtn_var_cause_88; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_95 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_95 - { - buf = qtn_var_cause_95; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_111 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_111 - { - buf = qtn_var_cause_111; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_cause_127 -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_cause_127 - { - buf = qtn_var_cause_127; - } -// ----------------------------------------------------------------------------- -// -// r_note_var_number_unassigned_param -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_number_unassigned_param - { - buf = qtn_var_number_unassigned_param; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_unavailable_param -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_unavailable_param - { - buf = qtn_var_unavailable_param; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_no_answer_param -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_no_answer_param - { - buf = qtn_var_no_answer_param; - } - -// ----------------------------------------------------------------------------- -// -// r_note_var_call_ended_param -// -// ----------------------------------------------------------------------------- -// -RESOURCE TBUF r_note_var_call_ended_param - { - buf = qtn_var_call_ended_param; - } //########################################################## // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def --- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Wed Oct 13 14:31:22 2010 +0300 @@ -3,249 +3,245 @@ ?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) - ?CloseClearNumberEntryAndLoadEffectL@CPhoneState@@QAEXW4TPhoneTransEffectType@@@Z @ 5 NONAME ; void CPhoneState::CloseClearNumberEntryAndLoadEffectL(enum TPhoneTransEffectType) - ?SetContextMenuL@CPhoneState@@MAEXH@Z @ 6 NONAME ; void CPhoneState::SetContextMenuL(int) - ?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 7 NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &) - ?DisconnectCallL@CPhoneState@@MAEXXZ @ 8 NONAME ; void CPhoneState::DisconnectCallL(void) - ?SetCbaL@CPhoneCbaManager@@QAEXH@Z @ 9 NONAME ; void CPhoneCbaManager::SetCbaL(int) - ?InstanceL@CPhoneReconnectQuery@@SAPAV1@XZ @ 10 NONAME ; class CPhoneReconnectQuery * CPhoneReconnectQuery::InstanceL(void) - ?HandlePhoneStartupL@CPhoneState@@UAEXXZ @ 11 NONAME ; void CPhoneState::HandlePhoneStartupL(void) - ?HandlePhoneFocusLostEventL@CPhoneStateIdle@@UAEXXZ @ 12 NONAME ; void CPhoneStateIdle::HandlePhoneFocusLostEventL(void) - ?HandleIdleL@CPhoneStateInCall@@IAEXH@Z @ 13 NONAME ; void CPhoneStateInCall::HandleIdleL(int) - ?EndTransEffect@TPhoneTransitionHandler@@QAEXXZ @ 14 NONAME ; void TPhoneTransitionHandler::EndTransEffect(void) - ?ShowQueryL@CPhoneState@@IAEXH@Z @ 15 NONAME ; void CPhoneState::ShowQueryL(int) - ?PhoneNumberAvailableInPhoneEngineL@CPhoneStateInCall@@IAEXH@Z @ 16 NONAME ; void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL(int) - ?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 17 NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void) - ??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 18 NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?HandleNumberLongKeyPressL@CPhoneStateIdle@@IAEXXZ @ 19 NONAME ; void CPhoneStateIdle::HandleNumberLongKeyPressL(void) - ?HandlePropertyChangedL@CPhoneStateMachine@@UAEXABVTUid@@IH@Z @ 20 NONAME ; void CPhoneStateMachine::HandlePropertyChangedL(class TUid const &, unsigned int, int) - ?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 21 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void) - ?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 22 NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void) - ??1CPhoneStateCallSetup@@UAE@XZ @ 23 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void) - ?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 24 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int) - ?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 25 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void) - ?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 26 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void) - ?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 27 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void) - ?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 28 NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *) - ?HandleCommandL@CPhoneState@@UAEHH@Z @ 29 NONAME ; int CPhoneState::HandleCommandL(int) - ?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 30 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void) - ?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 31 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void) - ?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 32 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int) - ?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 33 NONAME ; void CPhoneStateIdle::HandleDialingL(int) - ?BeginTransEffectLC@TPhoneTransitionHandler@@QAEXW4TPhoneTransEffectType@@@Z @ 34 NONAME ; void TPhoneTransitionHandler::BeginTransEffectLC(enum TPhoneTransEffectType) - ?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 35 NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void) - ?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 36 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int) - ?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 37 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds) - ?DisplayCallSetupL@CPhoneState@@IAEXH@Z @ 38 NONAME ; void CPhoneState::DisplayCallSetupL(int) - ?RegisterStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 39 NONAME ; void CPhoneSecurityModeObserver::RegisterStateObserver(class MPhoneSecurityModeChangeObserver &) - ?DoStateSpecificCallSetUpDefinitionsL@CPhoneState@@UAEXXZ @ 40 NONAME ; void CPhoneState::DoStateSpecificCallSetUpDefinitionsL(void) - ?SetToolbarButtonHandsetEnabled@CPhoneState@@IAEXXZ @ 41 NONAME ; void CPhoneState::SetToolbarButtonHandsetEnabled(void) - ?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 42 NONAME ; void CPhoneStateMachine::ChangeState(int) - ?NewL@CPhoneUIController@@SAPAV1@AAVCPhoneViewController@@@Z @ 43 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class CPhoneViewController &) - ?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 44 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void) - ?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 45 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int) - ?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 46 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void) - ?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 47 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 48 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) - ?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 49 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void) - ?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 50 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int) - ?HandleLongHashL@CPhoneState@@UAEXXZ @ 51 NONAME ; void CPhoneState::HandleLongHashL(void) - ?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 52 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod) - ?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 53 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void) - ?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 54 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void) - ?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 55 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void) - ?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 56 NONAME ; void CPhoneState::HandleDisconnectingL(int) - ?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 57 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void) - ?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 58 NONAME ; int CPhoneStateIncoming::HandleCommandL(int) - ?EndUiUpdateAndEffect@TPhoneTransitionHandler@@QAEXXZ @ 59 NONAME ; void TPhoneTransitionHandler::EndUiUpdateAndEffect(void) - ?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 60 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int) - ?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 61 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const - ?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 62 NONAME ; enum TPESimState CPhoneState::SimState(void) const - ?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 63 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 64 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void) - ?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 65 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int) - ?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 66 NONAME ; void CPhoneState::CompleteSatRequestL(int) - ?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 67 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 68 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void) - ?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 69 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *) - ?HandlePhoneEngineMessageL@CPhoneStateMachine@@UAEXHH@Z @ 70 NONAME ; void CPhoneStateMachine::HandlePhoneEngineMessageL(int, int) - ?IsSecurityMode@CPhoneSecurityModeObserver@@UAEHXZ @ 71 NONAME ; int CPhoneSecurityModeObserver::IsSecurityMode(void) - ?IsSimOk@CPhoneState@@QAEHXZ @ 72 NONAME ; int CPhoneState::IsSimOk(void) - ?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 73 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void) - ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 74 NONAME ; int CPhoneStateIdle::HandleCommandL(int) - ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 75 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void) - ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 76 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void) - ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 77 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void) - ?IsKeyLockOn@CPhoneState@@MBEHXZ @ 78 NONAME ; int CPhoneState::IsKeyLockOn(void) const - ??1CPhoneStateInCall@@UAE@XZ @ 79 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void) - ?TransitionHandlerL@CPhoneState@@QAEAAVTPhoneTransitionHandler@@XZ @ 80 NONAME ; class TPhoneTransitionHandler & CPhoneState::TransitionHandlerL(void) - ?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 81 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void) - ?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 82 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int) - ?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 83 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void) - ?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 84 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int) - ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 85 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &) - ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 86 NONAME ; void CPhoneStateInCall::ConstructL(void) - ?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 87 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void) - ?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 88 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void) - ?IsAutolockEnabled@CPhoneSecurityModeObserver@@UAEHXZ @ 89 NONAME ; int CPhoneSecurityModeObserver::IsAutolockEnabled(void) - ?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 90 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void) - ?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 91 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void) - ?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 92 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *) - ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 93 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode) - ?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 94 NONAME ; void CPhoneState::HandleNumberEntryEdited(void) - ?EikonEnv@CPhoneStateMachine@@QBEPAVCEikonEnv@@XZ @ 95 NONAME ; class CEikonEnv * CPhoneStateMachine::EikonEnv(void) const - ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 96 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int) - ?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 97 NONAME ; void CPhoneState::DialMultimediaCallL(void) - ?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 98 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode) - ?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 99 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const - ?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 100 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &) - ?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 101 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int) - ?SecurityMode@CPhoneStateMachine@@UAEPAVMPhoneSecurityModeObserver@@XZ @ 102 NONAME ; class MPhoneSecurityModeObserver * CPhoneStateMachine::SecurityMode(void) - ?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 103 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void) - ??1CPhoneUIController@@UAE@XZ @ 104 NONAME ; CPhoneUIController::~CPhoneUIController(void) - ?ForwardPEMessageToPhoneCustomizationL@CPhoneState@@IAEHHH@Z @ 105 NONAME ; int CPhoneState::ForwardPEMessageToPhoneCustomizationL(int, int) - ?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 106 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 107 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int) - ?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 108 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void) - ?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 109 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int) - ?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 110 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int) - ?SetToolbarButtonBTHFEnabled@CPhoneState@@IAEXXZ @ 111 NONAME ; void CPhoneState::SetToolbarButtonBTHFEnabled(void) - ?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 112 NONAME ; void CPhoneStateIncoming::ConstructL(void) - ?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 113 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &) - ?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 114 NONAME ; void CPhoneState::SetTouchPaneButtons(int) - ?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 115 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void) - ?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 116 NONAME ; void CPhoneState::CallFromNumberEntryL(void) - ?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 117 NONAME ; void CPhoneCbaManager::UpdateCbaL(int) - ?IsVideoCall@CPhoneState@@IAEHH@Z @ 118 NONAME ; int CPhoneState::IsVideoCall(int) - ?IsSwivelClosed@CPhoneState@@QBEHXZ @ 119 NONAME ; int CPhoneState::IsSwivelClosed(void) const - ?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 120 NONAME ; void CPhoneState::CloseCustomizedDialerL(void) - ?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 121 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void) - ?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 122 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void) - ?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 123 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void) - ?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 124 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 125 NONAME ; void CPhoneState::SetToolbarDimming(int) - ?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 126 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int) - ?IsAutoLockOn@CPhoneState@@UBEHXZ @ 127 NONAME ; int CPhoneState::IsAutoLockOn(void) const - ?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 128 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int) - ?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 129 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void) - ?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 130 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 131 NONAME ; int CPhoneState::IsNumberEntryContentStored(void) - ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 132 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void) - ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 133 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void) - ?DialVoiceCallL@CPhoneState@@IAEXXZ @ 134 NONAME ; void CPhoneState::DialVoiceCallL(void) - ?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 135 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds) - ?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 136 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void) - ?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 137 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int) - ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 138 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) - ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 139 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int) - ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 140 NONAME ; int CPhoneState::ProcessCommandL(int) - ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 141 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void) - ?RemoveStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 142 NONAME ; void CPhoneSecurityModeObserver::RemoveStateObserver(class MPhoneSecurityModeChangeObserver &) - ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 143 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void) - ?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 144 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void) - ?IncomingCallUiUpdateLC@TPhoneTransitionHandler@@QAEXXZ @ 145 NONAME ; void TPhoneTransitionHandler::IncomingCallUiUpdateLC(void) - ?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 146 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &) - ?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 147 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *) - ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 148 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 149 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &) - ?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 150 NONAME ; void CPhoneStateInCall::UpdateCbaL(int) - ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 151 NONAME ; void CPhoneStateMachine::SetCallId(int) - ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 152 NONAME ; int CPhoneUIController::ProcessCommandL(int) - ?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 153 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int) - ??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 154 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 155 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int) - ?SetNeedToReturnToForegroundAppStatusL@CPhoneState@@IAEXH@Z @ 156 NONAME ; void CPhoneState::SetNeedToReturnToForegroundAppStatusL(int) - ??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 157 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 158 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 159 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode) - ?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 160 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) - ?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 161 NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int) - ?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 162 NONAME ; void CPhoneUIController::HandleForegroundEventL(int) - ?IdleCallUiUpdateLC@TPhoneTransitionHandler@@QAEXXZ @ 163 NONAME ; void TPhoneTransitionHandler::IdleCallUiUpdateLC(void) - ?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 164 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void) - ?DoStateSpecificCallSetUpDefinitionsL@CPhoneStateIdle@@UAEXXZ @ 165 NONAME ; void CPhoneStateIdle::DoStateSpecificCallSetUpDefinitionsL(void) - ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 166 NONAME ; int CPhoneUIController::HandleCommandL(int) - ?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 167 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode) - ?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 168 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int) - ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 169 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int) - ?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 170 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const - ?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 171 NONAME ; int CPhoneState::IsNumberEntryUsedL(void) - ??1CPhoneState@@UAE@XZ @ 172 NONAME ; CPhoneState::~CPhoneState(void) - ?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 173 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode) - ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 174 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int) - ?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 175 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void) - ?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 176 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int) - ??1CPhoneStateMachine@@UAE@XZ @ 177 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void) - ?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 178 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void) - ?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 179 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *) - ?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 180 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const - ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 181 NONAME ; void CPhoneStateCallSetup::ConstructL(void) - ?SetSecurityModeObserver@CPhoneStateMachine@@UAEXPAVMPhoneSecurityModeObserver@@@Z @ 182 NONAME ; void CPhoneStateMachine::SetSecurityModeObserver(class MPhoneSecurityModeObserver *) - ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 183 NONAME ; void CPhoneUIController::HandleMessage(int, int) - ?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 184 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &) - ?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 185 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const - ?ConstructL@CPhoneStateStartup@@MAEXXZ @ 186 NONAME ; void CPhoneStateStartup::ConstructL(void) - ?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 187 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) - ?ShowNoteL@CPhoneState@@IAEXH@Z @ 188 NONAME ; void CPhoneState::ShowNoteL(int) - ?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 189 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int) - ?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 190 NONAME ; int CPhoneState::IsAnyQueryActiveL(void) - ?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 191 NONAME ; class MPhoneState * CPhoneStateMachine::State(void) - ?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 192 NONAME ; void CPhoneState::SetHandsfreeModeL(int) - ?EndUiUpdate@TPhoneTransitionHandler@@QAEXXZ @ 193 NONAME ; void TPhoneTransitionHandler::EndUiUpdate(void) - ?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 194 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const - ?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 195 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void) - ?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 196 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void) - ??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 197 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ??1CPhoneStateIncoming@@UAE@XZ @ 198 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void) - ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 199 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void) - ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 200 NONAME ; int CPhoneStateIdle::ProcessCommandL(int) - ?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 201 NONAME ; int CPhoneState::IsNoteVisibleL(void) - ?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 202 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *) - ?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 203 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &) - ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 204 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int) - ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 205 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 206 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) - ?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 207 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void) - ?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 208 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void) - ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 209 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void) - ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 210 NONAME ; void CPhoneStateIdle::ConstructL(void) - ?SetEikonEnv@CPhoneState@@UAEXPAVCEikonEnv@@@Z @ 211 NONAME ; void CPhoneState::SetEikonEnv(class CEikonEnv *) - ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 212 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void) - ?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 213 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags) - ?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 214 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int) - ?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 215 NONAME ; void CPhoneState::DisplayIdleScreenL(void) - ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 216 NONAME ; void CPhoneState::StartShowSecurityNoteL(void) - ?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 217 NONAME ; void CPhoneState::StoreNumberEntryContentL(void) - ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 218 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int) - ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 219 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int) - ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 220 NONAME ; void CPhoneState::SetDefaultFlagsL(void) - ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 221 NONAME ; int CPhoneStateInCall::HandleCommandL(int) - ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 222 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void) - ?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 223 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int) - ?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 224 NONAME ; int CPhoneStateInCall::GetRingingCallL(void) - ?EikonEnv@CPhoneState@@QBEPAVCEikonEnv@@XZ @ 225 NONAME ; class CEikonEnv * CPhoneState::EikonEnv(void) const - ?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 226 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void) - ?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 227 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void) - ?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 228 NONAME ; void CPhoneState::HandleForegroundEventL(int) - ?BeginUiUpdateLC@TPhoneTransitionHandler@@QAEXXZ @ 229 NONAME ; void TPhoneTransitionHandler::BeginUiUpdateLC(void) - ?HandleErrorL@CPhoneStateIdle@@UAEXABUTPEErrorInfo@@@Z @ 230 NONAME ; void CPhoneStateIdle::HandleErrorL(struct TPEErrorInfo const &) - ?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 231 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int) - ?SetSecurityMessageHandler@CPhoneStateMachine@@UAEXPAVMPhoneSecurityMessageHandler@@@Z @ 232 NONAME ; void CPhoneStateMachine::SetSecurityMessageHandler(class MPhoneSecurityMessageHandler *) - ?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 233 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) - ??1CPhoneStateIdle@@UAE@XZ @ 234 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void) - ?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 235 NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const - ?Initialize@CPhoneSecurityModeObserver@@UAEXXZ @ 236 NONAME ; void CPhoneSecurityModeObserver::Initialize(void) - ?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 237 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void) - ?BaseConstructL@CPhoneState@@QAEXXZ @ 238 NONAME ; void CPhoneState::BaseConstructL(void) - ?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 239 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void) - ?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 240 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod) - ?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 241 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int) - ?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 242 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *) - ?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 243 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &) - ?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 244 NONAME ; void CPhoneState::CloseDTMFEditorL(void) - ?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 245 NONAME ; void CPhoneState::SetTouchPaneVisible(int) - ?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 246 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void) - ??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 247 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *) - ??1CPhoneStateStartup@@UAE@XZ @ 248 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void) - ?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 249 NONAME ; void CPhoneState::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) + ?DisplayCallSetupL@CPhoneState@@IAEXH@Z @ 35 NONAME ; void CPhoneState::DisplayCallSetupL(int) + ?RegisterStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 36 NONAME ; void CPhoneSecurityModeObserver::RegisterStateObserver(class MPhoneSecurityModeChangeObserver &) + ?DoStateSpecificCallSetUpDefinitionsL@CPhoneState@@UAEXXZ @ 37 NONAME ; void CPhoneState::DoStateSpecificCallSetUpDefinitionsL(void) + ?SetToolbarButtonHandsetEnabled@CPhoneState@@IAEXXZ @ 38 NONAME ; void CPhoneState::SetToolbarButtonHandsetEnabled(void) + ?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 39 NONAME ; void CPhoneStateMachine::ChangeState(int) + ?NewL@CPhoneUIController@@SAPAV1@AAVCPhoneViewController@@@Z @ 40 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class CPhoneViewController &) + ?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 41 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void) + ?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 42 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int) + ?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 43 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void) + ?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 44 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 45 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) + ?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 46 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void) + ?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 47 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int) + ?HandleLongHashL@CPhoneState@@UAEXXZ @ 48 NONAME ; void CPhoneState::HandleLongHashL(void) + ?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 49 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod) + ?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 50 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void) + ?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 51 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void) + ?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 52 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void) + ?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 53 NONAME ; void CPhoneState::HandleDisconnectingL(int) + ?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 54 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void) + ?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 55 NONAME ; int CPhoneStateIncoming::HandleCommandL(int) + ?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 56 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int) + ?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 57 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const + ?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 58 NONAME ; enum TPESimState CPhoneState::SimState(void) const + ?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 59 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 60 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void) + ?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 61 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int) + ?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 62 NONAME ; void CPhoneState::CompleteSatRequestL(int) + ?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 63 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 64 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void) + ?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 65 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *) + ?HandlePhoneEngineMessageL@CPhoneStateMachine@@UAEXHH@Z @ 66 NONAME ; void CPhoneStateMachine::HandlePhoneEngineMessageL(int, int) + ?IsSecurityMode@CPhoneSecurityModeObserver@@UAEHXZ @ 67 NONAME ; int CPhoneSecurityModeObserver::IsSecurityMode(void) + ?IsSimOk@CPhoneState@@QAEHXZ @ 68 NONAME ; int CPhoneState::IsSimOk(void) + ?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 69 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void) + ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 70 NONAME ; int CPhoneStateIdle::HandleCommandL(int) + ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 71 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void) + ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 72 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void) + ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 73 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void) + ?IsKeyLockOn@CPhoneState@@MBEHXZ @ 74 NONAME ; int CPhoneState::IsKeyLockOn(void) const + ??1CPhoneStateInCall@@UAE@XZ @ 75 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void) + ?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 76 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void) + ?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 77 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int) + ?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 78 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void) + ?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 79 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int) + ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 80 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &) + ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 81 NONAME ; void CPhoneStateInCall::ConstructL(void) + ?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 82 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void) + ?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 83 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void) + ?IsAutolockEnabled@CPhoneSecurityModeObserver@@UAEHXZ @ 84 NONAME ; int CPhoneSecurityModeObserver::IsAutolockEnabled(void) + ?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 85 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void) + ?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 86 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void) + ?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 87 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *) + ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 88 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode) + ?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 89 NONAME ; void CPhoneState::HandleNumberEntryEdited(void) + ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 90 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int) + ?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 91 NONAME ; void CPhoneState::DialMultimediaCallL(void) + ?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 92 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode) + ?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 93 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const + ?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 94 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &) + ?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 95 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int) + ?SecurityMode@CPhoneStateMachine@@UAEPAVMPhoneSecurityModeObserver@@XZ @ 96 NONAME ; class MPhoneSecurityModeObserver * CPhoneStateMachine::SecurityMode(void) + ?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 97 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void) + ??1CPhoneUIController@@UAE@XZ @ 98 NONAME ; CPhoneUIController::~CPhoneUIController(void) + ?ForwardPEMessageToPhoneCustomizationL@CPhoneState@@IAEHHH@Z @ 99 NONAME ; int CPhoneState::ForwardPEMessageToPhoneCustomizationL(int, int) + ?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 100 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 101 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int) + ?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 102 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void) + ?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 103 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int) + ?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 104 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int) + ?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 105 NONAME ; void CPhoneStateIncoming::ConstructL(void) + ?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 106 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &) + ?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 107 NONAME ; void CPhoneState::SetTouchPaneButtons(int) + ?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 108 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void) + ?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 109 NONAME ; void CPhoneState::CallFromNumberEntryL(void) + ?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 110 NONAME ; void CPhoneCbaManager::UpdateCbaL(int) + ?IsVideoCall@CPhoneState@@IAEHH@Z @ 111 NONAME ; int CPhoneState::IsVideoCall(int) + ?IsSwivelClosed@CPhoneState@@QBEHXZ @ 112 NONAME ; int CPhoneState::IsSwivelClosed(void) const + ?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 113 NONAME ; void CPhoneState::CloseCustomizedDialerL(void) + ?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 114 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void) + ?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 115 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void) + ?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 116 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void) + ?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 117 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 118 NONAME ; void CPhoneState::SetToolbarDimming(int) + ?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 119 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int) + ?IsAutoLockOn@CPhoneState@@UBEHXZ @ 120 NONAME ; int CPhoneState::IsAutoLockOn(void) const + ?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 121 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int) + ?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 122 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void) + ?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 123 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 124 NONAME ; int CPhoneState::IsNumberEntryContentStored(void) + ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 125 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void) + ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 126 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void) + ?DialVoiceCallL@CPhoneState@@IAEXXZ @ 127 NONAME ; void CPhoneState::DialVoiceCallL(void) + ?EndUiUpdate@CPhoneState@@IAEXXZ @ 128 NONAME ; void CPhoneState::EndUiUpdate(void) + ?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 129 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds) + ?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 130 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void) + ?EndTransEffect@CPhoneState@@QAEXXZ @ 131 NONAME ; void CPhoneState::EndTransEffect(void) + ?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 132 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int) + ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 133 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 134 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int) + ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 135 NONAME ; int CPhoneState::ProcessCommandL(int) + ?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 136 NONAME ; void CPhoneState::BeginUiUpdateLC(void) + ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 137 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void) + ?RemoveStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 138 NONAME ; void CPhoneSecurityModeObserver::RemoveStateObserver(class MPhoneSecurityModeChangeObserver &) + ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 139 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void) + ?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 140 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void) + ?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 141 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &) + ?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 142 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *) + ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 143 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 144 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &) + ?SetDivertIndication@CPhoneState@@UAEXH@Z @ 145 NONAME ; void CPhoneState::SetDivertIndication(int) + ?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 146 NONAME ; void CPhoneStateInCall::UpdateCbaL(int) + ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 147 NONAME ; void CPhoneStateMachine::SetCallId(int) + ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 148 NONAME ; int CPhoneUIController::ProcessCommandL(int) + ?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 149 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int) + ??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) + ?DoStateSpecificCallSetUpDefinitionsL@CPhoneStateIdle@@UAEXXZ @ 159 NONAME ; void CPhoneStateIdle::DoStateSpecificCallSetUpDefinitionsL(void) + ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 160 NONAME ; int CPhoneUIController::HandleCommandL(int) + ?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 161 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode) + ?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 162 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int) + ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 163 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int) + ?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 164 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const + ?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 165 NONAME ; int CPhoneState::IsNumberEntryUsedL(void) + ??1CPhoneState@@UAE@XZ @ 166 NONAME ; CPhoneState::~CPhoneState(void) + ?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 167 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode) + ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 168 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int) + ?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 169 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void) + ?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 170 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int) + ??1CPhoneStateMachine@@UAE@XZ @ 171 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void) + ?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 172 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void) + ?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 173 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *) + ?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 174 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const + ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 175 NONAME ; void CPhoneStateCallSetup::ConstructL(void) + ?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 176 NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType) + ?SetSecurityModeObserver@CPhoneStateMachine@@UAEXPAVMPhoneSecurityModeObserver@@@Z @ 177 NONAME ; void CPhoneStateMachine::SetSecurityModeObserver(class MPhoneSecurityModeObserver *) + ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 178 NONAME ; void CPhoneUIController::HandleMessage(int, int) + ?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 179 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &) + ?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 180 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const + ?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 *) + ??1CPhoneStateIncoming@@UAE@XZ @ 192 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void) + ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 193 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void) + ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 194 NONAME ; int CPhoneStateIdle::ProcessCommandL(int) + ?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 195 NONAME ; int CPhoneState::IsNoteVisibleL(void) + ?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 196 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *) + ?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 197 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &) + ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 198 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int) + ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 199 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 200 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode) + ?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 201 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void) + ?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 202 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void) + ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 203 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void) + ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 204 NONAME ; void CPhoneStateIdle::ConstructL(void) + ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 205 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void) + ?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 206 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags) + ?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 207 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int) + ?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 208 NONAME ; void CPhoneState::DisplayIdleScreenL(void) + ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 209 NONAME ; void CPhoneState::StartShowSecurityNoteL(void) + ?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 210 NONAME ; void CPhoneState::StoreNumberEntryContentL(void) + ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 211 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int) + ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 212 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int) + ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 213 NONAME ; void CPhoneState::SetDefaultFlagsL(void) + ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 214 NONAME ; int CPhoneStateInCall::HandleCommandL(int) + ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 215 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void) + ?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 216 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int) + ?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 217 NONAME ; int CPhoneStateInCall::GetRingingCallL(void) + ?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 218 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void) + ?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 219 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void) + ?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 220 NONAME ; void CPhoneState::HandleForegroundEventL(int) + ?CloseClearNumberEntryAndLoadEffectL@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 221 NONAME ; void CPhoneState::CloseClearNumberEntryAndLoadEffectL(enum TStateTransEffectType) + ?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) + ?EnableEikonNotifiersL@CPhoneState@@IAEXXZ @ 242 NONAME ; void CPhoneState::EnableEikonNotifiersL(void) + ?DisableGlobalNotifiersL@CPhoneState@@IAEXXZ @ 243 NONAME ; void CPhoneState::DisableGlobalNotifiersL(void) + ?EnableGlobalNotifiersL@CPhoneState@@IAEXXZ @ 244 NONAME ; void CPhoneState::EnableGlobalNotifiersL(void) + ?DisableEikonNotifiersL@CPhoneState@@IAEXXZ @ 245 NONAME ; void CPhoneState::DisableEikonNotifiersL(void) diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def --- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Wed Oct 13 14:31:22 2010 +0300 @@ -1,472 +1,480 @@ EXPORTS _ZN11CPhoneState10ShowQueryLEi @ 1 NONAME - _ZN11CPhoneState11IsVideoCallEi @ 2 NONAME - _ZN11CPhoneState11SetEikonEnvEP9CEikonEnv @ 3 NONAME + _ZN11CPhoneState11EndUiUpdateEv @ 2 NONAME + _ZN11CPhoneState11IsVideoCallEi @ 3 NONAME _ZN11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 4 NONAME _ZN11CPhoneState14BaseConstructLEv @ 5 NONAME _ZN11CPhoneState14DialVoiceCallLEv @ 6 NONAME - _ZN11CPhoneState14HandleCommandLEi @ 7 NONAME - _ZN11CPhoneState14IsNoteVisibleLEv @ 8 NONAME - _ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 9 NONAME - _ZN11CPhoneState15DisconnectCallLEv @ 10 NONAME - _ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 11 NONAME - _ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 12 NONAME - _ZN11CPhoneState15HandleLongHashLEv @ 13 NONAME - _ZN11CPhoneState15ProcessCommandLEi @ 14 NONAME - _ZN11CPhoneState15SetContextMenuLEi @ 15 NONAME - _ZN11CPhoneState16CallWaitingNoteLEi @ 16 NONAME - _ZN11CPhoneState16CloseDTMFEditorLEv @ 17 NONAME - _ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 18 NONAME - _ZN11CPhoneState16SetDefaultFlagsLEv @ 19 NONAME - _ZN11CPhoneState17DisplayCallSetupLEi @ 20 NONAME - _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 21 NONAME - _ZN11CPhoneState17IsAnyQueryActiveLEv @ 22 NONAME - _ZN11CPhoneState17SetCallHeaderTypeEN14CBubbleManager19TPhoneCallTypeFlagsE @ 23 NONAME - _ZN11CPhoneState17SetHandsfreeModeLEi @ 24 NONAME - _ZN11CPhoneState17SetToolbarDimmingEi @ 25 NONAME - _ZN11CPhoneState18DisplayIdleScreenLEv @ 26 NONAME - _ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 27 NONAME - _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 28 NONAME - _ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 29 NONAME - _ZN11CPhoneState18IsNumberEntryUsedLEv @ 30 NONAME - _ZN11CPhoneState18TransitionHandlerLEv @ 31 NONAME - _ZN11CPhoneState19CompleteSatRequestLEi @ 32 NONAME - _ZN11CPhoneState19DialMultimediaCallLEv @ 33 NONAME - _ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 34 NONAME - _ZN11CPhoneState19HandlePhoneStartupLEv @ 35 NONAME - _ZN11CPhoneState19SendGlobalInfoNoteLEi @ 36 NONAME - _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 37 NONAME - _ZN11CPhoneState19SetTouchPaneButtonsEi @ 38 NONAME - _ZN11CPhoneState19SetTouchPaneVisibleEi @ 39 NONAME - _ZN11CPhoneState19ShowNumberBusyNoteLEv @ 40 NONAME - _ZN11CPhoneState20CallFromNumberEntryLEv @ 41 NONAME - _ZN11CPhoneState20DecreaseAudioVolumeLEv @ 42 NONAME - _ZN11CPhoneState20HandleDisconnectingLEi @ 43 NONAME - _ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 44 NONAME - _ZN11CPhoneState20IncreaseAudioVolumeLEv @ 45 NONAME - _ZN11CPhoneState20SendGlobalErrorNoteLEi @ 46 NONAME - _ZN11CPhoneState21IsNumberEntryVisibleLEv @ 47 NONAME - _ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 48 NONAME - _ZN11CPhoneState22CloseCustomizedDialerLEv @ 49 NONAME - _ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 50 NONAME - _ZN11CPhoneState22HandleForegroundEventLEi @ 51 NONAME - _ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 52 NONAME - _ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 53 NONAME - _ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 54 NONAME - _ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 55 NONAME - _ZN11CPhoneState22SendGlobalWarningNoteLEi @ 56 NONAME - _ZN11CPhoneState22StartShowSecurityNoteLEv @ 57 NONAME - _ZN11CPhoneState23HandleAudioMuteChangedLEv @ 58 NONAME - _ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 59 NONAME - _ZN11CPhoneState23HandleNumberEntryEditedEv @ 60 NONAME - _ZN11CPhoneState23SetRingingTonePlaybackLEi @ 61 NONAME - _ZN11CPhoneState23UpdateSingleActiveCallLEi @ 62 NONAME - _ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 63 NONAME - _ZN11CPhoneState24HandleEnvironmentChangeLEi @ 64 NONAME - _ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 65 NONAME - _ZN11CPhoneState24StoreNumberEntryContentLEv @ 66 NONAME - _ZN11CPhoneState24UpdateInCallContextMenuLEv @ 67 NONAME - _ZN11CPhoneState25HandleAudioOutputChangedLEv @ 68 NONAME - _ZN11CPhoneState25HandleNumberEntryClearedLEv @ 69 NONAME - _ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 70 NONAME - _ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 71 NONAME - _ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 72 NONAME - _ZN11CPhoneState26HandleIdleForegroundEventLEv @ 73 NONAME - _ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 74 NONAME - _ZN11CPhoneState26IsNumberEntryContentStoredEv @ 75 NONAME - _ZN11CPhoneState26RestoreNumberEntryContentLEv @ 76 NONAME - _ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 77 NONAME - _ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 78 NONAME - _ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 79 NONAME - _ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 80 NONAME - _ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 81 NONAME - _ZN11CPhoneState27SetToolbarButtonBTHFEnabledEv @ 82 NONAME - _ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 83 NONAME - _ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 84 NONAME - _ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 85 NONAME - _ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 86 NONAME - _ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 87 NONAME - _ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 88 NONAME - _ZN11CPhoneState30SetToolbarButtonHandsetEnabledEv @ 89 NONAME - _ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 90 NONAME - _ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 91 NONAME - _ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 92 NONAME - _ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 93 NONAME - _ZN11CPhoneState35CloseClearNumberEntryAndLoadEffectLE21TPhoneTransEffectType @ 94 NONAME - _ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 95 NONAME - _ZN11CPhoneState36DoStateSpecificCallSetUpDefinitionsLEv @ 96 NONAME - _ZN11CPhoneState37ForwardPEMessageToPhoneCustomizationLEii @ 97 NONAME - _ZN11CPhoneState37SetNeedToReturnToForegroundAppStatusLEi @ 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 - _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 116 NONAME - _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 117 NONAME - _ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 118 NONAME - _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 119 NONAME - _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 120 NONAME - _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 121 NONAME - _ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 122 NONAME - _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 123 NONAME - _ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 124 NONAME - _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 125 NONAME - _ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 126 NONAME - _ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 127 NONAME - _ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 128 NONAME - _ZN15CPhoneStateIdle36DoStateSpecificCallSetUpDefinitionsLEv @ 129 NONAME - _ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 130 NONAME - _ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 131 NONAME - _ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 132 NONAME - _ZN15CPhoneStateIdleD0Ev @ 133 NONAME - _ZN15CPhoneStateIdleD1Ev @ 134 NONAME - _ZN15CPhoneStateIdleD2Ev @ 135 NONAME - _ZN16CPhoneCbaManager10UpdateCbaLEi @ 136 NONAME - _ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 137 NONAME - _ZN16CPhoneCbaManager7SetCbaLEi @ 138 NONAME - _ZN17CPhoneStateHandle17ViewCommandHandleEv @ 139 NONAME - _ZN17CPhoneStateHandle8InstanceEv @ 140 NONAME - _ZN17CPhoneStateInCall10ConstructLEv @ 141 NONAME - _ZN17CPhoneStateInCall10UpdateCbaLEi @ 142 NONAME - _ZN17CPhoneStateInCall11HandleIdleLEi @ 143 NONAME - _ZN17CPhoneStateInCall12OpenMenuBarLEv @ 144 NONAME - _ZN17CPhoneStateInCall14HandleCommandLEi @ 145 NONAME - _ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 146 NONAME - _ZN17CPhoneStateInCall15GetRingingCallLEv @ 147 NONAME - _ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 148 NONAME - _ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 149 NONAME - _ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 150 NONAME - _ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 151 NONAME - _ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 152 NONAME - _ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 153 NONAME - _ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 154 NONAME - _ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 155 NONAME - _ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 156 NONAME - _ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 157 NONAME - _ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 158 NONAME - _ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 159 NONAME - _ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 160 NONAME - _ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 161 NONAME - _ZN17CPhoneStateInCallD0Ev @ 162 NONAME - _ZN17CPhoneStateInCallD1Ev @ 163 NONAME - _ZN17CPhoneStateInCallD2Ev @ 164 NONAME - _ZN18CPhoneStateMachine11ChangeStateEi @ 165 NONAME - _ZN18CPhoneStateMachine11PhoneEngineEv @ 166 NONAME - _ZN18CPhoneStateMachine12SecurityModeEv @ 167 NONAME - _ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 168 NONAME - _ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 169 NONAME - _ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 170 NONAME - _ZN18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 171 NONAME - _ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 172 NONAME - _ZN18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 173 NONAME - _ZN18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 174 NONAME - _ZN18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 175 NONAME - _ZN18CPhoneStateMachine5StateEv @ 176 NONAME - _ZN18CPhoneStateMachine9SetCallIdEi @ 177 NONAME - _ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 178 NONAME - _ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 179 NONAME - _ZN18CPhoneStateMachineD0Ev @ 180 NONAME - _ZN18CPhoneStateMachineD1Ev @ 181 NONAME - _ZN18CPhoneStateMachineD2Ev @ 182 NONAME - _ZN18CPhoneStateStartup10ConstructLEv @ 183 NONAME - _ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 184 NONAME - _ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 185 NONAME - _ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 186 NONAME - _ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 187 NONAME - _ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 188 NONAME - _ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 189 NONAME - _ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 190 NONAME - _ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 191 NONAME - _ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 192 NONAME - _ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 193 NONAME - _ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 194 NONAME - _ZN18CPhoneStateStartupD0Ev @ 195 NONAME - _ZN18CPhoneStateStartupD1Ev @ 196 NONAME - _ZN18CPhoneStateStartupD2Ev @ 197 NONAME - _ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 198 NONAME - _ZN18CPhoneUIController13HandleMessageEii @ 199 NONAME - _ZN18CPhoneUIController14HandleCommandLEi @ 200 NONAME - _ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 201 NONAME - _ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 202 NONAME - _ZN18CPhoneUIController15ProcessCommandLEi @ 203 NONAME - _ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 204 NONAME - _ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 205 NONAME - _ZN18CPhoneUIController19HandlePhoneStartupLEv @ 206 NONAME - _ZN18CPhoneUIController22HandleForegroundEventLEi @ 207 NONAME - _ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 208 NONAME - _ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 209 NONAME - _ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 210 NONAME - _ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 211 NONAME - _ZN18CPhoneUIController4NewLER20CPhoneViewController @ 212 NONAME - _ZN18CPhoneUIControllerD0Ev @ 213 NONAME - _ZN18CPhoneUIControllerD1Ev @ 214 NONAME - _ZN18CPhoneUIControllerD2Ev @ 215 NONAME - _ZN19CPhoneStateIncoming10ConstructLEv @ 216 NONAME - _ZN19CPhoneStateIncoming14HandleCommandLEi @ 217 NONAME - _ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 218 NONAME - _ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 219 NONAME - _ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 220 NONAME - _ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 221 NONAME - _ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 222 NONAME - _ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 223 NONAME - _ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 224 NONAME - _ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 225 NONAME - _ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 226 NONAME - _ZN19CPhoneStateIncomingD0Ev @ 227 NONAME - _ZN19CPhoneStateIncomingD1Ev @ 228 NONAME - _ZN19CPhoneStateIncomingD2Ev @ 229 NONAME - _ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 230 NONAME - _ZN20CPhoneReconnectQuery9InstanceLEv @ 231 NONAME - _ZN20CPhoneStateCallSetup10ConstructLEv @ 232 NONAME - _ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 233 NONAME - _ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 234 NONAME - _ZN20CPhoneStateCallSetup14HandleCommandLEi @ 235 NONAME - _ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 236 NONAME - _ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 237 NONAME - _ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 238 NONAME - _ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 239 NONAME - _ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 240 NONAME - _ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 241 NONAME - _ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 242 NONAME - _ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 243 NONAME - _ZN20CPhoneStateCallSetupD0Ev @ 244 NONAME - _ZN20CPhoneStateCallSetupD1Ev @ 245 NONAME - _ZN20CPhoneStateCallSetupD2Ev @ 246 NONAME - _ZN23TPhoneTransitionHandler11EndUiUpdateEv @ 247 NONAME - _ZN23TPhoneTransitionHandler14EndTransEffectEv @ 248 NONAME - _ZN23TPhoneTransitionHandler15BeginUiUpdateLCEv @ 249 NONAME - _ZN23TPhoneTransitionHandler18BeginTransEffectLCE21TPhoneTransEffectType @ 250 NONAME - _ZN23TPhoneTransitionHandler18IdleCallUiUpdateLCEv @ 251 NONAME - _ZN23TPhoneTransitionHandler20EndUiUpdateAndEffectEv @ 252 NONAME - _ZN23TPhoneTransitionHandler22IncomingCallUiUpdateLCEv @ 253 NONAME - _ZNK11CPhoneState11IsKeyLockOnEv @ 254 NONAME - _ZNK11CPhoneState12IsAutoLockOnEv @ 255 NONAME - _ZNK11CPhoneState14IsSwivelClosedEv @ 256 NONAME - _ZNK11CPhoneState17IsMenuBarVisibleLEv @ 257 NONAME - _ZNK11CPhoneState18TopAppIsDisplayedLEv @ 258 NONAME - _ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 259 NONAME - _ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 260 NONAME - _ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 261 NONAME - _ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 262 NONAME - _ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 263 NONAME - _ZNK11CPhoneState8EikonEnvEv @ 264 NONAME - _ZNK11CPhoneState8SimStateEv @ 265 NONAME - _ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 266 NONAME - _ZNK18CPhoneStateMachine8EikonEnvEv @ 267 NONAME - _ZTI11CPhoneState @ 268 NONAME - _ZTI15CPhoneStateIdle @ 269 NONAME - _ZTI17CPhoneStateHandle @ 270 NONAME - _ZTI17CPhoneStateInCall @ 271 NONAME - _ZTI18CPhoneStateMachine @ 272 NONAME - _ZTI18CPhoneStateStartup @ 273 NONAME - _ZTI18CPhoneUIController @ 274 NONAME - _ZTI19CPhoneStateIncoming @ 275 NONAME - _ZTI20CPhoneReconnectQuery @ 276 NONAME - _ZTI20CPhoneStateCallSetup @ 277 NONAME - _ZTI23CPhoneDtmfWaitCharTimer @ 278 NONAME - _ZTI23CPhoneKeyEventForwarder @ 279 NONAME - _ZTI24CPhoneSystemEventHandler @ 280 NONAME - _ZTI26CPhoneRemoteControlHandler @ 281 NONAME - _ZTI27CPhoneBtaaDisconnectHandler @ 282 NONAME - _ZTV11CPhoneState @ 283 NONAME - _ZTV15CPhoneStateIdle @ 284 NONAME - _ZTV17CPhoneStateHandle @ 285 NONAME - _ZTV17CPhoneStateInCall @ 286 NONAME - _ZTV18CPhoneStateMachine @ 287 NONAME - _ZTV18CPhoneStateStartup @ 288 NONAME - _ZTV18CPhoneUIController @ 289 NONAME - _ZTV19CPhoneStateIncoming @ 290 NONAME - _ZTV20CPhoneReconnectQuery @ 291 NONAME - _ZTV20CPhoneStateCallSetup @ 292 NONAME - _ZTV23CPhoneDtmfWaitCharTimer @ 293 NONAME - _ZTV23CPhoneKeyEventForwarder @ 294 NONAME - _ZTV24CPhoneSystemEventHandler @ 295 NONAME - _ZTV26CPhoneRemoteControlHandler @ 296 NONAME - _ZTV27CPhoneBtaaDisconnectHandler @ 297 NONAME - _ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 298 NONAME - _ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 299 NONAME - _ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 300 NONAME - _ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 301 NONAME - _ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 302 NONAME - _ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 303 NONAME - _ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 304 NONAME - _ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 305 NONAME - _ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 306 NONAME - _ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 307 NONAME - _ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 308 NONAME - _ZThn12_N11CPhoneStateD0Ev @ 309 NONAME - _ZThn12_N11CPhoneStateD1Ev @ 310 NONAME - _ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 311 NONAME - _ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 312 NONAME - _ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 313 NONAME - _ZThn12_N15CPhoneStateIdleD0Ev @ 314 NONAME - _ZThn12_N15CPhoneStateIdleD1Ev @ 315 NONAME - _ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 316 NONAME - _ZThn12_N17CPhoneStateInCallD0Ev @ 317 NONAME - _ZThn12_N17CPhoneStateInCallD1Ev @ 318 NONAME - _ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 319 NONAME - _ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 320 NONAME - _ZThn12_N18CPhoneStateStartupD0Ev @ 321 NONAME - _ZThn12_N18CPhoneStateStartupD1Ev @ 322 NONAME - _ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 323 NONAME - _ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 324 NONAME - _ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 325 NONAME - _ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 326 NONAME - _ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 327 NONAME - _ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 328 NONAME - _ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 329 NONAME - _ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 330 NONAME - _ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 331 NONAME - _ZThn12_N18CPhoneUIControllerD0Ev @ 332 NONAME - _ZThn12_N18CPhoneUIControllerD1Ev @ 333 NONAME - _ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 334 NONAME - _ZThn12_N19CPhoneStateIncomingD0Ev @ 335 NONAME - _ZThn12_N19CPhoneStateIncomingD1Ev @ 336 NONAME - _ZThn12_N20CPhoneStateCallSetupD0Ev @ 337 NONAME - _ZThn12_N20CPhoneStateCallSetupD1Ev @ 338 NONAME - _ZThn16_N11CPhoneState14HandleCommandLEi @ 339 NONAME - _ZThn16_N11CPhoneState15ProcessCommandLEi @ 340 NONAME - _ZThn16_N11CPhoneStateD0Ev @ 341 NONAME - _ZThn16_N11CPhoneStateD1Ev @ 342 NONAME - _ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 343 NONAME - _ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 344 NONAME - _ZThn16_N15CPhoneStateIdleD0Ev @ 345 NONAME - _ZThn16_N15CPhoneStateIdleD1Ev @ 346 NONAME - _ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 347 NONAME - _ZThn16_N17CPhoneStateInCallD0Ev @ 348 NONAME - _ZThn16_N17CPhoneStateInCallD1Ev @ 349 NONAME - _ZThn16_N18CPhoneStateStartupD0Ev @ 350 NONAME - _ZThn16_N18CPhoneStateStartupD1Ev @ 351 NONAME - _ZThn16_N18CPhoneUIController14HandleCommandLEi @ 352 NONAME - _ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 353 NONAME - _ZThn16_N18CPhoneUIControllerD0Ev @ 354 NONAME - _ZThn16_N18CPhoneUIControllerD1Ev @ 355 NONAME - _ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 356 NONAME - _ZThn16_N19CPhoneStateIncomingD0Ev @ 357 NONAME - _ZThn16_N19CPhoneStateIncomingD1Ev @ 358 NONAME - _ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 359 NONAME - _ZThn16_N20CPhoneStateCallSetupD0Ev @ 360 NONAME - _ZThn16_N20CPhoneStateCallSetupD1Ev @ 361 NONAME - _ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 362 NONAME - _ZThn20_N11CPhoneStateD0Ev @ 363 NONAME - _ZThn20_N11CPhoneStateD1Ev @ 364 NONAME - _ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 365 NONAME - _ZThn20_N15CPhoneStateIdleD0Ev @ 366 NONAME - _ZThn20_N15CPhoneStateIdleD1Ev @ 367 NONAME - _ZThn20_N17CPhoneStateInCallD0Ev @ 368 NONAME - _ZThn20_N17CPhoneStateInCallD1Ev @ 369 NONAME - _ZThn20_N18CPhoneStateStartupD0Ev @ 370 NONAME - _ZThn20_N18CPhoneStateStartupD1Ev @ 371 NONAME - _ZThn20_N19CPhoneStateIncomingD0Ev @ 372 NONAME - _ZThn20_N19CPhoneStateIncomingD1Ev @ 373 NONAME - _ZThn20_N20CPhoneStateCallSetupD0Ev @ 374 NONAME - _ZThn20_N20CPhoneStateCallSetupD1Ev @ 375 NONAME - _ZThn24_N11CPhoneState25HandleNumberEntryClearedLEv @ 376 NONAME - _ZThn24_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 377 NONAME - _ZThn24_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 378 NONAME - _ZThn24_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 379 NONAME - _ZThn24_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 380 NONAME - _ZThn28_N11CPhoneState23HandleNumberEntryEditedEv @ 381 NONAME - _ZThn28_N11CPhoneStateD0Ev @ 382 NONAME - _ZThn28_N11CPhoneStateD1Ev @ 383 NONAME - _ZThn28_N15CPhoneStateIdleD0Ev @ 384 NONAME - _ZThn28_N15CPhoneStateIdleD1Ev @ 385 NONAME - _ZThn28_N17CPhoneStateInCallD0Ev @ 386 NONAME - _ZThn28_N17CPhoneStateInCallD1Ev @ 387 NONAME - _ZThn28_N18CPhoneStateStartupD0Ev @ 388 NONAME - _ZThn28_N18CPhoneStateStartupD1Ev @ 389 NONAME - _ZThn28_N19CPhoneStateIncomingD0Ev @ 390 NONAME - _ZThn28_N19CPhoneStateIncomingD1Ev @ 391 NONAME - _ZThn28_N20CPhoneStateCallSetupD0Ev @ 392 NONAME - _ZThn28_N20CPhoneStateCallSetupD1Ev @ 393 NONAME - _ZThn32_NK11CPhoneState11IsKeyLockOnEv @ 394 NONAME - _ZThn32_NK11CPhoneState12IsAutoLockOnEv @ 395 NONAME - _ZThn36_N11CPhoneState11SetEikonEnvEP9CEikonEnv @ 396 NONAME - _ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 397 NONAME - _ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 398 NONAME - _ZThn4_N11CPhoneStateD0Ev @ 399 NONAME - _ZThn4_N11CPhoneStateD1Ev @ 400 NONAME - _ZThn4_N15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 401 NONAME - _ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 402 NONAME - _ZThn4_N15CPhoneStateIdleD0Ev @ 403 NONAME - _ZThn4_N15CPhoneStateIdleD1Ev @ 404 NONAME - _ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 405 NONAME - _ZThn4_N17CPhoneStateInCallD0Ev @ 406 NONAME - _ZThn4_N17CPhoneStateInCallD1Ev @ 407 NONAME - _ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 408 NONAME - _ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 409 NONAME - _ZThn4_N18CPhoneStateMachine12SecurityModeEv @ 410 NONAME - _ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 411 NONAME - _ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 412 NONAME - _ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 413 NONAME - _ZThn4_N18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 414 NONAME - _ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 415 NONAME - _ZThn4_N18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 416 NONAME - _ZThn4_N18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 417 NONAME - _ZThn4_N18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 418 NONAME - _ZThn4_N18CPhoneStateMachine5StateEv @ 419 NONAME - _ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 420 NONAME - _ZThn4_N18CPhoneStateMachineD0Ev @ 421 NONAME - _ZThn4_N18CPhoneStateMachineD1Ev @ 422 NONAME - _ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 423 NONAME - _ZThn4_N18CPhoneStateStartupD0Ev @ 424 NONAME - _ZThn4_N18CPhoneStateStartupD1Ev @ 425 NONAME - _ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 426 NONAME - _ZThn4_N18CPhoneUIController13HandleMessageEii @ 427 NONAME - _ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 428 NONAME - _ZThn4_N19CPhoneStateIncomingD0Ev @ 429 NONAME - _ZThn4_N19CPhoneStateIncomingD1Ev @ 430 NONAME - _ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 431 NONAME - _ZThn4_N20CPhoneStateCallSetupD0Ev @ 432 NONAME - _ZThn4_N20CPhoneStateCallSetupD1Ev @ 433 NONAME - _ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 434 NONAME - _ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 435 NONAME - _ZThn8_N11CPhoneState15HandleLongHashLEv @ 436 NONAME - _ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 437 NONAME - _ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 438 NONAME - _ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 439 NONAME - _ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 440 NONAME - _ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 441 NONAME - _ZThn8_N11CPhoneStateD0Ev @ 442 NONAME - _ZThn8_N11CPhoneStateD1Ev @ 443 NONAME - _ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 444 NONAME - _ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 445 NONAME - _ZThn8_N15CPhoneStateIdleD0Ev @ 446 NONAME - _ZThn8_N15CPhoneStateIdleD1Ev @ 447 NONAME - _ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 448 NONAME - _ZThn8_N17CPhoneStateInCallD0Ev @ 449 NONAME - _ZThn8_N17CPhoneStateInCallD1Ev @ 450 NONAME - _ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 451 NONAME - _ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 452 NONAME - _ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 453 NONAME - _ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 454 NONAME - _ZThn8_N18CPhoneStateStartupD0Ev @ 455 NONAME - _ZThn8_N18CPhoneStateStartupD1Ev @ 456 NONAME - _ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 457 NONAME - _ZThn8_N18CPhoneUIControllerD0Ev @ 458 NONAME - _ZThn8_N18CPhoneUIControllerD1Ev @ 459 NONAME - _ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 460 NONAME - _ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 461 NONAME - _ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 462 NONAME - _ZThn8_N19CPhoneStateIncomingD0Ev @ 463 NONAME - _ZThn8_N19CPhoneStateIncomingD1Ev @ 464 NONAME - _ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 465 NONAME - _ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 466 NONAME - _ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 467 NONAME - _ZThn8_N20CPhoneStateCallSetupD0Ev @ 468 NONAME - _ZThn8_N20CPhoneStateCallSetupD1Ev @ 469 NONAME - _ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 470 NONAME + _ZN11CPhoneState14EndTransEffectEv @ 7 NONAME + _ZN11CPhoneState14HandleCommandLEi @ 8 NONAME + _ZN11CPhoneState14IsNoteVisibleLEv @ 9 NONAME + _ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 10 NONAME + _ZN11CPhoneState15BeginUiUpdateLCEv @ 11 NONAME + _ZN11CPhoneState15DisconnectCallLEv @ 12 NONAME + _ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 13 NONAME + _ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 14 NONAME + _ZN11CPhoneState15HandleLongHashLEv @ 15 NONAME + _ZN11CPhoneState15ProcessCommandLEi @ 16 NONAME + _ZN11CPhoneState15SetContextMenuLEi @ 17 NONAME + _ZN11CPhoneState16CallWaitingNoteLEi @ 18 NONAME + _ZN11CPhoneState16CloseDTMFEditorLEv @ 19 NONAME + _ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 20 NONAME + _ZN11CPhoneState16SetDefaultFlagsLEv @ 21 NONAME + _ZN11CPhoneState17DisplayCallSetupLEi @ 22 NONAME + _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 23 NONAME + _ZN11CPhoneState17IsAnyQueryActiveLEv @ 24 NONAME + _ZN11CPhoneState17SetCallHeaderTypeEN14CBubbleManager19TPhoneCallTypeFlagsE @ 25 NONAME + _ZN11CPhoneState17SetHandsfreeModeLEi @ 26 NONAME + _ZN11CPhoneState17SetToolbarDimmingEi @ 27 NONAME + _ZN11CPhoneState18BeginTransEffectLCE21TStateTransEffectType @ 28 NONAME + _ZN11CPhoneState18DisplayIdleScreenLEv @ 29 NONAME + _ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 30 NONAME + _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 31 NONAME + _ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 32 NONAME + _ZN11CPhoneState18IsNumberEntryUsedLEv @ 33 NONAME + _ZN11CPhoneState19CompleteSatRequestLEi @ 34 NONAME + _ZN11CPhoneState19DialMultimediaCallLEv @ 35 NONAME + _ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 36 NONAME + _ZN11CPhoneState19HandlePhoneStartupLEv @ 37 NONAME + _ZN11CPhoneState19SendGlobalInfoNoteLEi @ 38 NONAME + _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 39 NONAME + _ZN11CPhoneState19SetDivertIndicationEi @ 40 NONAME + _ZN11CPhoneState19SetTouchPaneButtonsEi @ 41 NONAME + _ZN11CPhoneState19SetTouchPaneVisibleEi @ 42 NONAME + _ZN11CPhoneState19ShowNumberBusyNoteLEv @ 43 NONAME + _ZN11CPhoneState20CallFromNumberEntryLEv @ 44 NONAME + _ZN11CPhoneState20DecreaseAudioVolumeLEv @ 45 NONAME + _ZN11CPhoneState20HandleDisconnectingLEi @ 46 NONAME + _ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 47 NONAME + _ZN11CPhoneState20IncreaseAudioVolumeLEv @ 48 NONAME + _ZN11CPhoneState20SendGlobalErrorNoteLEi @ 49 NONAME + _ZN11CPhoneState21IsNumberEntryVisibleLEv @ 50 NONAME + _ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 51 NONAME + _ZN11CPhoneState22CloseCustomizedDialerLEv @ 52 NONAME + _ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 53 NONAME + _ZN11CPhoneState22HandleForegroundEventLEi @ 54 NONAME + _ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 55 NONAME + _ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 56 NONAME + _ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 57 NONAME + _ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 58 NONAME + _ZN11CPhoneState22SendGlobalWarningNoteLEi @ 59 NONAME + _ZN11CPhoneState22StartShowSecurityNoteLEv @ 60 NONAME + _ZN11CPhoneState23HandleAudioMuteChangedLEv @ 61 NONAME + _ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 62 NONAME + _ZN11CPhoneState23HandleNumberEntryEditedEv @ 63 NONAME + _ZN11CPhoneState23SetRingingTonePlaybackLEi @ 64 NONAME + _ZN11CPhoneState23UpdateSingleActiveCallLEi @ 65 NONAME + _ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 66 NONAME + _ZN11CPhoneState24HandleEnvironmentChangeLEi @ 67 NONAME + _ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 68 NONAME + _ZN11CPhoneState24StoreNumberEntryContentLEv @ 69 NONAME + _ZN11CPhoneState24UpdateInCallContextMenuLEv @ 70 NONAME + _ZN11CPhoneState25HandleAudioOutputChangedLEv @ 71 NONAME + _ZN11CPhoneState25HandleNumberEntryClearedLEv @ 72 NONAME + _ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 73 NONAME + _ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 74 NONAME + _ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 75 NONAME + _ZN11CPhoneState26HandleIdleForegroundEventLEv @ 76 NONAME + _ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 77 NONAME + _ZN11CPhoneState26IsNumberEntryContentStoredEv @ 78 NONAME + _ZN11CPhoneState26RestoreNumberEntryContentLEv @ 79 NONAME + _ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 80 NONAME + _ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 81 NONAME + _ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 82 NONAME + _ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 83 NONAME + _ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 84 NONAME + _ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 85 NONAME + _ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 86 NONAME + _ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 87 NONAME + _ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 88 NONAME + _ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 89 NONAME + _ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 90 NONAME + _ZN11CPhoneState30SetToolbarButtonHandsetEnabledEv @ 91 NONAME + _ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 92 NONAME + _ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 93 NONAME + _ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 94 NONAME + _ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 95 NONAME + _ZN11CPhoneState35CloseClearNumberEntryAndLoadEffectLE21TStateTransEffectType @ 96 NONAME + _ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 97 NONAME + _ZN11CPhoneState36DoStateSpecificCallSetUpDefinitionsLEv @ 98 NONAME + _ZN11CPhoneState37ForwardPEMessageToPhoneCustomizationLEii @ 99 NONAME + _ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 100 NONAME + _ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 101 NONAME + _ZN11CPhoneState7IsSimOkEv @ 102 NONAME + _ZN11CPhoneState9ShowNoteLEi @ 103 NONAME + _ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 104 NONAME + _ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 105 NONAME + _ZN11CPhoneStateD0Ev @ 106 NONAME + _ZN11CPhoneStateD1Ev @ 107 NONAME + _ZN11CPhoneStateD2Ev @ 108 NONAME + _ZN15CPhoneStateIdle10ConstructLEv @ 109 NONAME + _ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 110 NONAME + _ZN15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 111 NONAME + _ZN15CPhoneStateIdle14DialVoiceCallLEv @ 112 NONAME + _ZN15CPhoneStateIdle14HandleCommandLEi @ 113 NONAME + _ZN15CPhoneStateIdle14HandleDialingLEi @ 114 NONAME + _ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 115 NONAME + _ZN15CPhoneStateIdle15ProcessCommandLEi @ 116 NONAME + _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 117 NONAME + _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 118 NONAME + _ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 119 NONAME + _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 120 NONAME + _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 121 NONAME + _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 122 NONAME + _ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 123 NONAME + _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 124 NONAME + _ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 125 NONAME + _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 126 NONAME + _ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 127 NONAME + _ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 128 NONAME + _ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 129 NONAME + _ZN15CPhoneStateIdle36DoStateSpecificCallSetUpDefinitionsLEv @ 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 + _ZN11CPhoneState22EnableGlobalNotifiersLEv @ 475 NONAME + _ZN11CPhoneState21EnableEikonNotifiersLEv @ 476 NONAME + _ZN11CPhoneState22DisableEikonNotifiersLEv @ 477 NONAME + _ZN11CPhoneState23DisableGlobalNotifiersLEv @ 478 NONAME diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/group/phoneuicontrol.mmp --- a/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp Wed Oct 13 14:31:22 2010 +0300 @@ -54,7 +54,6 @@ SOURCE cphonenumberentrymanager.cpp SOURCE cphonecbamanager.cpp SOURCE cphonesecuritymodeobserver.cpp -SOURCE tphonetransitionhandler.cpp /* Languages */ LANG SC diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h --- a/phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h Wed Oct 13 14:31:22 2010 +0300 @@ -100,6 +100,14 @@ CBubbleManager::TPhoneCallTypeFlags CallHeaderType() const; /** + * Sets divert indication to call header if necessary + * @param aCallId - Call Id. + * @param aCallHeaderData - Call header where indication will be set + * if needed. + */ + void SetDivertIndication( const TBool aDivertIndication ); + + /** * Checks if call is waiting, returns ETrue if call is waiting * otherwise EFalse. * @param aCallId, call id. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/cphonestate.h --- a/phoneapp/phoneuicontrol/inc/cphonestate.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestate.h Wed Oct 13 14:31:22 2010 +0300 @@ -25,24 +25,34 @@ #include #include #include -#include #include "mphonestate.h" #include "mphoneviewcommandhandle.h" #include "cphonecbamanager.h" -#include "tphonecmdparamtranseffect.h" -#include "tphonetransitionhandler.h" // FORWARD DECLARATIONS class MPhoneState; class MPhoneStateMachine; class CPhoneCallHeaderManager; -class TPhoneTransitionHandler; class CPhoneTimer; class TPhoneCmdParamCallHeaderData; class MPhoneCustomization; class CPhoneNumberEntryManager; +enum TStateTransEffectType + { + ENoneType, + ECallUiAppear, + ECallUiDisappear, + // These effect types can be used only when NE is opened/closed + // when some other app than phone is visible on the foreground/ + // background. + // These cannot be used for internal transitions (=call ui<->dialer). + ENumberEntryOpen, + ENumberEntryClose, + ENumberEntryCreate + }; + // CLASS DECLARATION /** @@ -224,9 +234,32 @@ TRemConCoreApiButtonAction aButtonAct); /** + * Setter for divert indication showing in bubble. + * @param aDivertIndication ETrue to show divert indication, + * EFalse to not. Usually setting EFalse isn't necessary + * as it's a default value in bubble creation. + */ + IMPORT_C virtual void SetDivertIndication( + const TBool aDivertIndication ); + + /** * Handles Long hash key press */ IMPORT_C void HandleLongHashL(); + + /** + * Informs view to start Transition effect if effect + * type is feasible for current state. + * @param aType a transition effect, default none + * EndTransEffect() must be called when update is done. + */ + IMPORT_C void BeginTransEffectLC( TStateTransEffectType aType = ENoneType ); + + /** + * Informs view to complete Transition effect + */ + IMPORT_C void EndTransEffect(); + /** * Checks whether customized dialer view is active, * @return ETrue if customized dialer is active @@ -311,24 +344,6 @@ * to inherinting classes. */ IMPORT_C virtual void DoStateSpecificCallSetUpDefinitionsL(); - - /** - * Getter for CEikonEnv to avoid use of static system calls - * @return CEikonEnv handle - */ - IMPORT_C CEikonEnv* EikonEnv() const; - - /** - * Setter for CEikonEnv to avoid use of static system calls - * @param CEikonEnv handle - */ - IMPORT_C virtual void SetEikonEnv( CEikonEnv* aEnv ); - - /** - * Getter for TPhoneTransitionHandler instance. - * @return TPhoneTransitionHandler handle - */ - IMPORT_C TPhoneTransitionHandler& TransitionHandlerL(); public: // NumberEntry functions. @@ -353,7 +368,7 @@ /** * Close and and clear number entry. */ - IMPORT_C void CloseClearNumberEntryAndLoadEffectL( TPhoneTransEffectType aType ); + IMPORT_C void CloseClearNumberEntryAndLoadEffectL( TStateTransEffectType aType ); protected: @@ -617,7 +632,18 @@ * in number entry. */ IMPORT_C virtual void OnlyHashInNumberEntryL(); - + + /** + * Informs view that UI is being updated (call bubble or number editor). + * EndUiUpdate() must be called when update is done. + */ + IMPORT_C void BeginUiUpdateLC(); + + /** + * Informs view that UI update is completed. + */ + IMPORT_C void EndUiUpdate(); + /* * Checks if necessary to show call termination note * @@ -719,14 +745,6 @@ * @param aCallId - call id to set up */ IMPORT_C void DisplayCallSetupL( TInt aCallId ); - - /** - * Sets the flag wether the foreground application - * needs to be brought foreground after the phone - * goes idle - */ - IMPORT_C void SetNeedToReturnToForegroundAppStatusL( - TBool aNeedToReturn ); protected: // NumberEntry functions. @@ -789,51 +807,65 @@ IMPORT_C virtual void HandleNumberEntryEdited(); /** - * Returns ETrue if alphanumeric characters are supported. - * @param aKeyEvent Key event. - * @return ETrue if alphanumeric chars are supported. - */ - IMPORT_C TBool IsAlphanumericSupportedAndCharInput( - const TKeyEvent& aKeyEvent ); + * Returns ETrue if alphanumeric characters are supported. + * @param aKeyEvent Key event. + * @return ETrue if alphanumeric chars are supported. + */ + IMPORT_C TBool IsAlphanumericSupportedAndCharInput( + const TKeyEvent& aKeyEvent ); + + /** + * Handle state-specific behaviour when number entry is cleared + */ + IMPORT_C virtual void HandleNumberEntryClearedL(); - /** - * Handle state-specific behaviour when number entry is cleared - */ - IMPORT_C virtual void HandleNumberEntryClearedL(); + /** + * Internal number entry handling methods. + */ + void NumberEntryClearL(); + + /** + * Dims silence touch button if call is not alerting. + * @param None + */ + IMPORT_C void UpdateSilenceButtonDimming(); + + /** + * Sets toolbar dimming. + * @param aDimmed ETrue if dimmed + */ + IMPORT_C void SetToolbarDimming( TBool aDimmed ); - /** - * Internal number entry handling methods. - */ - void NumberEntryClearL(); - - - /** - * Dims silence touch button if call is not alerting. - * @param None - */ - IMPORT_C void UpdateSilenceButtonDimming(); + /** + * Sets toolbar loudspeaker button enabled. + */ + IMPORT_C void SetToolbarButtonLoudspeakerEnabled(); + + /** + * Sets toolbar handset button enabled. + */ + IMPORT_C void SetToolbarButtonHandsetEnabled(); + + /** + * Enables global notifiers. + */ + IMPORT_C void EnableGlobalNotifiersL(); - /** - * Sets toolbar dimming. - * @param aDimmed ETrue if dimmed - */ - IMPORT_C void SetToolbarDimming( TBool aDimmed ); - - /** - * Sets toolbar loudspeaker button enabled. - */ - IMPORT_C void SetToolbarButtonLoudspeakerEnabled(); + /** + * Disables global notifiers. + */ + IMPORT_C void DisableGlobalNotifiersL(); - /** - * Sets toolbar handset button enabled. - */ - IMPORT_C void SetToolbarButtonHandsetEnabled(); + /** + * Enables Eikon notifiers. + */ + IMPORT_C void EnableEikonNotifiersL(); - /** - * Sets Bluetooth handsfree button enabled. - */ - IMPORT_C void SetToolbarButtonBTHFEnabled(); - + /** + * Disables Eikon notifiers. + */ + IMPORT_C void DisableEikonNotifiersL(); + protected: /** @@ -871,6 +903,11 @@ */ TBool IsAnyConnectedCalls(); + /** + * Checks if all startup related queries and graphics have been displayed. + */ + TBool AllStartupQueriesDisplayed(); + private: /** @@ -1000,6 +1037,18 @@ TPhoneCmdParamCallHeaderData* aCallHeaderData ); /** + * TCleanupOperation to call EndUiUpdate(), if leave occurs + * after BeginUiUpdate(). + */ + static void UiUpdateCleanup(TAny* aThis ); + + /** + * TCleanupOperation to call EndTransEffect, if leave occurs + * after BeginTransEffect(). + */ + static void EffectCleanup(TAny* aThis ); + + /** * Gets volume level from ui control. */ TInt GetVolumeLevel(); @@ -1052,7 +1101,7 @@ */ void SendDtmfKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aEventCode ); - + /* * Creates call header manager if needed. */ @@ -1147,13 +1196,10 @@ // Internal variable for EikonEnv to avoid // use of static system calls - CEikonEnv* iEnv; // Not owned + CEikonEnv& iEnv; // Call header manager. CPhoneCallHeaderManager* iCallHeaderManager; - - // Call header manager. - TPhoneTransitionHandler* iTransitionHandler; // Number entry manager CPhoneNumberEntryManager* iNumberEntryManager; @@ -1169,6 +1215,11 @@ * Handle to the Operator logo resource. */ TInt iLogoHandle; + + /** + * Current startup ui sequence phase. + */ + TInt iStartupUiPhase; }; #endif // CPHONESTATE_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/cphonestatemachine.h --- a/phoneapp/phoneuicontrol/inc/cphonestatemachine.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/cphonestatemachine.h Wed Oct 13 14:31:22 2010 +0300 @@ -142,13 +142,6 @@ IMPORT_C void HandlePropertyChangedL(const TUid& aCategory, const TUint aKey, const TInt aValue ); - - /** - * Getter for CEikonEnv to avoid use of static system calls - * @return CEikonEnv handle - */ - IMPORT_C CEikonEnv* EikonEnv() const; - protected: @@ -200,11 +193,6 @@ */ MPhoneSecurityMessageHandler* iSecurityMessageHandler; - /** Internal variable for EikonEnv to avoid use of static system calls - * Not own. - */ - CEikonEnv* iEnv; - }; #endif // CPHONESTATEMACHINE_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/mphonedivertif.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneapp/phoneuicontrol/inc/mphonedivertif.h Wed Oct 13 14:31:22 2010 +0300 @@ -0,0 +1,52 @@ +/* +* Copyright (c) 2006 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Interface for manipulating divert information. +* +*/ + + +#ifndef MPHONEDIVERTIF_H +#define MPHONEDIVERTIF_H + +// INCLUDES +#include + +// CLASS DECLARATION + +/** +* Handle all possible messages from Phone Engine +*/ +class MPhoneDivertIF + { + public: + + /** + * Destructor. + */ + virtual ~MPhoneDivertIF() {}; + + /** + * Setter for divert indication showing in bubble. + * @param aDivertIndication ETrue to show divert indication, + * EFalse to not. Usually setting EFalse isn't necessary + * as it's a default value in bubble creation. + */ + virtual void SetDivertIndication( + const TBool aDivertIndication ) = 0; + }; + +#endif // MPHONEDIVERTIF_H + +// End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/mphonestate.h --- a/phoneapp/phoneuicontrol/inc/mphonestate.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/mphonestate.h Wed Oct 13 14:31:22 2010 +0300 @@ -26,10 +26,10 @@ #include "mphonesystemevents.h" #include "mphonemenuandcbaevents.h" #include "mphoneremotecontrolevents.h" +#include "mphonedivertif.h" #include "mphoneneclearedhandler.h" #include "mphonenumberentryevents.h" #include "mphonelockinfo.h" -#include "mphonestateproperties.h" // FORWARD DECLARATIONS @@ -45,10 +45,10 @@ public MPhoneSystemEvents, public MPhoneMenuAndCbaEvents, public MPhoneRemoteControlEvents, + public MPhoneDivertIF, public MPhoneNEClearedHandler, public MPhoneNumberEntryEvents, - public MPhoneLockInfo, - public MPhoneStateProperties + public MPhoneLockInfo { public: diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/mphonestateproperties.h --- a/phoneapp/phoneuicontrol/inc/mphonestateproperties.h Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: Nokia -* -* Description: An abstract class for accessing generic state properties -* -*/ - - -#ifndef MPHONESTATEPROPERTIES_H -#define MPHONESTATEPROPERTIES_H - -// INCLUDES -#include -#include - -// FORWARD DECLARATIONS - -// CLASS DECLARATION - -/** -* An abstract class for accessing generic state properties -* -*/ -class MPhoneStateProperties - { - public: - - /** - * Sets CEikonEnv handle to minimize static system calls - * @param CEikonEnv handle - */ - virtual void SetEikonEnv( CEikonEnv* aEnv ) = 0; - - }; - -#endif // MPHONESTATEPROPERTIES_H - -// End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h --- a/phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h Wed Oct 13 14:31:22 2010 +0300 @@ -99,6 +99,14 @@ * of call bubble. */ CBubbleManager::TPhoneCallTypeFlags CallHeaderType() const; + + /** + * Setter for divert indication showing in bubble. + * @param aDivertIndication ETrue to show divert indication, + * EFalse to not. Usually setting EFalse isn't necessary + * as it's a default value in bubble creation. + */ + void SetDivertIndication( const TBool aDivertIndication ); /** * Return remote info data @@ -252,6 +260,8 @@ MPhoneCallHeaderManagerUtility& iManagerUtility; MPhoneStateMachine& iStateMachine; CBubbleManager::TPhoneCallTypeFlags iCallHeaderType; + TBool iSetDivertIndication; + }; #endif // TPHONECALLHEADERPARAM_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/inc/tphonetransitionhandler.h --- a/phoneapp/phoneuicontrol/inc/tphonetransitionhandler.h Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Class handles phoneapp internal/external transitions. -* -*/ - - -#ifndef TPHONETRANSITIONHANDLER_H -#define TPHONETRANSITIONHANDLER_H - -//INCLUDES -#include -#include "mphoneviewcommandhandle.h" -#include "tphonecmdparamtranseffect.h" - -class CPhoneState; - -/** - * Class handles phoneapp internal/external transitions. - * - * @lib phoneuicontrol - * @since S60 v9.2 - */ -class TPhoneTransitionHandler - { - public: - /** - * default constructor. - */ - TPhoneTransitionHandler( - CPhoneState& aState, - MPhoneViewCommandHandle& aViewCommandHandle ); - - /** - * Informs view to start Transition effect if effect - * type is feasible for current state. - * @param aType a transition effect, default none - * EndTransEffect() must be called when update is done. - */ - IMPORT_C void BeginTransEffectLC( TPhoneTransEffectType aType = EPhoneTransEffectNone ); - - /** - * Informs view to complete Transition effect - */ - IMPORT_C void EndTransEffect(); - - /** - * Informs view that UI is being updated (call bubble or number editor). - * EndUiUpdate() must be called when update is done. - */ - IMPORT_C void BeginUiUpdateLC(); - - /** - * Informs view that UI update is completed. - */ - IMPORT_C void EndUiUpdate(); - - /** - * Informs view that UI is being updated (call bubble or number editor). - * EndUiUpdate() must be called when update is done. - */ - IMPORT_C void IncomingCallUiUpdateLC(); - - /** - * Informs view that UI is being updated (call bubble or number editor). - * EndUiUpdate() must be called when update is done. - */ - IMPORT_C void IdleCallUiUpdateLC(); - - /** - * Informs view that UI update is completed. - */ - IMPORT_C void EndUiUpdateAndEffect(); - - private: - - /** - * TCleanupOperation to call EndUiUpdate(), if leave occurs - * after BeginUiUpdate(). - */ - static void UiUpdateCleanup(TAny* aThis ); - - /** - * TCleanupOperation to call EndTransEffect, if leave occurs - * after BeginTransEffect(). - */ - static void EffectCleanup(TAny* aThis ); - - private: - - // Not owned: - CPhoneState& iState; - MPhoneViewCommandHandle& iViewCommandHandle; - }; - - -#endif // TPHONETRANSITIONHANDLER_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp --- a/phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -22,7 +22,6 @@ #include #include #include -#include #include "cphoneaccessorybthandler.h" #include "cphonecenrepproxy.h" @@ -35,8 +34,6 @@ #include "phoneui.pan" #include "phonerssbase.h" #include "tphonecmdparamnote.h" -#include "tphonecmdparamglobalnote.h" - // CONSTANTS @@ -238,18 +235,18 @@ // void CPhoneAccessoryBTHandler::ShowBTActivatedL() { - - TPhoneCmdParamGlobalNote globalNoteParam; - globalNoteParam.SetType( EAknGlobalInformationNote ); - globalNoteParam.SetTone( EAvkonSIDNoSound ); + // Get localised text + HBufC* buf = StringLoader::LoadLC( + CPhoneMainResourceResolver::Instance()-> + ResolveResourceID( EPhoneInfoBTAccActivated ) ); + + TPhoneCmdParamNote noteParam; + noteParam.SetType( EPhoneNoteConfirmation ); + noteParam.SetText( *buf ); - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneInfoBTAccActivated ) ); - // Display note - iViewCommandHandle->ExecuteCommandL( - EPhoneViewShowGlobalNote, &globalNoteParam ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNote, ¬eParam ); + CleanupStack::PopAndDestroy( buf ); } // --------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp --- a/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -286,6 +286,16 @@ } // --------------------------------------------------------------------------- +// CPhoneCallHeaderManager::SetDivertIndication +// --------------------------------------------------------------------------- +// +void CPhoneCallHeaderManager::SetDivertIndication( const TBool aDivertIndication ) + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneCallHeaderManager::SetDivertIndication()"); + iCallHeaderParam->SetDivertIndication( aDivertIndication ); + } + +// --------------------------------------------------------------------------- // CPhoneCallHeaderManager::SetPhoneNumberAvailabilityL // --------------------------------------------------------------------------- // diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp --- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -156,7 +156,7 @@ ret = OfferKeyEventBeforeControlStackL( aKeyEvent, aType ); - if ( !aKeyEvent.iRepeats && aKeyEvent.iCode != EKeyEscape ) + if ( !aKeyEvent.iRepeats ) { // Convert event. Use already converted iKeyPressedDown. TKeyEvent keyEvent = aKeyEvent; @@ -756,7 +756,7 @@ { aCode = numCode; } - else + else { switch ( aKeyEvent.iScanCode ) { diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp --- a/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -270,9 +270,9 @@ else { // Effect is shown when dialer is created. - iState->TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectDialerCreate ); + iState->BeginTransEffectLC( ENumberEntryCreate ); iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry ); - iState->TransitionHandlerL().EndTransEffect(); + iState->EndTransEffect(); // Go to current state implementation iCbaManager.UpdateInCallCbaL(); iState->UpdateInCallContextMenuL(); @@ -433,8 +433,7 @@ else if( aKeyEvent.iCode == EKeyLeftArrow || aKeyEvent.iCode == EKeyRightArrow || aKeyEvent.iCode == EKeyUpArrow || - aKeyEvent.iCode == EKeyDownArrow || - aKeyEvent.iCode == EKeySpace ) + aKeyEvent.iCode == EKeyDownArrow ) { iViewCommandHandle.HandleCommandL( EPhoneViewSendKeyEventToNumberEntry, &keyEventParam ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonestate.cpp --- a/phoneapp/phoneuicontrol/src/cphonestate.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -56,7 +56,6 @@ #include #include #include -#include #include "phoneui.pan" #include "cphonestate.h" @@ -79,6 +78,7 @@ #include "tphonecmdparamaudiooutput.h" #include "tphonecmdparamaudioavailability.h" #include "tphonecmdparamappinfo.h" +#include "tphonecmdparamtranseffect.h" #include "tphonecmdparamringtone.h" #include "tphonecmdparamcustomdialer.h" #include "cphonekeys.h" @@ -117,7 +117,8 @@ MPhoneCustomization* aCustomization) : iStateMachine( aStateMachine ), iViewCommandHandle( aViewCommandHandle ), - iCustomization( aCustomization ) + iCustomization( aCustomization ), + iEnv( *CEikonEnv::Static() ) { // Need to get current SimState for inherited classis iPreviousSimState = SimState(); @@ -128,6 +129,9 @@ { iOnScreenDialer = ETrue; } + iStartupUiPhase = ( TPSStartupUiPhase )CPhonePubSubProxy::Instance()->Value( + KPSUidStartup, + KPSStartupUiPhase ); } EXPORT_C void CPhoneState::BaseConstructL() @@ -155,7 +159,6 @@ delete iNumberEntryManager; delete iCallHeaderManager; delete iCbaManager; - delete iTransitionHandler; } // <-------------------------- PHONE ENGINE EVENTS ---------------------------> @@ -472,7 +475,7 @@ else if ( RouteParameters.iShowNote && audioOutput == EPELoudspeaker ) { CAknKeySoundSystem* keySounds = - static_cast( EikonEnv()->EikAppUi() )->KeySounds(); + static_cast( iEnv.EikAppUi() )->KeySounds(); keySounds->PlaySound( EAvkonSIDIHFActive ); } } @@ -805,6 +808,9 @@ case ECCPErrorSatControl: { + // Re-enable global notes + EnableGlobalNotifiersL(); + // check, that there really was a call established before completing SAT request if( aErrorInfo.iCallId != KPECallIdNotUsed ) { @@ -1162,26 +1168,6 @@ } // ----------------------------------------------------------- -// CPhoneState::EikonEnv -// ----------------------------------------------------------- -// -EXPORT_C CEikonEnv* CPhoneState::EikonEnv() const - { - __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::EikonEnv( ) "); - return iEnv; - } - -// ----------------------------------------------------------- -// CPhoneState::SetEikonEnv -// ----------------------------------------------------------- -// -EXPORT_C void CPhoneState::SetEikonEnv( CEikonEnv* aEnv ) - { - __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SetEikonEnv( ) "); - iEnv = aEnv; - } - -// ----------------------------------------------------------- // CPhoneState::SendKeyEventL // ----------------------------------------------------------- // @@ -1495,15 +1481,22 @@ UpdateProfileDisplayL(); } } - else if ( aCategory == KPSUidStartup && aKey == KStartupSimSecurityStatus ) + else if ( aCategory == KPSUidStartup ) { - // Show security note, SIM is not valid. - if ( aValue == ESimRejected - || aValue == ESimUnaccepted - || aValue == ESimInvalid ) + if ( aKey == KStartupSimSecurityStatus ) { - __PHONELOG( EBasic, EPhoneControl, "CPhoneStateStartup::HandlePropertyChangedL - SimSecurity status received" ); - StartShowSecurityNoteL(); + // Show security note, SIM is not valid. + if ( aValue == ESimRejected + || aValue == ESimUnaccepted + || aValue == ESimInvalid ) + { + __PHONELOG( EBasic, EPhoneControl, "CPhoneStateStartup::HandlePropertyChangedL - SimSecurity status received" ); + StartShowSecurityNoteL(); + } + } + else if ( aKey == KPSStartupUiPhase ) + { + iStartupUiPhase = aValue; } } else if ( aCategory == KPSUidHWRM && aKey == KHWRMGripStatus ) @@ -1570,7 +1563,7 @@ // this should be bypasses? case EPhoneDialerCallHandling: case EPhoneCmdBack: - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear ); + CloseClearNumberEntryAndLoadEffectL( ECallUiAppear ); break; case EPhoneDialerCmdTouchInput: @@ -1920,7 +1913,7 @@ else { CAknKeySoundSystem* keySounds = - static_cast( EikonEnv()->EikAppUi() ) + static_cast( iEnv.EikAppUi() ) ->KeySounds(); if ( aLevel < KPhoneVolumeMinValue ) @@ -1975,10 +1968,7 @@ __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) ); // Disable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( ETrue ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + DisableGlobalNotifiersL(); iStateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeCSVoice ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageDial ); } @@ -2160,7 +2150,7 @@ if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength ) { - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear ); + CloseClearNumberEntryAndLoadEffectL( ECallUiAppear ); } CleanupStack::PopAndDestroy( phoneNumber ); @@ -2221,7 +2211,7 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateSingleActiveCallL( ) "); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); SetTouchPaneButtonEnabled( EPhoneInCallCmdHold ); @@ -2244,7 +2234,7 @@ HandleChangedCallDurationL( aCallId ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Go to current state implementation iCbaManager->UpdateInCallCbaL(); @@ -2621,10 +2611,7 @@ KPSUidUikon, KUikGlobalNotesAllowed ) == 1 ) { // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); TPhoneCmdParamGlobalNote globalNoteParam; @@ -2652,10 +2639,7 @@ SimState() == EPESimReadable ) { // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); TPhoneCmdParamGlobalNote globalNoteParam; globalNoteParam.SetType( EAknGlobalWarningNote ); @@ -2681,11 +2665,7 @@ KPSUidUikon, KUikGlobalNotesAllowed ) == 1 ) { // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - + EnableGlobalNotifiersL(); TPhoneCmdParamGlobalNote globalNoteParam; globalNoteParam.SetType( EAknGlobalErrorNote ); globalNoteParam.SetTextResourceId( @@ -3377,6 +3357,16 @@ } // --------------------------------------------------------- +// CPhoneState::SetDivertIndication +// --------------------------------------------------------- +// +EXPORT_C void CPhoneState::SetDivertIndication( const TBool aDivertIndication ) + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::SetDivertIndication()"); + TRAP_IGNORE( CallheaderManagerL()->SetDivertIndication( aDivertIndication ) ); + } + +// --------------------------------------------------------- // CPhoneState::StartAlsLineChangeTimerL // --------------------------------------------------------- // @@ -3666,10 +3656,7 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::ShowNumberBusyNoteL( ) "); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); TInt resource( EPhoneNumberBusy ); @@ -3682,21 +3669,9 @@ // Show number busy note TPhoneCmdParamGlobalNote globalNoteParam; globalNoteParam.SetType( EAknGlobalInformationNote ); - - if ( CPhoneCenRepProxy::Instance()-> - IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) ) - { - // Show varied Number busy -note when clear code customization - // is enabled - globalNoteParam.SetTextResourceId( R_NOTE_VAR_CAUSE_17 ); - } - else - { - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( resource ) ); - } - + globalNoteParam.SetTextResourceId( + CPhoneMainResourceResolver::Instance()-> + ResolveResourceID( resource ) ); globalNoteParam.SetTone( EAvkonSIDInformationTone ); iViewCommandHandle->ExecuteCommandL( EPhoneViewShowGlobalNote, &globalNoteParam ); @@ -3867,6 +3842,72 @@ } // ----------------------------------------------------------- +// CPhoneState::BeginUiUpdateLC +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::BeginUiUpdateLC() + { + iViewCommandHandle->ExecuteCommand( EPhoneViewBeginUpdate ); + TCleanupItem operation( UiUpdateCleanup, this ); + CleanupStack::PushL( operation ); + } + +// ----------------------------------------------------------- +// CPhoneState::EndUiUpdate +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::EndUiUpdate() + { + CleanupStack::PopAndDestroy(); // Call UiUpdateCleanup + } + +// ----------------------------------------------------------- +// CPhoneState::BeginTransEffectLC +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::BeginTransEffectLC( TStateTransEffectType aType ) + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::BeginTransEffectLC( ) "); + TPhoneCmdParamTransEffect effectParam; + switch ( aType ) + { + case ENumberEntryOpen: + effectParam.SetType( EPhoneTransEffectDialerOpen ); + break; + case ENumberEntryClose: + effectParam.SetType( EPhoneTransEffectDialerClose ); + break; + case ENumberEntryCreate: + effectParam.SetType( EPhoneTransEffectDialerCreate ); + break; + case ECallUiAppear: + effectParam.SetType( EPhoneTransEffectCallUiAppear ); + break; + case ECallUiDisappear: + effectParam.SetType( EPhoneTransEffectCallUiDisappear ); + break; + default: + effectParam.SetType( EPhoneTransEffectNone ); + } + effectParam.SetAppUid( KUidPhoneApplication ); + iViewCommandHandle->ExecuteCommand( + EPhoneViewBeginTransEffect, + &effectParam ); + // Always put the cleanup item into stack as expected by the caller. + TCleanupItem operation( EffectCleanup, this ); + CleanupStack::PushL( operation ); + } + +// ----------------------------------------------------------- +// CPhoneState::EndTransEffect +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::EndTransEffect() + { + CleanupStack::PopAndDestroy(); // Call EffectCleanup + } + +// ----------------------------------------------------------- // CPhoneState::CheckIfShowTerminationNote // This method is intended to be overridden in states // that contain more info about decision. @@ -3904,6 +3945,29 @@ } // ----------------------------------------------------------------------------- +// CPhoneState::UiUpdateCleanup +// ----------------------------------------------------------------------------- +// +void CPhoneState::UiUpdateCleanup(TAny* aThis ) + { + static_cast( aThis )->iViewCommandHandle->ExecuteCommand( + EPhoneViewEndUpdate ); + } + +// ----------------------------------------------------------------------------- +// CPhoneState::EffectCleanup +// ----------------------------------------------------------------------------- +// +void CPhoneState::EffectCleanup(TAny* aThis ) + { + TPhoneCmdParamTransEffect effectParam; + effectParam.SetType( EPhoneTransEffectStop ); + // won't do anything if effect wasn't started + static_cast( aThis )->iViewCommandHandle->ExecuteCommand( + EPhoneViewEndTransEffect, &effectParam ); + } + +// ----------------------------------------------------------------------------- // CPhoneState::IsDTMFEditorVisibleL // ----------------------------------------------------------------------------- // @@ -3929,7 +3993,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible, &booleanParam ); - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear ); + CloseClearNumberEntryAndLoadEffectL( ECallUiAppear ); } else // Non-Touch { @@ -3960,12 +4024,8 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); + EnableEikonNotifiersL(); // uncapture App and Camera keys if not security mode if ( !iStateMachine->SecurityMode()->IsSecurityMode() ) @@ -4002,10 +4062,7 @@ "CPhoneState::ShowVideoCallOutOfMemoryNoteL()" ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; @@ -4237,21 +4294,6 @@ } // ----------------------------------------------------------- -// CPhoneState::TransitionHandlerL -// ----------------------------------------------------------- -// -EXPORT_C TPhoneTransitionHandler& CPhoneState::TransitionHandlerL() - { - __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::TransitionHandlerL() "); - if ( !iTransitionHandler ) - { - iTransitionHandler = new (ELeave)TPhoneTransitionHandler( - *this, *iViewCommandHandle ); - } - return *iTransitionHandler; - } - -// ----------------------------------------------------------- // CPhoneState::CallheaderManagerL // ----------------------------------------------------------- // @@ -4277,7 +4319,7 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::CloseCustomizedDialerL( ) "); // Set dialer back to default mode. iViewCommandHandle->HandleCommandL( EPhoneViewHideCustomizedDialer ); - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose ); + CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose ); } // ----------------------------------------------------------------------------- @@ -4326,8 +4368,7 @@ booleanParam.SetBoolean( ETrue ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible, &booleanParam ); - TransitionHandlerL(). - BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ); + BeginTransEffectLC( ECallUiDisappear ); if ( IsNumberEntryUsedL() ) { // Store the number entry content to cache @@ -4344,7 +4385,7 @@ // Create and display DTMF dialer NumberEntryManagerL()->CreateNumberEntryL(); } - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); // Update CBA iCbaManager->UpdateInCallCbaL(); @@ -4412,7 +4453,7 @@ __PHONELOG1( EBasic, EPhoneControl, "CPhoneState::LoadResource - aResource: %d", aResource ); StringLoader::Load( aData, CPhoneMainResourceResolver::Instance()->ResolveResourceID( aResource ), - EikonEnv() ); + &iEnv ); } // ----------------------------------------------------------- @@ -4682,21 +4723,6 @@ } // --------------------------------------------------------- -// CPhoneState::SetToolbarButtonBTHFEnabled -// --------------------------------------------------------- -// -EXPORT_C void CPhoneState::SetToolbarButtonBTHFEnabled() - { - if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) ) - { - TPhoneCmdParamInteger integerParam; - integerParam.SetInteger( EPhoneInCallCmdBtHandsfree ); - iViewCommandHandle->ExecuteCommand( - EPhoneViewEnableToolbarButton, &integerParam ); - } - } - -// --------------------------------------------------------- // CPhoneState::HandleEasyDialingCommandsL // --------------------------------------------------------- // @@ -4807,8 +4833,8 @@ EXPORT_C void CPhoneState::DisplayCallSetupL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::DisplayCallSetupL() "); - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiAppear ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginTransEffectLC( ECallUiAppear ); + BeginUiUpdateLC(); SetNumberEntryVisibilityL( EFalse ); CaptureKeysDuringCallNotificationL( ETrue ); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); @@ -4820,25 +4846,12 @@ // Do state-specific operations. DoStateSpecificCallSetUpDefinitionsL(); DisplayHeaderForOutgoingCallL(aCallId); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); iCbaManager->UpdateCbaL(EPhoneCallHandlingCallSetupCBA); } // ----------------------------------------------------------- -// Sends command to viewcontroller to store the flag -// ----------------------------------------------------------- -// -EXPORT_C void CPhoneState::SetNeedToReturnToForegroundAppStatusL( - TBool aNeedToReturn ) - { - TPhoneCmdParamBoolean booleanParam; - booleanParam.SetBoolean( aNeedToReturn ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewSetNeedToReturnToForegroundAppStatus, - &booleanParam ); - } - -// ----------------------------------------------------------- // CPhoneState::DoStateSpecificCallSetUpDefinitionsL // ----------------------------------------------------------- // @@ -4852,16 +4865,77 @@ // ----------------------------------------------------------- // EXPORT_C void CPhoneState::CloseClearNumberEntryAndLoadEffectL( - TPhoneTransEffectType aType ) + TStateTransEffectType aType ) { __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::CloseClearNumberEntryAndLoadEffectL() "); - TransitionHandlerL().BeginTransEffectLC( aType ); + BeginTransEffectLC( aType ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); // Do state-specific operation when number entry is cleared HandleNumberEntryClearedL(); } +// ----------------------------------------------------------- +// CPhoneState::AllStartupQueriesDisplayed +// ----------------------------------------------------------- +// +TBool CPhoneState::AllStartupQueriesDisplayed() + { + return ( EStartupUiPhaseAllDone == iStartupUiPhase ); + } + +// ----------------------------------------------------------- +// CPhoneState::EnableGlobalNotifiersL +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::EnableGlobalNotifiersL() + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::EnableGlobalNotifiersL() "); + TPhoneCmdParamBoolean globalNotifierParam; + globalNotifierParam.SetBoolean( EFalse ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, + &globalNotifierParam ); + } + +// ----------------------------------------------------------- +// CPhoneState::DisableGlobalNotifiersL +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::DisableGlobalNotifiersL() + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::DisableGlobalNotifiersL() "); + TPhoneCmdParamBoolean globalNotifierParam; + globalNotifierParam.SetBoolean( ETrue ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, + &globalNotifierParam ); + } + +// ----------------------------------------------------------- +// CPhoneState::EnableEikonNotifiersL +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::EnableEikonNotifiersL() + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::EnableEikonNotifiersL() "); + TPhoneCmdParamBoolean eikonNotifierParam; + eikonNotifierParam.SetBoolean( EFalse ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, + &eikonNotifierParam ); + } + +// ----------------------------------------------------------- +// CPhoneState::DisableEikonNotifiersL +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneState::DisableEikonNotifiersL() + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::DisableEikonNotifiersL() "); + TPhoneCmdParamBoolean eikonNotifierParam; + eikonNotifierParam.SetBoolean( ETrue ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, + &eikonNotifierParam ); + } + // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp --- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -87,23 +87,11 @@ // Enable the volume display iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume ); HandleAudioOutputChangedL(); - - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateDialing ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() > KErrNotFound && IsVideoCall( callStateData.CallId() ) ) - { - CPhonePubSubProxy::Instance()->ChangePropertyValue( - KPSUidScreenSaver, - KScreenSaverAllowScreenSaver, - EPhoneScreensaverNotAllowed ); - } - - if ( IsKeyLockOn() ) - { - iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote ); - } - + + CPhonePubSubProxy::Instance()->ChangePropertyValue( + KPSUidScreenSaver, + KScreenSaverAllowScreenSaver, + EPhoneScreensaverNotAllowed ); } // ----------------------------------------------------------- @@ -576,10 +564,12 @@ // void CPhoneStateCallSetup::HandleConnectedL( TInt aCallId ) { - __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()"); + __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()"); + + // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Remove the number entry if it isn't DTMF dialer if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() ) @@ -601,9 +591,11 @@ SetToolbarDimming( EFalse ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + // Go to single state UpdateCbaL( EPhoneCallHandlingInCallCBA ); + iStateMachine->ChangeState( EPhoneStateSingle ); } @@ -617,15 +609,13 @@ if ( !NeedToReturnToForegroundAppL() && IsNumberEntryUsedL() ) { - TransitionHandlerL(). - BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ); + BeginTransEffectLC( ECallUiDisappear ); } else { - TransitionHandlerL(). - BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); + BeginTransEffectLC( ENumberEntryOpen ); } - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Disable the volume display iViewCommandHandle->ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume ); @@ -638,21 +628,8 @@ if ( IsNumberEntryUsedL() ) { - if ( NeedToReturnToForegroundAppL() ) - { - // Return phone to the background if send to background is needed. - iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); - - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility ); - - // Set Number Entry CBA - iCbaManager->SetCbaL( EPhoneNumberAcqCBA ); - } - else - { - // Show the number entry if it exists - SetNumberEntryVisibilityL(ETrue); - } + // Show the number entry if it exists + SetNumberEntryVisibilityL(ETrue); } else if ( NeedToReturnToForegroundAppL() ) { @@ -668,7 +645,8 @@ DisplayIdleScreenL(); } - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); // No need update cba iStateMachine->ChangeState( EPhoneStateIdle ); } @@ -684,10 +662,7 @@ // Remove call header iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewSetGlobalNotifiersDisabled, &globalNotifierParam ); + EnableGlobalNotifiersL(); // Video call not possible note is shown by // CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL method, diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonestateidle.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -109,7 +109,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewGetForegroundApplication, &foregroundAppParam ); - if ( !IsSimOk() ) + if ( !IsSimOk() && KUidPhoneApplication.iUid != foregroundAppParam.Integer() ) { TPhoneCmdParamInteger uidParam; // Bring Phone app in the foreground @@ -420,8 +420,11 @@ void CPhoneStateIdle::HandleIncomingL( TInt aCallId ) { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIncomingL( ) "); + HandleAudioAvailableOutputChangedL(); + iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume ); + SetRingingTonePlaybackL( aCallId ); CPhonePubSubProxy::Instance()->ChangePropertyValue( @@ -429,7 +432,10 @@ KScreenSaverAllowScreenSaver, EPhoneScreensaverNotAllowed ); - TransitionHandlerL().IncomingCallUiUpdateLC(); + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiAppear ) : + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -438,16 +444,20 @@ } // Close fast swap window if it's displayed - EikonEnv()->DismissTaskList(); + CEikonEnv::Static()->DismissTaskList(); // Show incoming call buttons SetTouchPaneButtons( EPhoneIncomingCallButtons ); SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent ); SetTouchPaneButtonEnabled( EPhoneInCallCmdHold ); + // Display incoming call DisplayIncomingCallL( aCallId ); - TransitionHandlerL().EndUiUpdateAndEffect(); + + EndUiUpdate(); + EndTransEffect(); + // Go to incoming state iCbaManager->UpdateIncomingCbaL( aCallId ); UpdateSilenceButtonDimming(); UpdateIncomingContextMenuL( aCallId ); @@ -455,7 +465,11 @@ SetToolbarDimming( ETrue ); //request that dimmed toolbar is visible. iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar ); + ChangeTo( EPhoneStateIncoming ); + + // Reset divert indication + SetDivertIndication( EFalse ); } // ----------------------------------------------------------- @@ -467,10 +481,6 @@ EXPORT_C void CPhoneStateIdle::HandleDialingL( TInt aCallId ) { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleDialingL( ) "); - // Indicate that the Phone needs to be sent to the background if - // an application other than phone or idle application is in the foreground - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); - DisplayCallSetupL( aCallId ); ChangeTo( EPhoneStateCallSetup ); } @@ -488,7 +498,6 @@ SetToolbarDimming( ETrue ); SetToolbarButtonLoudspeakerEnabled(); SetToolbarButtonHandsetEnabled(); - SetToolbarButtonBTHFEnabled(); TPhoneCmdParamInteger uidParam; uidParam.SetInteger( KUidPhoneApplication.iUid ); @@ -519,8 +528,8 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground, &uidParam ); } - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginTransEffectLC( ENumberEntryClose ); + BeginUiUpdateLC(); // Remove the number entry iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); @@ -535,8 +544,10 @@ SetTouchPaneButtons( EPhoneIncallButtons ); SetToolbarDimming( EFalse ); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); + // Go to single state iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA ); ChangeTo( EPhoneStateSingle ); } @@ -574,15 +585,15 @@ break; case EPhoneCmdBack: - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose ); + BeginTransEffectLC( ENumberEntryClose ); HandleBackCommandL(); - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); break; case EPhoneViewOpenNumberEntry: - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); + BeginTransEffectLC( ENumberEntryOpen ); commandStatus = CPhoneState::HandleCommandL( aCommand ); - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); break; default: @@ -761,8 +772,12 @@ // Indicate that the Foreground application needs to be sent to the foreground // after call is ended. - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); - + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); + // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; uidParam.SetInteger( KUidPhoneApplication.iUid ); @@ -774,12 +789,8 @@ &uidParam ); // Disable global notes when there is an incoming call - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( ETrue ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); + DisableGlobalNotifiersL(); + DisableEikonNotifiersL(); DisplayHeaderForCallComingInL( aCallId, EFalse ); //not waiting } @@ -880,7 +891,7 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleL()" ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveAllCallHeaders ); - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiDisappear ); + CloseClearNumberEntryAndLoadEffectL( ECallUiDisappear ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs ); // Reset flag. SetCallInitialized( EFalse ); @@ -926,7 +937,7 @@ "CPhoneStateIdle::RemoveNumberEntryAndSetIdleToBackgroundIfNeededL( ) "); if ( IsNumberEntryUsedL() ) { - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiAppear ); + BeginTransEffectLC( ECallUiAppear ); /*NE should be removed because if speeddial dial is interupted during call setup phone should not return to NE/Dialler view.*/ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); @@ -938,7 +949,7 @@ iCbaManager->UpdateCbaL( EPhoneEmptyCBA ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetIdleTopApplication ); } - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); } } @@ -1032,7 +1043,7 @@ if ( numberEntryCountParam.Integer() == 1 ) { // Remove the number entry window - iViewCommandHandle->ExecuteCommandL( EPhoneViewClearNumberEntryContent ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF ); @@ -1041,6 +1052,9 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewLaunchApplication ); + // Continue displaying current app but set up the + // idle screen in the background + SetupIdleScreenInBackgroundL(); } } @@ -1051,18 +1065,18 @@ void CPhoneStateIdle::SendExitCommandL() { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::SendExitCommand( ) "); - // Remove number entry from screen - iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); + // Remove number entry from screen + iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); - // Simulate exit command - RWsSession& wsSession = EikonEnv()->WsSession(); - TKeyEvent keyEvent; - keyEvent.iCode = EEikCmdExit; - keyEvent.iScanCode = EEikCmdExit; - keyEvent.iModifiers = 0; - keyEvent.iRepeats = 0; - wsSession.SimulateKeyEvent( keyEvent ); - wsSession.Flush(); + // Simulate exit command + RWsSession& wsSession = CEikonEnv::Static()->WsSession(); + TKeyEvent keyEvent; + keyEvent.iCode = EEikCmdExit; + keyEvent.iScanCode = EEikCmdExit; + keyEvent.iModifiers = 0; + keyEvent.iRepeats = 0; + wsSession.SimulateKeyEvent( keyEvent ); + wsSession.Flush(); } // ----------------------------------------------------------- @@ -1090,8 +1104,8 @@ { iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs ); } - - if ( IsSimOk() ) + // Handle end key if all startup related queries and graphics have been displayed. + if ( IsSimOk() && AllStartupQueriesDisplayed() ) { if ( aMessage == EPhoneKeyLongPress ) { @@ -1101,20 +1115,19 @@ if ( IsNumberEntryUsedL() ) { - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose ); + CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose ); // If long end key event occures then all calls are terminated and // dialer is closed, therefore tel.icon must be removed from FSW. iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW ); } if ( !TopAppIsDisplayedL() ) { - // Display idle screen DisplayIdleScreenL(); } } else if ( IsNumberEntryUsedL() && TopAppIsDisplayedL() ) { - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose ); + CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose ); } else if ( !TopAppIsDisplayedL() ) { diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonestateincall.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -309,30 +309,42 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::HandleIdleL()" ); __ASSERT_DEBUG( aCallId >= 0, Panic( EPhoneCtrlParameterNotInitialized ) ); - TransitionHandlerL().IdleCallUiUpdateLC(); - + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiDisappear ) : + BeginTransEffectLC( ENumberEntryClose ); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar ); SetDefaultFlagsL(); if ( IsNumberEntryUsedL() ) { - // Show the number entry if it exists and update cba's. - SetNumberEntryVisibilityL( ETrue ); - // Close dtmf dialer when call is disconnected. - if ( IsDTMFEditorVisibleL() ) - { - CloseDTMFEditorL(); - // Display idle screen and update CBA's - DisplayIdleScreenL(); + if ( NeedToReturnToForegroundAppL() ) + { + // Return phone to the background if menu application is needed to foreground. + iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility ); + iCbaManager->SetCbaL( EPhoneNumberAcqCBA ); } - else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() ) - { - CloseCustomizedDialerL(); - // Display idle screen and update CBA's - DisplayIdleScreenL(); - } - } + else + { + // Show the number entry if it exists and update cba's. + SetNumberEntryVisibilityL( ETrue ); + // Close dtmf dialer when call is disconnected. + if ( IsDTMFEditorVisibleL() ) + { + CloseDTMFEditorL(); + // Display idle screen and update CBA's + DisplayIdleScreenL(); + } + else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() ) + { + CloseCustomizedDialerL(); + // Display idle screen and update CBA's + DisplayIdleScreenL(); + } + } + } else { iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); @@ -350,7 +362,8 @@ } DeleteTouchPaneButtons(); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); DisplayCallTerminationNoteL(); iStateMachine->ChangeState( EPhoneStateIdle ); iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar ); @@ -404,26 +417,6 @@ // Go to current state implementation UpdateInCallCbaL(); } - TBool audioMute = iStateMachine->PhoneEngineInfo()->AudioMute(); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnected ); - iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, &callStateData ); - TInt call = callStateData.CallId(); - if ( call != KErrNotFound && iStateMachine->PhoneEngineInfo()->CallType( call ) == EPECallTypeVoIP - && audioMute ) - { - TPhoneCmdParamBoolean dtmfSendFlag; - dtmfSendFlag.SetBoolean( ETrue ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetVoipCallDTMFVisibilityFlag, - &dtmfSendFlag ); - } - else - { - TPhoneCmdParamBoolean dtmfSendFlag; - dtmfSendFlag.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetVoipCallDTMFVisibilityFlag, - &dtmfSendFlag ); - } } // ----------------------------------------------------------- @@ -606,14 +599,13 @@ switch( aCommand ) { case EPhoneInCallCmdDialer: - TransitionHandlerL(). - BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ); + BeginTransEffectLC( ECallUiDisappear ); if ( !IsNumberEntryUsedL() ) { CreateNumberEntryL(); } SetNumberEntryVisibilityL( ETrue ); - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); break; case EPhoneCmdOptions: @@ -847,11 +839,10 @@ case EPhoneViewOpenCallHandling: if ( iOnScreenDialer && IsNumberEntryUsedL() ) { - TransitionHandlerL(). - BeginTransEffectLC( EPhoneTransEffectCallUiAppear ); + BeginTransEffectLC( ECallUiAppear ); // Remove number entry from screen iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); HandleNumberEntryClearedL(); } commandStatus = CPhoneState::HandleCommandL( aCommand ); @@ -926,8 +917,7 @@ if ( iOnScreenDialer ) { //In touch, just activate dialer - TransitionHandlerL(). - BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ); + BeginTransEffectLC( ECallUiDisappear ); if ( IsNumberEntryUsedL() ) { SetNumberEntryVisibilityL(ETrue); @@ -937,7 +927,7 @@ CreateNumberEntryL(); SetNumberEntryVisibilityL(ETrue); } - TransitionHandlerL().EndTransEffect(); + EndTransEffect(); } else { @@ -1556,7 +1546,7 @@ } else { - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose ); + CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose ); } } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonestateincoming.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -362,20 +362,16 @@ __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::HandleConnectedL ()" ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); + EnableEikonNotifiersL(); // Stop tone playing, if necessary iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update single call UpdateSingleActiveCallL( aCallId ); SetTouchPaneButtons( EPhoneIncallButtons ); SetToolbarDimming( EFalse ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateSingle ); } @@ -422,15 +418,13 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::HandleIdleL ()" ); - TransitionHandlerL().IdleCallUiUpdateLC(); + BeginTransEffectLC( ENumberEntryClose ); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone ); - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); + EnableEikonNotifiersL(); SetDefaultFlagsL(); @@ -462,7 +456,8 @@ } DeleteTouchPaneButtons(); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); iCbaManager->UpdateCbaL( EPhoneEmptyCBA ); iStateMachine->ChangeState( EPhoneStateIdle ); } @@ -635,10 +630,7 @@ MPEPhoneModel::EPEMessageStopTonePlay ); // Re-enable global notes. Otherwise message editor is not opened. - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); + EnableEikonNotifiersL(); // Change the CBA to Options..Reject iCbaManager->SetCbaL( EPhoneCallHandlingIncomingRejectCBA ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonestatemachine.cpp --- a/phoneapp/phoneuicontrol/src/cphonestatemachine.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonestatemachine.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -41,8 +41,7 @@ MPhoneViewCommandHandle* aViewCommandHandle ) : iOldStateId( EPhoneStateNull ), iNewStateId( EPhoneStateNull ), - iViewCommandHandle( aViewCommandHandle ), - iEnv( CEikonEnv::Static() ) // codescanner::eikonenvstatic + iViewCommandHandle( aViewCommandHandle ) { __ASSERT_ALWAYS( aViewCommandHandle, Panic( EPhoneCtrlParameterNotInitialized ) ); @@ -225,14 +224,5 @@ } State()->HandlePropertyChangedL( aCategory, aKey, aValue ); } - -// ----------------------------------------------------------- -// CPhoneStateMachine::EikonEnv -// ----------------------------------------------------------- -// -EXPORT_C CEikonEnv* CPhoneStateMachine::EikonEnv() const - { - return iEnv; - } // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp --- a/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -97,6 +97,11 @@ KCoreAppUIsAutolockStatus, this ); + // Set up notifications for startup ui sequence phase changes. + CPhonePubSubProxy::Instance()->NotifyChangeL( + KPSUidStartup, + KPSStartupUiPhase, + this ); if ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported( KTelephonyLVFlagSwivelInDevice )) diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp --- a/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -71,7 +71,7 @@ // Create the key event forwarder iKeyEventForwarder = CPhoneKeyEventForwarder::NewL( - CEikonEnv::Static()->EikAppUi()->ClientRect(), iStateMachine, &aViewController ); // codescanner::eikonenvstatic + CEikonEnv::Static()->EikAppUi()->ClientRect(), iStateMachine, &aViewController ); TInt leaveCode( 0 ); TInt retry( 0 ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp --- a/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -43,7 +43,8 @@ MPhoneStateMachine& aStateMachine ) : iManagerUtility ( aManagerUtility ), iStateMachine ( aStateMachine ), - iCallHeaderType ( CBubbleManager::ENormal ) + iCallHeaderType ( CBubbleManager::ENormal ), + iSetDivertIndication ( EFalse ) { } @@ -487,8 +488,7 @@ TPhoneCmdParamCallHeaderData* aCallHeaderData ) { __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndicatorToCallHeader( ) "); - TBool forwarded = iStateMachine.PhoneEngineInfo()->CallForwarded( aCallId ); - if ( forwarded ) + if( iSetDivertIndication ) { aCallHeaderData->AddCallFlag( CBubbleManager::EDiverted ); } @@ -502,6 +502,19 @@ } // --------------------------------------------------------------------------- +// TPhoneCallHeaderParam::SetDivertIndication +// --------------------------------------------------------------------------- +// +void TPhoneCallHeaderParam::SetDivertIndication( const TBool aDivertIndication ) + { + __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndication( ) "); + iSetDivertIndication = aDivertIndication; + __PHONELOG1( EBasic, EPhoneControl, + "TPhoneCallHeaderParam::SetDivertIndication() - iSetDivertIndication: %d ", + iSetDivertIndication ) + } + +// --------------------------------------------------------------------------- // TPhoneCallHeaderParam::SetIncomingCallHeaderParamsL // --------------------------------------------------------------------------- // @@ -597,15 +610,7 @@ else { aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()-> - RemotePhoneNumber( aCallId ), CBubbleManager::ELeft ); - - // No contact name, use phonenumber when available. - if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() - && !ContactInfoAvailable( aCallId ) ) - { - aCallHeaderData->SetParticipantListCLI( - TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText ); - } + RemotePhoneNumber( aCallId ), CBubbleManager::ELeft ); } } else @@ -645,9 +650,6 @@ SetCallerImage( aCallId, aCallHeaderData ); - - // Update divert indication - SetDivertIndicatorToCallHeader( aCallId, aCallHeaderData ); } // --------------------------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuicontrol/src/tphonetransitionhandler.cpp --- a/phoneapp/phoneuicontrol/src/tphonetransitionhandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,156 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Class handles phoneapp internal/external transitions. -* -*/ - -#include "tphonetransitionhandler.h" -#include "cphonestate.h" -#include "phonelogger.h" - -// --------------------------------------------------------------------------- -// TPhoneTransitionHandler::TPhoneTransitionHandler -// --------------------------------------------------------------------------- -// -TPhoneTransitionHandler::TPhoneTransitionHandler( - CPhoneState& aState, - MPhoneViewCommandHandle& aViewCommandHandle ) - : iState ( aState ), - iViewCommandHandle ( aViewCommandHandle ) - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::TPhoneTransitionHandler( ) "); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::BeginUiUpdateLC -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::BeginUiUpdateLC() - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::BeginUiUpdateLC( ) "); - iViewCommandHandle.ExecuteCommand( EPhoneViewBeginUpdate ); - TCleanupItem operation( UiUpdateCleanup, this ); - CleanupStack::PushL( operation ); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::EndUiUpdate -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::EndUiUpdate() - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::EndUiUpdate( ) "); - CleanupStack::PopAndDestroy(); // Call UiUpdateCleanup - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::IncomingCallUiUpdateLC -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::IncomingCallUiUpdateLC() - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::IncomingCallUiUpdateLC( ) "); - iState.IsNumberEntryUsedL() ? - BeginTransEffectLC( EPhoneTransEffectCallUiAppear ) : - BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); - BeginUiUpdateLC(); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::IdleCallUiUpdateLC -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::IdleCallUiUpdateLC() - { - __LOGMETHODSTARTEND( EPhoneControl, "TPhoneTransitionHandler::IdleCallUiUpdateLC( ) "); - iState.IsNumberEntryUsedL() ? - BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ) : - BeginTransEffectLC( EPhoneTransEffectPhoneUiClose ); - BeginUiUpdateLC(); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::EndUiUpdateAndEffect -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::EndUiUpdateAndEffect() - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::EndUiUpdateAndEffect( ) "); - EndUiUpdate(); - EndTransEffect(); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::BeginTransEffectLC -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::BeginTransEffectLC( TPhoneTransEffectType aType ) - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::BeginTransEffectLC( ) "); - TPhoneCmdParamTransEffect effectParam; - effectParam.SetType( aType ); - effectParam.SetAppUid( KUidPhoneApplication ); - iViewCommandHandle.ExecuteCommand( - EPhoneViewBeginTransEffect, - &effectParam ); - // Always put the cleanup item into stack as expected by the caller. - TCleanupItem operation( EffectCleanup, this ); - CleanupStack::PushL( operation ); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::EndTransEffect -// ----------------------------------------------------------------------------- -// -EXPORT_C void TPhoneTransitionHandler::EndTransEffect() - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::EndTransEffect( ) "); - CleanupStack::PopAndDestroy(); // Call EffectCleanup - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::UiUpdateCleanup -// ----------------------------------------------------------------------------- -// -void TPhoneTransitionHandler::UiUpdateCleanup(TAny* aThis ) - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::UiUpdateCleanup( ) "); - static_cast( aThis )-> - iViewCommandHandle.ExecuteCommand( EPhoneViewEndUpdate ); - } - -// ----------------------------------------------------------------------------- -// TPhoneTransitionHandler::EffectCleanup -// ----------------------------------------------------------------------------- -// -void TPhoneTransitionHandler::EffectCleanup(TAny* aThis ) - { - __LOGMETHODSTARTEND( EPhoneControl, - "TPhoneTransitionHandler::EffectCleanup( ) "); - TPhoneCmdParamTransEffect effectParam; - effectParam.SetType( EPhoneTransEffectStop ); - // won't do anything if effect wasn't started - static_cast( aThis )-> - iViewCommandHandle.ExecuteCommand( - EPhoneViewEndTransEffect, &effectParam ); - } - diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/bwins/phoneuistatesu.def --- a/phoneapp/phoneuistates/bwins/phoneuistatesu.def Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/bwins/phoneuistatesu.def Wed Oct 13 14:31:22 2010 +0300 @@ -1,22 +1,22 @@ EXPORTS - ?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 1 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void) - ?DoStateSpecificCallSetUpDefinitionsL@CPhoneSingleCall@@UAEXXZ @ 2 NONAME ; void CPhoneSingleCall::DoStateSpecificCallSetUpDefinitionsL(void) - ?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 3 NONAME ; void CPhoneTwoSingles::ConstructL(void) - ?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 4 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int) - ?HandleKeyMessageL@CPhoneAlerting@@MAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneAlerting::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) - ?HandleKeyMessageL@CPhoneTwoSingles@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 6 NONAME ; void CPhoneTwoSingles::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) - ??0CPhoneIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 7 NONAME ; CPhoneIncoming::CPhoneIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ??0CPhoneSingleCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 8 NONAME ; CPhoneSingleCall::CPhoneSingleCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?HandleCommandL@CPhoneSingleCall@@UAEHH@Z @ 9 NONAME ; int CPhoneSingleCall::HandleCommandL(int) - ?ConstructL@CPhoneCallSetup@@MAEXXZ @ 10 NONAME ; void CPhoneCallSetup::ConstructL(void) - ??0CPhoneErrorMessagesHandler@@IAE@PAVMPhoneViewCommandHandle@@PAVMPhoneStateMachine@@@Z @ 11 NONAME ; CPhoneErrorMessagesHandler::CPhoneErrorMessagesHandler(class MPhoneViewCommandHandle *, class MPhoneStateMachine *) - ?HandlePhoneEngineMessageL@CPhoneStartupSimlockUi@@UAEXHH@Z @ 12 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneEngineMessageL(int, int) - ??1CPhoneTwoSingles@@UAE@XZ @ 13 NONAME ; CPhoneTwoSingles::~CPhoneTwoSingles(void) - ?HandleDisconnectingL@CPhoneAlerting@@IAEXH@Z @ 14 NONAME ; void CPhoneAlerting::HandleDisconnectingL(int) - ??0CPhoneIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 15 NONAME ; CPhoneIdle::CPhoneIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?ShowErrorSpecificNoteL@CPhoneErrorMessagesHandler@@UAEXABUTPEErrorInfo@@@Z @ 16 NONAME ; void CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL(struct TPEErrorInfo const &) - ?HandleErrorL@CPhoneConferenceAndSingleAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 17 NONAME ; void CPhoneConferenceAndSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &) - ??0CPhoneStateMachineGSM@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 18 NONAME ; CPhoneStateMachineGSM::CPhoneStateMachineGSM(class MPhoneViewCommandHandle *) + ?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 1 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void) + ?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 2 NONAME ; void CPhoneTwoSingles::ConstructL(void) + ?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 3 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int) + ?HandleKeyMessageL@CPhoneAlerting@@MAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4 NONAME ; void CPhoneAlerting::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ?HandleKeyMessageL@CPhoneTwoSingles@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneTwoSingles::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) + ??0CPhoneIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 6 NONAME ; CPhoneIncoming::CPhoneIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ??0CPhoneSingleCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 7 NONAME ; CPhoneSingleCall::CPhoneSingleCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?HandleCommandL@CPhoneSingleCall@@UAEHH@Z @ 8 NONAME ; int CPhoneSingleCall::HandleCommandL(int) + ?ConstructL@CPhoneCallSetup@@MAEXXZ @ 9 NONAME ; void CPhoneCallSetup::ConstructL(void) + ??0CPhoneErrorMessagesHandler@@IAE@PAVMPhoneViewCommandHandle@@PAVMPhoneStateMachine@@@Z @ 10 NONAME ; CPhoneErrorMessagesHandler::CPhoneErrorMessagesHandler(class MPhoneViewCommandHandle *, class MPhoneStateMachine *) + ?HandlePhoneEngineMessageL@CPhoneStartupSimlockUi@@UAEXHH@Z @ 11 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneEngineMessageL(int, int) + ??1CPhoneTwoSingles@@UAE@XZ @ 12 NONAME ; CPhoneTwoSingles::~CPhoneTwoSingles(void) + ?HandleDisconnectingL@CPhoneAlerting@@IAEXH@Z @ 13 NONAME ; void CPhoneAlerting::HandleDisconnectingL(int) + ??0CPhoneIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 14 NONAME ; CPhoneIdle::CPhoneIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?ShowErrorSpecificNoteL@CPhoneErrorMessagesHandler@@UAEXABUTPEErrorInfo@@@Z @ 15 NONAME ; void CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL(struct TPEErrorInfo const &) + ?HandleErrorL@CPhoneConferenceAndSingleAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 16 NONAME ; void CPhoneConferenceAndSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &) + ??0CPhoneStateMachineGSM@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 17 NONAME ; CPhoneStateMachineGSM::CPhoneStateMachineGSM(class MPhoneViewCommandHandle *) + ?SetDivertIndication@CPhoneGsmInCall@@MAEXH@Z @ 18 NONAME ; void CPhoneGsmInCall::SetDivertIndication(int) ?HandlePhoneEngineMessageL@CPhoneAlerting@@UAEXHH@Z @ 19 NONAME ; void CPhoneAlerting::HandlePhoneEngineMessageL(int, int) ?ConstructL@CPhoneSingleCall@@MAEXXZ @ 20 NONAME ; void CPhoneSingleCall::ConstructL(void) ?HandlePhoneEngineMessageL@CPhoneIncoming@@UAEXHH@Z @ 21 NONAME ; void CPhoneIncoming::HandlePhoneEngineMessageL(int, int) @@ -42,35 +42,36 @@ ?HandleCommandL@CPhoneAlerting@@MAEHH@Z @ 41 NONAME ; int CPhoneAlerting::HandleCommandL(int) ?HandleErrorL@CPhoneSingleAndCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 42 NONAME ; void CPhoneSingleAndCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &) ??1CPhoneSingleCall@@UAE@XZ @ 43 NONAME ; CPhoneSingleCall::~CPhoneSingleCall(void) - ?DoStateSpecificCallSetUpDefinitionsL@CPhoneSingleAndWaiting@@UAEXXZ @ 44 NONAME ; void CPhoneSingleAndWaiting::DoStateSpecificCallSetUpDefinitionsL(void) - ??1CPhoneAlerting@@UAE@XZ @ 45 NONAME ; CPhoneAlerting::~CPhoneAlerting(void) - ?HandleConnectedL@CPhoneAlerting@@IAEXH@Z @ 46 NONAME ; void CPhoneAlerting::HandleConnectedL(int) - ?ConstructL@CPhoneAlerting@@MAEXXZ @ 47 NONAME ; void CPhoneAlerting::ConstructL(void) - ?DoStateSpecificCallSetUpDefinitionsL@CPhoneConference@@UAEXXZ @ 48 NONAME ; void CPhoneConference::DoStateSpecificCallSetUpDefinitionsL(void) - ?HandleErrorL@CPhoneCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 49 NONAME ; void CPhoneCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &) - ??1CPhoneIncoming@@UAE@XZ @ 50 NONAME ; CPhoneIncoming::~CPhoneIncoming(void) - ?HandlePhoneStartupL@CPhoneStartupSimlockUi@@EAEXXZ @ 51 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneStartupL(void) - ?ConstructL@CPhoneIncoming@@MAEXXZ @ 52 NONAME ; void CPhoneIncoming::ConstructL(void) - ?HandleErrorL@CPhoneConferenceAndWaitingAndCallSetup@@UAEXABUTPEErrorInfo@@@Z @ 53 NONAME ; void CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL(struct TPEErrorInfo const &) - ?HandlePhoneEngineMessageL@CPhoneSingleCall@@UAEXHH@Z @ 54 NONAME ; void CPhoneSingleCall::HandlePhoneEngineMessageL(int, int) - ??1CPhoneErrorMessagesHandler@@UAE@XZ @ 55 NONAME ; CPhoneErrorMessagesHandler::~CPhoneErrorMessagesHandler(void) - ?HandleErrorL@CPhoneTwoSinglesAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 56 NONAME ; void CPhoneTwoSinglesAndWaiting::HandleErrorL(struct TPEErrorInfo const &) - ?CreatePhoneEngineL@CPhoneStateMachineGSM@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 57 NONAME ; class MPEPhoneModel * CPhoneStateMachineGSM::CreatePhoneEngineL(class MEngineMonitor &) - ?HandleCommandL@CPhoneGsmInCall@@MAEHH@Z @ 58 NONAME ; int CPhoneGsmInCall::HandleCommandL(int) - ?ResolveResourceID@CPhoneResourceResolverGSM@@UBEHABH@Z @ 59 NONAME ; int CPhoneResourceResolverGSM::ResolveResourceID(int const &) const - ?HandleErrorL@CPhoneIncoming@@UAEXABUTPEErrorInfo@@@Z @ 60 NONAME ; void CPhoneIncoming::HandleErrorL(struct TPEErrorInfo const &) - ??1CPhoneStateMachineGSM@@UAE@XZ @ 61 NONAME ; CPhoneStateMachineGSM::~CPhoneStateMachineGSM(void) - ?DoStateSpecificCallSetUpDefinitionsL@CPhoneConferenceAndWaiting@@UAEXXZ @ 62 NONAME ; void CPhoneConferenceAndWaiting::DoStateSpecificCallSetUpDefinitionsL(void) - ?OpenMenuBarL@CPhoneSingleCall@@MAEXXZ @ 63 NONAME ; void CPhoneSingleCall::OpenMenuBarL(void) - ?HandleErrorL@CPhoneConferenceAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 64 NONAME ; void CPhoneConferenceAndWaiting::HandleErrorL(struct TPEErrorInfo const &) - ?HandlePhoneEngineMessageL@CPhoneTwoSingles@@UAEXHH@Z @ 65 NONAME ; void CPhoneTwoSingles::HandlePhoneEngineMessageL(int, int) - ?HandleRemConCommandL@CPhoneEmergency@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 66 NONAME ; int CPhoneEmergency::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) - ?UpdateInCallCbaL@CPhoneTwoSingles@@MAEXXZ @ 67 NONAME ; void CPhoneTwoSingles::UpdateInCallCbaL(void) - ?ConstructL@CPhoneIdle@@MAEXXZ @ 68 NONAME ; void CPhoneIdle::ConstructL(void) - ?HandlePhoneForegroundEventL@CPhoneGsmInCall@@MAEXXZ @ 69 NONAME ; void CPhoneGsmInCall::HandlePhoneForegroundEventL(void) - ?OpenMenuBarL@CPhoneAlerting@@MAEXXZ @ 70 NONAME ; void CPhoneAlerting::OpenMenuBarL(void) - ?SendGlobalWarningNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 71 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalWarningNoteL(int) - ??0CPhoneTwoSingles@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 72 NONAME ; CPhoneTwoSingles::CPhoneTwoSingles(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) - ?HandleConnectedConferenceL@CPhoneTwoSingles@@MAEXH@Z @ 73 NONAME ; void CPhoneTwoSingles::HandleConnectedConferenceL(int) - ?HandlePropertyChangedL@CPhoneStartupSimlockUi@@UAEXABVTUid@@IH@Z @ 74 NONAME ; void CPhoneStartupSimlockUi::HandlePropertyChangedL(class TUid const &, unsigned int, int) + ??1CPhoneAlerting@@UAE@XZ @ 44 NONAME ; CPhoneAlerting::~CPhoneAlerting(void) + ?HandleConnectedL@CPhoneAlerting@@IAEXH@Z @ 45 NONAME ; void CPhoneAlerting::HandleConnectedL(int) + ?ConstructL@CPhoneAlerting@@MAEXXZ @ 46 NONAME ; void CPhoneAlerting::ConstructL(void) + ?HandleErrorL@CPhoneCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 47 NONAME ; void CPhoneCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &) + ??1CPhoneIncoming@@UAE@XZ @ 48 NONAME ; CPhoneIncoming::~CPhoneIncoming(void) + ?HandlePhoneStartupL@CPhoneStartupSimlockUi@@EAEXXZ @ 49 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneStartupL(void) + ?ConstructL@CPhoneIncoming@@MAEXXZ @ 50 NONAME ; void CPhoneIncoming::ConstructL(void) + ?HandleErrorL@CPhoneConferenceAndWaitingAndCallSetup@@UAEXABUTPEErrorInfo@@@Z @ 51 NONAME ; void CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL(struct TPEErrorInfo const &) + ?HandlePhoneEngineMessageL@CPhoneSingleCall@@UAEXHH@Z @ 52 NONAME ; void CPhoneSingleCall::HandlePhoneEngineMessageL(int, int) + ??1CPhoneErrorMessagesHandler@@UAE@XZ @ 53 NONAME ; CPhoneErrorMessagesHandler::~CPhoneErrorMessagesHandler(void) + ?HandleErrorL@CPhoneTwoSinglesAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 54 NONAME ; void CPhoneTwoSinglesAndWaiting::HandleErrorL(struct TPEErrorInfo const &) + ?CreatePhoneEngineL@CPhoneStateMachineGSM@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 55 NONAME ; class MPEPhoneModel * CPhoneStateMachineGSM::CreatePhoneEngineL(class MEngineMonitor &) + ?HandleCommandL@CPhoneGsmInCall@@MAEHH@Z @ 56 NONAME ; int CPhoneGsmInCall::HandleCommandL(int) + ?ResolveResourceID@CPhoneResourceResolverGSM@@UBEHABH@Z @ 57 NONAME ; int CPhoneResourceResolverGSM::ResolveResourceID(int const &) const + ?HandleErrorL@CPhoneIncoming@@UAEXABUTPEErrorInfo@@@Z @ 58 NONAME ; void CPhoneIncoming::HandleErrorL(struct TPEErrorInfo const &) + ??1CPhoneStateMachineGSM@@UAE@XZ @ 59 NONAME ; CPhoneStateMachineGSM::~CPhoneStateMachineGSM(void) + ?OpenMenuBarL@CPhoneSingleCall@@MAEXXZ @ 60 NONAME ; void CPhoneSingleCall::OpenMenuBarL(void) + ?HandleErrorL@CPhoneConferenceAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 61 NONAME ; void CPhoneConferenceAndWaiting::HandleErrorL(struct TPEErrorInfo const &) + ?HandlePhoneEngineMessageL@CPhoneTwoSingles@@UAEXHH@Z @ 62 NONAME ; void CPhoneTwoSingles::HandlePhoneEngineMessageL(int, int) + ?HandleRemConCommandL@CPhoneEmergency@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 63 NONAME ; int CPhoneEmergency::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction) + ?UpdateInCallCbaL@CPhoneTwoSingles@@MAEXXZ @ 64 NONAME ; void CPhoneTwoSingles::UpdateInCallCbaL(void) + ?ConstructL@CPhoneIdle@@MAEXXZ @ 65 NONAME ; void CPhoneIdle::ConstructL(void) + ?HandlePhoneForegroundEventL@CPhoneGsmInCall@@MAEXXZ @ 66 NONAME ; void CPhoneGsmInCall::HandlePhoneForegroundEventL(void) + ?OpenMenuBarL@CPhoneAlerting@@MAEXXZ @ 67 NONAME ; void CPhoneAlerting::OpenMenuBarL(void) + ?SendGlobalWarningNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 68 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalWarningNoteL(int) + ?HandleConnectedConferenceL@CPhoneTwoSingles@@MAEXH@Z @ 69 NONAME ; void CPhoneTwoSingles::HandleConnectedConferenceL(int) + ??0CPhoneTwoSingles@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 70 NONAME ; CPhoneTwoSingles::CPhoneTwoSingles(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *) + ?HandlePropertyChangedL@CPhoneStartupSimlockUi@@UAEXABVTUid@@IH@Z @ 71 NONAME ; void CPhoneStartupSimlockUi::HandlePropertyChangedL(class TUid const &, unsigned int, int) + ?DoStateSpecificCallSetUpDefinitionsL@CPhoneSingleCall@@UAEXXZ @ 72 NONAME ; void CPhoneSingleCall::DoStateSpecificCallSetUpDefinitionsL(void) + ?DoStateSpecificCallSetUpDefinitionsL@CPhoneSingleAndWaiting@@UAEXXZ @ 73 NONAME ; void CPhoneSingleAndWaiting::DoStateSpecificCallSetUpDefinitionsL(void) + ?DoStateSpecificCallSetUpDefinitionsL@CPhoneConference@@UAEXXZ @ 74 NONAME ; void CPhoneConference::DoStateSpecificCallSetUpDefinitionsL(void) + ?DoStateSpecificCallSetUpDefinitionsL@CPhoneConferenceAndWaiting@@UAEXXZ @ 75 NONAME ; void CPhoneConferenceAndWaiting::DoStateSpecificCallSetUpDefinitionsL(void) diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/eabi/phoneuistatesu.def --- a/phoneapp/phoneuistates/eabi/phoneuistatesu.def Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/eabi/phoneuistatesu.def Wed Oct 13 14:31:22 2010 +0300 @@ -39,228 +39,242 @@ _ZN15CPhoneCallSetupD2Ev @ 38 NONAME _ZN15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 39 NONAME _ZN15CPhoneGsmInCall14HandleCommandLEi @ 40 NONAME - _ZN15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 41 NONAME - _ZN16CPhoneConference36DoStateSpecificCallSetUpDefinitionsLEv @ 42 NONAME - _ZN16CPhoneSingleCall10ConstructLEv @ 43 NONAME - _ZN16CPhoneSingleCall12OpenMenuBarLEv @ 44 NONAME - _ZN16CPhoneSingleCall14HandleCommandLEi @ 45 NONAME - _ZN16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 46 NONAME - _ZN16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 47 NONAME - _ZN16CPhoneSingleCall36DoStateSpecificCallSetUpDefinitionsLEv @ 48 NONAME - _ZN16CPhoneSingleCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 49 NONAME - _ZN16CPhoneSingleCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 50 NONAME - _ZN16CPhoneSingleCallD0Ev @ 51 NONAME - _ZN16CPhoneSingleCallD1Ev @ 52 NONAME - _ZN16CPhoneSingleCallD2Ev @ 53 NONAME - _ZN16CPhoneTwoSingles10ConstructLEv @ 54 NONAME - _ZN16CPhoneTwoSingles12OpenMenuBarLEv @ 55 NONAME - _ZN16CPhoneTwoSingles16UpdateInCallCbaLEv @ 56 NONAME - _ZN16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 57 NONAME - _ZN16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 58 NONAME - _ZN16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 59 NONAME - _ZN16CPhoneTwoSingles26HandleConnectedConferenceLEi @ 60 NONAME - _ZN16CPhoneTwoSinglesC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 61 NONAME - _ZN16CPhoneTwoSinglesC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 62 NONAME - _ZN16CPhoneTwoSinglesD0Ev @ 63 NONAME - _ZN16CPhoneTwoSinglesD1Ev @ 64 NONAME - _ZN16CPhoneTwoSinglesD2Ev @ 65 NONAME - _ZN21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 66 NONAME - _ZN21CPhoneStateMachineGSM5StateEv @ 67 NONAME - _ZN21CPhoneStateMachineGSMC1EP23MPhoneViewCommandHandle @ 68 NONAME - _ZN21CPhoneStateMachineGSMC2EP23MPhoneViewCommandHandle @ 69 NONAME - _ZN21CPhoneStateMachineGSMD0Ev @ 70 NONAME - _ZN21CPhoneStateMachineGSMD1Ev @ 71 NONAME - _ZN21CPhoneStateMachineGSMD2Ev @ 72 NONAME - _ZN22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 73 NONAME - _ZN22CPhoneSingleAndWaiting36DoStateSpecificCallSetUpDefinitionsLEv @ 74 NONAME - _ZN22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 75 NONAME - _ZN22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 76 NONAME - _ZN22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 77 NONAME - _ZN25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 78 NONAME - _ZN25CPhoneResourceResolverGSM10ConstructLEv @ 79 NONAME - _ZN25CPhoneResourceResolverGSMC1Ev @ 80 NONAME - _ZN25CPhoneResourceResolverGSMC2Ev @ 81 NONAME - _ZN25CPhoneResourceResolverGSMD0Ev @ 82 NONAME - _ZN25CPhoneResourceResolverGSMD1Ev @ 83 NONAME - _ZN25CPhoneResourceResolverGSMD2Ev @ 84 NONAME - _ZN26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 85 NONAME - _ZN26CPhoneConferenceAndWaiting36DoStateSpecificCallSetUpDefinitionsLEv @ 86 NONAME - _ZN26CPhoneErrorMessagesHandler19SendGlobalInfoNoteLEi @ 87 NONAME - _ZN26CPhoneErrorMessagesHandler20SendGlobalErrorNoteLEi @ 88 NONAME - _ZN26CPhoneErrorMessagesHandler22SendGlobalWarningNoteLEi @ 89 NONAME - _ZN26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 90 NONAME - _ZN26CPhoneErrorMessagesHandlerC1EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 91 NONAME - _ZN26CPhoneErrorMessagesHandlerC2EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 92 NONAME - _ZN26CPhoneErrorMessagesHandlerD0Ev @ 93 NONAME - _ZN26CPhoneErrorMessagesHandlerD1Ev @ 94 NONAME - _ZN26CPhoneErrorMessagesHandlerD2Ev @ 95 NONAME - _ZN26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 96 NONAME - _ZN34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 97 NONAME - _ZN35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 98 NONAME - _ZN38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 99 NONAME - _ZNK16CPhoneSingleCall6CallIdEv @ 100 NONAME - _ZNK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 101 NONAME - _ZTI10CPhoneIdle @ 102 NONAME - _ZTI13CPhoneStartup @ 103 NONAME - _ZTI14CPhoneAlerting @ 104 NONAME - _ZTI14CPhoneIncoming @ 105 NONAME - _ZTI15CPhoneCallSetup @ 106 NONAME - _ZTI15CPhoneEmergency @ 107 NONAME - _ZTI15CPhoneGsmInCall @ 108 NONAME - _ZTI16CPhoneConference @ 109 NONAME - _ZTI16CPhoneSingleCall @ 110 NONAME - _ZTI16CPhoneTwoSingles @ 111 NONAME - _ZTI21CPhoneStateMachineGSM @ 112 NONAME - _ZTI22CPhoneSingleAndWaiting @ 113 NONAME - _ZTI22CPhoneStartupSimlockUi @ 114 NONAME - _ZTI23CPhoneSingleAndAlerting @ 115 NONAME - _ZTI24CPhoneSingleAndCallSetup @ 116 NONAME - _ZTI25CPhoneCallSetupAndWaiting @ 117 NONAME - _ZTI25CPhoneConferenceAndSingle @ 118 NONAME - _ZTI25CPhoneResourceResolverGSM @ 119 NONAME - _ZTI26CPhoneConferenceAndWaiting @ 120 NONAME - _ZTI26CPhoneErrorMessagesHandler @ 121 NONAME - _ZTI26CPhoneTwoSinglesAndWaiting @ 122 NONAME - _ZTI28CPhoneConferenceAndCallSetup @ 123 NONAME - _ZTI30CPhoneUIStateMachineFactoryGSM @ 124 NONAME - _ZTI31CPhoneGeneralGsmMessagesHandler @ 125 NONAME - _ZTI34CPhoneSingleAndCallSetupAndWaiting @ 126 NONAME - _ZTI35CPhoneConferenceAndSingleAndWaiting @ 127 NONAME - _ZTI38CPhoneConferenceAndWaitingAndCallSetup @ 128 NONAME - _ZTV10CPhoneIdle @ 129 NONAME - _ZTV13CPhoneStartup @ 130 NONAME - _ZTV14CPhoneAlerting @ 131 NONAME - _ZTV14CPhoneIncoming @ 132 NONAME - _ZTV15CPhoneCallSetup @ 133 NONAME - _ZTV15CPhoneEmergency @ 134 NONAME - _ZTV15CPhoneGsmInCall @ 135 NONAME - _ZTV16CPhoneConference @ 136 NONAME - _ZTV16CPhoneSingleCall @ 137 NONAME - _ZTV16CPhoneTwoSingles @ 138 NONAME - _ZTV21CPhoneStateMachineGSM @ 139 NONAME - _ZTV22CPhoneSingleAndWaiting @ 140 NONAME - _ZTV22CPhoneStartupSimlockUi @ 141 NONAME - _ZTV23CPhoneSingleAndAlerting @ 142 NONAME - _ZTV24CPhoneSingleAndCallSetup @ 143 NONAME - _ZTV25CPhoneCallSetupAndWaiting @ 144 NONAME - _ZTV25CPhoneConferenceAndSingle @ 145 NONAME - _ZTV25CPhoneResourceResolverGSM @ 146 NONAME - _ZTV26CPhoneConferenceAndWaiting @ 147 NONAME - _ZTV26CPhoneErrorMessagesHandler @ 148 NONAME - _ZTV26CPhoneTwoSinglesAndWaiting @ 149 NONAME - _ZTV28CPhoneConferenceAndCallSetup @ 150 NONAME - _ZTV30CPhoneUIStateMachineFactoryGSM @ 151 NONAME - _ZTV31CPhoneGeneralGsmMessagesHandler @ 152 NONAME - _ZTV34CPhoneSingleAndCallSetupAndWaiting @ 153 NONAME - _ZTV35CPhoneConferenceAndSingleAndWaiting @ 154 NONAME - _ZTV38CPhoneConferenceAndWaitingAndCallSetup @ 155 NONAME - _ZThn12_N10CPhoneIdleD0Ev @ 156 NONAME - _ZThn12_N10CPhoneIdleD1Ev @ 157 NONAME - _ZThn12_N14CPhoneAlertingD0Ev @ 158 NONAME - _ZThn12_N14CPhoneAlertingD1Ev @ 159 NONAME - _ZThn12_N14CPhoneIncomingD0Ev @ 160 NONAME - _ZThn12_N14CPhoneIncomingD1Ev @ 161 NONAME - _ZThn12_N15CPhoneCallSetupD0Ev @ 162 NONAME - _ZThn12_N15CPhoneCallSetupD1Ev @ 163 NONAME - _ZThn12_N15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 164 NONAME - _ZThn12_N16CPhoneSingleCallD0Ev @ 165 NONAME - _ZThn12_N16CPhoneSingleCallD1Ev @ 166 NONAME - _ZThn12_N16CPhoneTwoSinglesD0Ev @ 167 NONAME - _ZThn12_N16CPhoneTwoSinglesD1Ev @ 168 NONAME - _ZThn12_N22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 169 NONAME - _ZThn12_N22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 170 NONAME - _ZThn16_N10CPhoneIdleD0Ev @ 171 NONAME - _ZThn16_N10CPhoneIdleD1Ev @ 172 NONAME - _ZThn16_N14CPhoneAlerting14HandleCommandLEi @ 173 NONAME - _ZThn16_N14CPhoneAlertingD0Ev @ 174 NONAME - _ZThn16_N14CPhoneAlertingD1Ev @ 175 NONAME - _ZThn16_N14CPhoneIncomingD0Ev @ 176 NONAME - _ZThn16_N14CPhoneIncomingD1Ev @ 177 NONAME - _ZThn16_N15CPhoneCallSetupD0Ev @ 178 NONAME - _ZThn16_N15CPhoneCallSetupD1Ev @ 179 NONAME - _ZThn16_N15CPhoneGsmInCall14HandleCommandLEi @ 180 NONAME - _ZThn16_N16CPhoneSingleCall14HandleCommandLEi @ 181 NONAME - _ZThn16_N16CPhoneSingleCallD0Ev @ 182 NONAME - _ZThn16_N16CPhoneSingleCallD1Ev @ 183 NONAME - _ZThn16_N16CPhoneTwoSinglesD0Ev @ 184 NONAME - _ZThn16_N16CPhoneTwoSinglesD1Ev @ 185 NONAME - _ZThn20_N10CPhoneIdleD0Ev @ 186 NONAME - _ZThn20_N10CPhoneIdleD1Ev @ 187 NONAME - _ZThn20_N14CPhoneAlertingD0Ev @ 188 NONAME - _ZThn20_N14CPhoneAlertingD1Ev @ 189 NONAME - _ZThn20_N14CPhoneIncomingD0Ev @ 190 NONAME - _ZThn20_N14CPhoneIncomingD1Ev @ 191 NONAME - _ZThn20_N15CPhoneCallSetupD0Ev @ 192 NONAME - _ZThn20_N15CPhoneCallSetupD1Ev @ 193 NONAME - _ZThn20_N15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 194 NONAME - _ZThn20_N16CPhoneSingleCallD0Ev @ 195 NONAME - _ZThn20_N16CPhoneSingleCallD1Ev @ 196 NONAME - _ZThn20_N16CPhoneTwoSinglesD0Ev @ 197 NONAME - _ZThn20_N16CPhoneTwoSinglesD1Ev @ 198 NONAME - _ZThn24_N16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 199 NONAME - _ZThn28_N10CPhoneIdleD0Ev @ 200 NONAME - _ZThn28_N10CPhoneIdleD1Ev @ 201 NONAME - _ZThn28_N14CPhoneAlertingD0Ev @ 202 NONAME - _ZThn28_N14CPhoneAlertingD1Ev @ 203 NONAME - _ZThn28_N14CPhoneIncomingD0Ev @ 204 NONAME - _ZThn28_N14CPhoneIncomingD1Ev @ 205 NONAME - _ZThn28_N15CPhoneCallSetupD0Ev @ 206 NONAME - _ZThn28_N15CPhoneCallSetupD1Ev @ 207 NONAME - _ZThn28_N16CPhoneSingleCallD0Ev @ 208 NONAME - _ZThn28_N16CPhoneSingleCallD1Ev @ 209 NONAME - _ZThn28_N16CPhoneTwoSinglesD0Ev @ 210 NONAME - _ZThn28_N16CPhoneTwoSinglesD1Ev @ 211 NONAME - _ZThn4_N10CPhoneIdle12HandleErrorLERK12TPEErrorInfo @ 212 NONAME - _ZThn4_N10CPhoneIdle25HandlePhoneEngineMessageLEii @ 213 NONAME - _ZThn4_N10CPhoneIdleD0Ev @ 214 NONAME - _ZThn4_N10CPhoneIdleD1Ev @ 215 NONAME - _ZThn4_N14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 216 NONAME - _ZThn4_N14CPhoneAlertingD0Ev @ 217 NONAME - _ZThn4_N14CPhoneAlertingD1Ev @ 218 NONAME - _ZThn4_N14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 219 NONAME - _ZThn4_N14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 220 NONAME - _ZThn4_N14CPhoneIncomingD0Ev @ 221 NONAME - _ZThn4_N14CPhoneIncomingD1Ev @ 222 NONAME - _ZThn4_N15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 223 NONAME - _ZThn4_N15CPhoneCallSetupD0Ev @ 224 NONAME - _ZThn4_N15CPhoneCallSetupD1Ev @ 225 NONAME - _ZThn4_N16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 226 NONAME - _ZThn4_N16CPhoneSingleCallD0Ev @ 227 NONAME - _ZThn4_N16CPhoneSingleCallD1Ev @ 228 NONAME - _ZThn4_N16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 229 NONAME - _ZThn4_N16CPhoneTwoSinglesD0Ev @ 230 NONAME - _ZThn4_N16CPhoneTwoSinglesD1Ev @ 231 NONAME - _ZThn4_N21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 232 NONAME - _ZThn4_N21CPhoneStateMachineGSM5StateEv @ 233 NONAME - _ZThn4_N21CPhoneStateMachineGSMD0Ev @ 234 NONAME - _ZThn4_N21CPhoneStateMachineGSMD1Ev @ 235 NONAME - _ZThn4_N22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 236 NONAME - _ZThn4_N22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 237 NONAME - _ZThn4_N25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 238 NONAME - _ZThn4_N25CPhoneResourceResolverGSMD0Ev @ 239 NONAME - _ZThn4_N25CPhoneResourceResolverGSMD1Ev @ 240 NONAME - _ZThn4_N26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 241 NONAME - _ZThn4_N26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 242 NONAME - _ZThn4_N26CPhoneErrorMessagesHandlerD0Ev @ 243 NONAME - _ZThn4_N26CPhoneErrorMessagesHandlerD1Ev @ 244 NONAME - _ZThn4_N26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 245 NONAME - _ZThn4_N34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 246 NONAME - _ZThn4_N35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 247 NONAME - _ZThn4_N38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 248 NONAME - _ZThn4_NK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 249 NONAME - _ZThn8_N10CPhoneIdleD0Ev @ 250 NONAME - _ZThn8_N10CPhoneIdleD1Ev @ 251 NONAME - _ZThn8_N14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 252 NONAME - _ZThn8_N14CPhoneAlertingD0Ev @ 253 NONAME - _ZThn8_N14CPhoneAlertingD1Ev @ 254 NONAME - _ZThn8_N14CPhoneIncomingD0Ev @ 255 NONAME - _ZThn8_N14CPhoneIncomingD1Ev @ 256 NONAME - _ZThn8_N15CPhoneCallSetupD0Ev @ 257 NONAME - _ZThn8_N15CPhoneCallSetupD1Ev @ 258 NONAME - _ZThn8_N16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 259 NONAME - _ZThn8_N16CPhoneSingleCallD0Ev @ 260 NONAME - _ZThn8_N16CPhoneSingleCallD1Ev @ 261 NONAME - _ZThn8_N16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 262 NONAME - _ZThn8_N16CPhoneTwoSinglesD0Ev @ 263 NONAME - _ZThn8_N16CPhoneTwoSinglesD1Ev @ 264 NONAME + _ZN15CPhoneGsmInCall19SetDivertIndicationEi @ 41 NONAME + _ZN15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 42 NONAME + _ZN16CPhoneConference36DoStateSpecificCallSetUpDefinitionsLEv @ 43 NONAME + _ZN16CPhoneSingleCall10ConstructLEv @ 44 NONAME + _ZN16CPhoneSingleCall12OpenMenuBarLEv @ 45 NONAME + _ZN16CPhoneSingleCall14HandleCommandLEi @ 46 NONAME + _ZN16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 47 NONAME + _ZN16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 48 NONAME + _ZN16CPhoneSingleCall36DoStateSpecificCallSetUpDefinitionsLEv @ 49 NONAME + _ZN16CPhoneSingleCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 50 NONAME + _ZN16CPhoneSingleCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 51 NONAME + _ZN16CPhoneSingleCallD0Ev @ 52 NONAME + _ZN16CPhoneSingleCallD1Ev @ 53 NONAME + _ZN16CPhoneSingleCallD2Ev @ 54 NONAME + _ZN16CPhoneTwoSingles10ConstructLEv @ 55 NONAME + _ZN16CPhoneTwoSingles12OpenMenuBarLEv @ 56 NONAME + _ZN16CPhoneTwoSingles16UpdateInCallCbaLEv @ 57 NONAME + _ZN16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 58 NONAME + _ZN16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 59 NONAME + _ZN16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 60 NONAME + _ZN16CPhoneTwoSingles26HandleConnectedConferenceLEi @ 61 NONAME + _ZN16CPhoneTwoSinglesC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 62 NONAME + _ZN16CPhoneTwoSinglesC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 63 NONAME + _ZN16CPhoneTwoSinglesD0Ev @ 64 NONAME + _ZN16CPhoneTwoSinglesD1Ev @ 65 NONAME + _ZN16CPhoneTwoSinglesD2Ev @ 66 NONAME + _ZN21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 67 NONAME + _ZN21CPhoneStateMachineGSM5StateEv @ 68 NONAME + _ZN21CPhoneStateMachineGSMC1EP23MPhoneViewCommandHandle @ 69 NONAME + _ZN21CPhoneStateMachineGSMC2EP23MPhoneViewCommandHandle @ 70 NONAME + _ZN21CPhoneStateMachineGSMD0Ev @ 71 NONAME + _ZN21CPhoneStateMachineGSMD1Ev @ 72 NONAME + _ZN21CPhoneStateMachineGSMD2Ev @ 73 NONAME + _ZN22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 74 NONAME + _ZN22CPhoneSingleAndWaiting36DoStateSpecificCallSetUpDefinitionsLEv @ 75 NONAME + _ZN22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 76 NONAME + _ZN22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 77 NONAME + _ZN22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 78 NONAME + _ZN25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 79 NONAME + _ZN25CPhoneResourceResolverGSM10ConstructLEv @ 80 NONAME + _ZN25CPhoneResourceResolverGSMC1Ev @ 81 NONAME + _ZN25CPhoneResourceResolverGSMC2Ev @ 82 NONAME + _ZN25CPhoneResourceResolverGSMD0Ev @ 83 NONAME + _ZN25CPhoneResourceResolverGSMD1Ev @ 84 NONAME + _ZN25CPhoneResourceResolverGSMD2Ev @ 85 NONAME + _ZN26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 86 NONAME + _ZN26CPhoneConferenceAndWaiting36DoStateSpecificCallSetUpDefinitionsLEv @ 87 NONAME + _ZN26CPhoneErrorMessagesHandler19SendGlobalInfoNoteLEi @ 88 NONAME + _ZN26CPhoneErrorMessagesHandler20SendGlobalErrorNoteLEi @ 89 NONAME + _ZN26CPhoneErrorMessagesHandler22SendGlobalWarningNoteLEi @ 90 NONAME + _ZN26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 91 NONAME + _ZN26CPhoneErrorMessagesHandlerC1EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 92 NONAME + _ZN26CPhoneErrorMessagesHandlerC2EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 93 NONAME + _ZN26CPhoneErrorMessagesHandlerD0Ev @ 94 NONAME + _ZN26CPhoneErrorMessagesHandlerD1Ev @ 95 NONAME + _ZN26CPhoneErrorMessagesHandlerD2Ev @ 96 NONAME + _ZN26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 97 NONAME + _ZN34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 98 NONAME + _ZN35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 99 NONAME + _ZN38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 100 NONAME + _ZNK16CPhoneSingleCall6CallIdEv @ 101 NONAME + _ZNK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 102 NONAME + _ZTI10CPhoneIdle @ 103 NONAME + _ZTI13CPhoneStartup @ 104 NONAME + _ZTI14CPhoneAlerting @ 105 NONAME + _ZTI14CPhoneIncoming @ 106 NONAME + _ZTI15CPhoneCallSetup @ 107 NONAME + _ZTI15CPhoneEmergency @ 108 NONAME + _ZTI15CPhoneGsmInCall @ 109 NONAME + _ZTI16CPhoneConference @ 110 NONAME + _ZTI16CPhoneSingleCall @ 111 NONAME + _ZTI16CPhoneTwoSingles @ 112 NONAME + _ZTI21CPhoneStateMachineGSM @ 113 NONAME + _ZTI22CPhoneSingleAndWaiting @ 114 NONAME + _ZTI22CPhoneStartupSimlockUi @ 115 NONAME + _ZTI23CPhoneSingleAndAlerting @ 116 NONAME + _ZTI24CPhoneSingleAndCallSetup @ 117 NONAME + _ZTI25CPhoneCallSetupAndWaiting @ 118 NONAME + _ZTI25CPhoneConferenceAndSingle @ 119 NONAME + _ZTI25CPhoneResourceResolverGSM @ 120 NONAME + _ZTI26CPhoneConferenceAndWaiting @ 121 NONAME + _ZTI26CPhoneErrorMessagesHandler @ 122 NONAME + _ZTI26CPhoneTwoSinglesAndWaiting @ 123 NONAME + _ZTI28CPhoneConferenceAndCallSetup @ 124 NONAME + _ZTI30CPhoneUIStateMachineFactoryGSM @ 125 NONAME + _ZTI31CPhoneGeneralGsmMessagesHandler @ 126 NONAME + _ZTI34CPhoneSingleAndCallSetupAndWaiting @ 127 NONAME + _ZTI35CPhoneConferenceAndSingleAndWaiting @ 128 NONAME + _ZTI38CPhoneConferenceAndWaitingAndCallSetup @ 129 NONAME + _ZTV10CPhoneIdle @ 130 NONAME + _ZTV13CPhoneStartup @ 131 NONAME + _ZTV14CPhoneAlerting @ 132 NONAME + _ZTV14CPhoneIncoming @ 133 NONAME + _ZTV15CPhoneCallSetup @ 134 NONAME + _ZTV15CPhoneEmergency @ 135 NONAME + _ZTV15CPhoneGsmInCall @ 136 NONAME + _ZTV16CPhoneConference @ 137 NONAME + _ZTV16CPhoneSingleCall @ 138 NONAME + _ZTV16CPhoneTwoSingles @ 139 NONAME + _ZTV21CPhoneStateMachineGSM @ 140 NONAME + _ZTV22CPhoneSingleAndWaiting @ 141 NONAME + _ZTV22CPhoneStartupSimlockUi @ 142 NONAME + _ZTV23CPhoneSingleAndAlerting @ 143 NONAME + _ZTV24CPhoneSingleAndCallSetup @ 144 NONAME + _ZTV25CPhoneCallSetupAndWaiting @ 145 NONAME + _ZTV25CPhoneConferenceAndSingle @ 146 NONAME + _ZTV25CPhoneResourceResolverGSM @ 147 NONAME + _ZTV26CPhoneConferenceAndWaiting @ 148 NONAME + _ZTV26CPhoneErrorMessagesHandler @ 149 NONAME + _ZTV26CPhoneTwoSinglesAndWaiting @ 150 NONAME + _ZTV28CPhoneConferenceAndCallSetup @ 151 NONAME + _ZTV30CPhoneUIStateMachineFactoryGSM @ 152 NONAME + _ZTV31CPhoneGeneralGsmMessagesHandler @ 153 NONAME + _ZTV34CPhoneSingleAndCallSetupAndWaiting @ 154 NONAME + _ZTV35CPhoneConferenceAndSingleAndWaiting @ 155 NONAME + _ZTV38CPhoneConferenceAndWaitingAndCallSetup @ 156 NONAME + _ZThn12_N10CPhoneIdleD0Ev @ 157 NONAME + _ZThn12_N10CPhoneIdleD1Ev @ 158 NONAME + _ZThn12_N14CPhoneAlertingD0Ev @ 159 NONAME + _ZThn12_N14CPhoneAlertingD1Ev @ 160 NONAME + _ZThn12_N14CPhoneIncomingD0Ev @ 161 NONAME + _ZThn12_N14CPhoneIncomingD1Ev @ 162 NONAME + _ZThn12_N15CPhoneCallSetupD0Ev @ 163 NONAME + _ZThn12_N15CPhoneCallSetupD1Ev @ 164 NONAME + _ZThn12_N15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 165 NONAME + _ZThn12_N16CPhoneSingleCallD0Ev @ 166 NONAME + _ZThn12_N16CPhoneSingleCallD1Ev @ 167 NONAME + _ZThn12_N16CPhoneTwoSinglesD0Ev @ 168 NONAME + _ZThn12_N16CPhoneTwoSinglesD1Ev @ 169 NONAME + _ZThn12_N22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 170 NONAME + _ZThn12_N22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 171 NONAME + _ZThn16_N10CPhoneIdleD0Ev @ 172 NONAME + _ZThn16_N10CPhoneIdleD1Ev @ 173 NONAME + _ZThn16_N14CPhoneAlerting14HandleCommandLEi @ 174 NONAME + _ZThn16_N14CPhoneAlertingD0Ev @ 175 NONAME + _ZThn16_N14CPhoneAlertingD1Ev @ 176 NONAME + _ZThn16_N14CPhoneIncomingD0Ev @ 177 NONAME + _ZThn16_N14CPhoneIncomingD1Ev @ 178 NONAME + _ZThn16_N15CPhoneCallSetupD0Ev @ 179 NONAME + _ZThn16_N15CPhoneCallSetupD1Ev @ 180 NONAME + _ZThn16_N15CPhoneGsmInCall14HandleCommandLEi @ 181 NONAME + _ZThn16_N16CPhoneSingleCall14HandleCommandLEi @ 182 NONAME + _ZThn16_N16CPhoneSingleCallD0Ev @ 183 NONAME + _ZThn16_N16CPhoneSingleCallD1Ev @ 184 NONAME + _ZThn16_N16CPhoneTwoSinglesD0Ev @ 185 NONAME + _ZThn16_N16CPhoneTwoSinglesD1Ev @ 186 NONAME + _ZThn20_N10CPhoneIdleD0Ev @ 187 NONAME + _ZThn20_N10CPhoneIdleD1Ev @ 188 NONAME + _ZThn20_N14CPhoneAlertingD0Ev @ 189 NONAME + _ZThn20_N14CPhoneAlertingD1Ev @ 190 NONAME + _ZThn20_N14CPhoneIncomingD0Ev @ 191 NONAME + _ZThn20_N14CPhoneIncomingD1Ev @ 192 NONAME + _ZThn20_N15CPhoneCallSetupD0Ev @ 193 NONAME + _ZThn20_N15CPhoneCallSetupD1Ev @ 194 NONAME + _ZThn20_N15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 195 NONAME + _ZThn20_N16CPhoneSingleCallD0Ev @ 196 NONAME + _ZThn20_N16CPhoneSingleCallD1Ev @ 197 NONAME + _ZThn20_N16CPhoneTwoSinglesD0Ev @ 198 NONAME + _ZThn20_N16CPhoneTwoSinglesD1Ev @ 199 NONAME + _ZThn24_N10CPhoneIdleD0Ev @ 200 NONAME + _ZThn24_N10CPhoneIdleD1Ev @ 201 NONAME + _ZThn24_N14CPhoneAlertingD0Ev @ 202 NONAME + _ZThn24_N14CPhoneAlertingD1Ev @ 203 NONAME + _ZThn24_N14CPhoneIncomingD0Ev @ 204 NONAME + _ZThn24_N14CPhoneIncomingD1Ev @ 205 NONAME + _ZThn24_N15CPhoneCallSetupD0Ev @ 206 NONAME + _ZThn24_N15CPhoneCallSetupD1Ev @ 207 NONAME + _ZThn24_N15CPhoneGsmInCall19SetDivertIndicationEi @ 208 NONAME + _ZThn24_N16CPhoneSingleCallD0Ev @ 209 NONAME + _ZThn24_N16CPhoneSingleCallD1Ev @ 210 NONAME + _ZThn24_N16CPhoneTwoSinglesD0Ev @ 211 NONAME + _ZThn24_N16CPhoneTwoSinglesD1Ev @ 212 NONAME + _ZThn28_N16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 213 NONAME + _ZThn32_N10CPhoneIdleD0Ev @ 214 NONAME + _ZThn32_N10CPhoneIdleD1Ev @ 215 NONAME + _ZThn32_N14CPhoneAlertingD0Ev @ 216 NONAME + _ZThn32_N14CPhoneAlertingD1Ev @ 217 NONAME + _ZThn32_N14CPhoneIncomingD0Ev @ 218 NONAME + _ZThn32_N14CPhoneIncomingD1Ev @ 219 NONAME + _ZThn32_N15CPhoneCallSetupD0Ev @ 220 NONAME + _ZThn32_N15CPhoneCallSetupD1Ev @ 221 NONAME + _ZThn32_N16CPhoneSingleCallD0Ev @ 222 NONAME + _ZThn32_N16CPhoneSingleCallD1Ev @ 223 NONAME + _ZThn32_N16CPhoneTwoSinglesD0Ev @ 224 NONAME + _ZThn32_N16CPhoneTwoSinglesD1Ev @ 225 NONAME + _ZThn4_N10CPhoneIdle12HandleErrorLERK12TPEErrorInfo @ 226 NONAME + _ZThn4_N10CPhoneIdle25HandlePhoneEngineMessageLEii @ 227 NONAME + _ZThn4_N10CPhoneIdleD0Ev @ 228 NONAME + _ZThn4_N10CPhoneIdleD1Ev @ 229 NONAME + _ZThn4_N14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 230 NONAME + _ZThn4_N14CPhoneAlertingD0Ev @ 231 NONAME + _ZThn4_N14CPhoneAlertingD1Ev @ 232 NONAME + _ZThn4_N14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 233 NONAME + _ZThn4_N14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 234 NONAME + _ZThn4_N14CPhoneIncomingD0Ev @ 235 NONAME + _ZThn4_N14CPhoneIncomingD1Ev @ 236 NONAME + _ZThn4_N15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 237 NONAME + _ZThn4_N15CPhoneCallSetupD0Ev @ 238 NONAME + _ZThn4_N15CPhoneCallSetupD1Ev @ 239 NONAME + _ZThn4_N16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 240 NONAME + _ZThn4_N16CPhoneSingleCallD0Ev @ 241 NONAME + _ZThn4_N16CPhoneSingleCallD1Ev @ 242 NONAME + _ZThn4_N16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 243 NONAME + _ZThn4_N16CPhoneTwoSinglesD0Ev @ 244 NONAME + _ZThn4_N16CPhoneTwoSinglesD1Ev @ 245 NONAME + _ZThn4_N21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 246 NONAME + _ZThn4_N21CPhoneStateMachineGSM5StateEv @ 247 NONAME + _ZThn4_N21CPhoneStateMachineGSMD0Ev @ 248 NONAME + _ZThn4_N21CPhoneStateMachineGSMD1Ev @ 249 NONAME + _ZThn4_N22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 250 NONAME + _ZThn4_N22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 251 NONAME + _ZThn4_N25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 252 NONAME + _ZThn4_N25CPhoneResourceResolverGSMD0Ev @ 253 NONAME + _ZThn4_N25CPhoneResourceResolverGSMD1Ev @ 254 NONAME + _ZThn4_N26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 255 NONAME + _ZThn4_N26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 256 NONAME + _ZThn4_N26CPhoneErrorMessagesHandlerD0Ev @ 257 NONAME + _ZThn4_N26CPhoneErrorMessagesHandlerD1Ev @ 258 NONAME + _ZThn4_N26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 259 NONAME + _ZThn4_N34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 260 NONAME + _ZThn4_N35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 261 NONAME + _ZThn4_N38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 262 NONAME + _ZThn4_NK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 263 NONAME + _ZThn8_N10CPhoneIdleD0Ev @ 264 NONAME + _ZThn8_N10CPhoneIdleD1Ev @ 265 NONAME + _ZThn8_N14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 266 NONAME + _ZThn8_N14CPhoneAlertingD0Ev @ 267 NONAME + _ZThn8_N14CPhoneAlertingD1Ev @ 268 NONAME + _ZThn8_N14CPhoneIncomingD0Ev @ 269 NONAME + _ZThn8_N14CPhoneIncomingD1Ev @ 270 NONAME + _ZThn8_N15CPhoneCallSetupD0Ev @ 271 NONAME + _ZThn8_N15CPhoneCallSetupD1Ev @ 272 NONAME + _ZThn8_N16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 273 NONAME + _ZThn8_N16CPhoneSingleCallD0Ev @ 274 NONAME + _ZThn8_N16CPhoneSingleCallD1Ev @ 275 NONAME + _ZThn8_N16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 276 NONAME + _ZThn8_N16CPhoneTwoSinglesD0Ev @ 277 NONAME + _ZThn8_N16CPhoneTwoSinglesD1Ev @ 278 NONAME diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/inc/cphoneconference.h --- a/phoneapp/phoneuistates/inc/cphoneconference.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/inc/cphoneconference.h Wed Oct 13 14:31:22 2010 +0300 @@ -147,8 +147,6 @@ void MakeStateTransitionToIdleL(); - TBool MakeTransitionToWaitingInSingleL(); - void HandleDialingL( TInt aCallId ); void CallFromNewCallQueryL(); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h --- a/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h Wed Oct 13 14:31:22 2010 +0300 @@ -114,11 +114,6 @@ * Return ETrue if voice call. */ TBool IsVoiceCall( const TInt aCallId ) const; - - /** - * Variation for error notes KTelephonyLVFlagClearCodeCustomization - */ - TInt ResourceVariation() const; protected: @@ -128,8 +123,6 @@ MPhoneViewCommandHandle* iViewCommandHandle; MPhoneStateMachine* iStateMachine; - - TInt iCallId; }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/inc/cphonegsmincall.h --- a/phoneapp/phoneuistates/inc/cphonegsmincall.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/inc/cphonegsmincall.h Wed Oct 13 14:31:22 2010 +0300 @@ -107,9 +107,23 @@ */ void HandleHoldNoteL( TInt aCallId, TBool aHold ); + + /** + * Setter for divert indication showing in bubble. + * @param aDivertIndication ETrue to show divert indication, + * EFalse to not. Usually setting EFalse isn't necessary + * as it's a default value in bubble creation. + */ + IMPORT_C void SetDivertIndication( + const TBool aDivertIndication ); + private: void ReplaceCallL(); + /** + * Handles divert indication + */ + void HandeDivertIndicationL(); }; #endif // CPHONEGSMINCALL_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonealerting.cpp --- a/phoneapp/phoneuistates/src/cphonealerting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -132,7 +132,7 @@ if ( IsNumberEntryUsedL() ) { - CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose ); + CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose ); } if ( !TopAppIsDisplayedL() ) { @@ -241,7 +241,7 @@ // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update the single call UpdateSingleActiveCallL( aCallId ); @@ -250,7 +250,7 @@ SetToolbarDimming( EFalse ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Go to single state UpdateCbaL( EPhoneCallHandlingInCallCBA ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonecallsetup.cpp --- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -158,16 +158,11 @@ // when the remote party receives the call. So, in CDMA, the user // should still be able to cancel the MO call before the call is connected. __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetup::HandleConnectingL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); - SetNeedToReturnToForegroundAppStatusL( EFalse ); - // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -187,7 +182,7 @@ SetToolbarButtonLoudspeakerEnabled(); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateAlerting ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -182,7 +182,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetupAndWaiting::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Remove call iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -238,7 +238,7 @@ iStateMachine->ChangeState( EPhoneStateAlerting ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -264,7 +264,7 @@ // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - TransitionHandlerL().BeginUiUpdateLC(); + CPhoneState::BeginUiUpdateLC(); // Update bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -276,7 +276,7 @@ CPhoneState::SetTouchPaneButtons( EPhoneWaitingCallButtons ); SetToolbarDimming( EFalse ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); if ( CPhoneState::IsNumberEntryUsedL() ) { diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconference.cpp --- a/phoneapp/phoneuistates/src/cphoneconference.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconference.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -78,10 +78,7 @@ CPhoneGsmInCall::ConstructL(); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); CPhonePubSubProxy::Instance()->ChangePropertyValue( KPSUidScreenSaver, @@ -194,10 +191,10 @@ switch( aCommand ) { case EAknSoftkeyCancel: - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); CloseSelectionListL(); SetTouchPaneButtons( EPhoneConferenceButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateCbaL( EPhoneCallHandlingInCallCBA ); break; @@ -398,12 +395,11 @@ // void CPhoneConference::HandleIdleL( TInt aCallId ) { - __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleIdleL()"); + __LOGMETHODSTARTEND( EPhoneUIStates, + "CPhoneConference::HandleIdleL()"); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); + // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -429,7 +425,7 @@ { // Remove call header iViewCommandHandle->ExecuteCommandL( - EPhoneViewRemoveCallHeader, aCallId ); + EPhoneViewRemoveCallHeader, aCallId ); } } @@ -441,22 +437,43 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleConferenceIdleL()"); - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginTransEffectLC( ENumberEntryClose ); + BeginUiUpdateLC(); + iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); + TPhoneCmdParamInteger activeCallCount; - iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCountOfActiveCalls, &activeCallCount ); - + iViewCommandHandle->ExecuteCommandL( + EPhoneViewGetCountOfActiveCalls, &activeCallCount ); + switch( activeCallCount.Integer() ) { case ENoActiveCalls: MakeStateTransitionToIdleL(); break; + case EOneActiveCall: - if ( !MakeTransitionToWaitingInSingleL() ) + { + // Fetch ringing call's id from view + TPhoneCmdParamCallStateData callStateData; + callStateData.SetCallState( EPEStateRinging ); + iViewCommandHandle->HandleCommandL( + EPhoneViewGetCallIdByState, &callStateData ); + + if( callStateData.CallId() > KErrNotFound ) + { + CPhonePubSubProxy::Instance()->ChangePropertyValue( + KPSUidScreenSaver, + KScreenSaverAllowScreenSaver, + EPhoneScreensaverNotAllowed ); + UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); + iStateMachine->ChangeState( EPhoneStateWaitingInSingle ); + } + else { MakeStateTransitionToSingleL(); } + } break; case ETwoActiveCalls: @@ -467,7 +484,8 @@ MakeStateTransitionToTwoSinglesL(); break; } - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); } // ----------------------------------------------------------- @@ -546,6 +564,7 @@ TPhoneCmdParamBoolean holdFlag; holdFlag.SetBoolean( ETrue ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); + } // ----------------------------------------------------------- @@ -584,6 +603,7 @@ } SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate ); + UpdateInCallCbaL(); } @@ -599,6 +619,7 @@ booleanParam.SetBoolean( ETrue ); iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenConferenceList, &booleanParam ); + iCbaManager->SetCbaL( EPhoneDropParticipantCBA ); } @@ -614,13 +635,14 @@ TPhoneViewResponseId response; TPhoneCmdParamInteger callId; response = iViewCommandHandle->HandleCommandL( - EPhoneViewSelectedConfMember, &callId ); + EPhoneViewSelectedConfMember, &callId ); if( response == EPhoneViewResponseSuccess ) { - iStateMachine->SetCallId( callId.Integer() ); + // Drop the call from conference + iStateMachine->SetCallId( callId.Integer() ); iStateMachine->SendPhoneEngineMessage( - CPEPhoneModelIF::EPEMessageDropConferenceMember ); + CPEPhoneModelIF::EPEMessageDropConferenceMember ); } } @@ -636,6 +658,7 @@ booleanParam.SetBoolean( ETrue ); iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenConferenceList, &booleanParam ); + iCbaManager->SetCbaL( EPhonePrivateParticipantCBA ); } @@ -661,12 +684,12 @@ CPEPhoneModelIF::EPEMessageGoOneToOne ); // Update call view - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); CloseSelectionListL(); SetTouchPaneButtons( EPhoneConferenceButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); - UpdateCbaL( EPhoneCallHandlingInCallCBA ); + UpdateCbaL( EPhoneCallHandlingInCallCBA ); } } @@ -678,6 +701,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::MakeStateTransitionToIdleL()"); + SetDefaultFlagsL(); if ( IsNumberEntryUsedL() ) @@ -686,7 +710,9 @@ { // Return phone to the background if menu application is needed to foreground. iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility ); + // Set Number Entry CBA iCbaManager->SetCbaL( EPhoneNumberAcqCBA ); } @@ -694,9 +720,10 @@ { // Show the number entry if it exists SetNumberEntryVisibilityL(ETrue); + // Close dtmf dialer when call is disconnected. if ( iOnScreenDialer && IsDTMFEditorVisibleL() ) - { + { CloseDTMFEditorL(); // Display idle screen and update CBAs DisplayIdleScreenL(); @@ -705,51 +732,31 @@ } else if ( !TopAppIsDisplayedL() || NeedToReturnToForegroundAppL() ) { + // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); + // Continue displaying current app but set up the // idle screen in the background SetupIdleScreenInBackgroundL(); } else { + // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); + + // Display idle screen DisplayIdleScreenL(); } // Display call termination note, if necessary DisplayCallTerminationNoteL(); + UpdateCbaL( EPhoneEmptyCBA ); + // Go to idle state iStateMachine->ChangeState( EPhoneStateIdle ); } // ----------------------------------------------------------- -// CPhoneConference::MakeTransitionToWaitingInSingleL -// ----------------------------------------------------------- -// -TBool CPhoneConference::MakeTransitionToWaitingInSingleL() - { - __LOGMETHODSTARTEND( EPhoneUIStates, - "CPhoneConference::MakeTransitionToWaitingInSingleL()"); - TBool retValue(EFalse); - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if ( callStateData.CallId() > KErrNotFound ) - { - CPhonePubSubProxy::Instance()->ChangePropertyValue( - KPSUidScreenSaver, - KScreenSaverAllowScreenSaver, - EPhoneScreensaverNotAllowed ); - UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); - iStateMachine->ChangeState( EPhoneStateWaitingInSingle ); - retValue = ETrue; - } - return retValue; - } - -// ----------------------------------------------------------- // CPhoneConference::MakeStateTransitionToSingleL // ----------------------------------------------------------- // @@ -757,10 +764,15 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::MakeStateTransitionToSingleL()"); + // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - SetTouchPaneButtons( EPhoneIncallButtons ); + + + SetTouchPaneButtons( EPhoneIncallButtons ); + + // Go to single state UpdateCbaL( EPhoneCallHandlingInCallCBA ); - iStateMachine->ChangeState( EPhoneStateSingle ); + iStateMachine->ChangeState( EPhoneStateSingle ); } // ----------------------------------------------------------- @@ -771,10 +783,17 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::MakeStateTransitionToTwoSinglesL()"); + // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - SetTouchPaneButtons( EPhoneTwoSinglesButtons ); + + + SetTouchPaneButtons( EPhoneTwoSinglesButtons ); + + // Set Two singles softkeys UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); - iStateMachine->ChangeState( EPhoneStateTwoSingles ); + + // Go to two singles state + iStateMachine->ChangeState( EPhoneStateTwoSingles ); } // ----------------------------------------------------------- @@ -880,11 +899,16 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleIncomingL()"); + CPhonePubSubProxy::Instance()->ChangePropertyValue( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, EPhoneScreensaverNotAllowed ); - TransitionHandlerL().IncomingCallUiUpdateLC(); + + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiAppear ) : + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -894,23 +918,32 @@ // Indicate that the menu application on foreground needs to be sent back to the foreground // after call is ended. - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); + + TPhoneCmdParamBoolean dialerParam; + dialerParam.SetBoolean( ETrue ); // Get allow waiting call header param value. - TPhoneCmdParamBoolean dialerParam; - dialerParam.SetBoolean( ETrue ); AllowShowingOfWaitingCallHeaderL( dialerParam ); CloseSelectionListL(); // Close fast swap window if it's displayed - EikonEnv()->DismissTaskList(); + CEikonEnv::Static()->DismissTaskList(); SetTouchPaneButtons( EPhoneWaitingCallButtons ); + // Display incoming call DisplayIncomingCallL( aCallId, dialerParam ); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); + + // Go to incoming state UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting ); } @@ -921,7 +954,7 @@ // void CPhoneConference::DisplayIncomingCallL( TInt aCallId, - const TPhoneCmdParamBoolean /*aCommandParam*/ ) + const TPhoneCmdParamBoolean aCommandParam ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::DisplayIncomingCallL()"); @@ -933,7 +966,11 @@ // Indicate that the Phone needs to be sent to the background if // an application other than the top application is in the foreground - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; @@ -957,7 +994,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleWentOneToOneL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update conference bubble iViewCommandHandle->ExecuteCommandL( @@ -981,7 +1018,7 @@ { SetTouchPaneButtons( EPhoneTwoSinglesButtons ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -990,7 +1027,7 @@ // void CPhoneConference::OpenParticipantsListL() { - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); TPhoneCmdParamBoolean booleanParam; booleanParam.SetBoolean( ETrue ); @@ -1000,7 +1037,7 @@ SetTouchPaneButtons( EPhoneParticipantListButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); iCbaManager->SetCbaL( EPhoneParticipantListCBA ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -248,17 +248,14 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectingL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -282,7 +279,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, &callHeaderParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -296,7 +293,7 @@ // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Show bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -316,7 +313,7 @@ SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA ); @@ -332,10 +329,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndCallSetup::HandleIdleL()"); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -381,8 +375,8 @@ else { // Remove outgoing call - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); CheckIfRestoreNEContentAfterDtmfDialer(); if ( IsNumberEntryUsedL() ) @@ -392,7 +386,8 @@ } SetTouchPaneButtons( EPhoneConferenceButtons ); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateConference ); } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -324,13 +324,13 @@ holdFlag.SetBoolean( EFalse ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam ); SetTouchPaneButtons( EPhoneConferenceAndHeldSingleButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } @@ -359,13 +359,13 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam ); SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -420,7 +420,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleAddedConferenceMemberL"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update conference bubble iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference ); @@ -430,7 +430,7 @@ SetTouchPaneButtons( EPhoneConferenceButtons ); SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); TPhoneCmdParamBoolean conferenceAndSingleFlag; conferenceAndSingleFlag.SetBoolean( EFalse ); @@ -460,7 +460,10 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleIncomingL"); - TransitionHandlerL().IncomingCallUiUpdateLC(); + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiAppear ) : + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -468,9 +471,10 @@ SetNumberEntryVisibilityL( EFalse ); } - // Get allow waiting call header param value. TPhoneCmdParamBoolean dialerParam; dialerParam.SetBoolean( ETrue ); + + // Get allow waiting call header param value. AllowShowingOfWaitingCallHeaderL( dialerParam ); // Close conference list @@ -485,17 +489,20 @@ SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer ); SetTouchPaneButtons( EPhoneWaitingCallButtons ); - + + // Display incoming call DisplayIncomingCallL( aCallId, dialerParam ); - TransitionHandlerL().EndUiUpdateAndEffect(); - + + EndUiUpdate(); + EndTransEffect(); TPhoneCmdParamBoolean conferenceAndSingleFlag; conferenceAndSingleFlag.SetBoolean( EFalse ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, - &conferenceAndSingleFlag ); - + &conferenceAndSingleFlag ); + + // Go to Conference And Single And Waiting state UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); - iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting ); + iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting ); } // ----------------------------------------------------------- @@ -528,7 +535,7 @@ else { // Remove call - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); TPhoneCmdParamBoolean conferenceAndSingleFlag; @@ -549,7 +556,10 @@ UpdateCbaL( EPhoneCallHandlingInCallCBA ); } - TransitionHandlerL().EndUiUpdate(); + + + EndUiUpdate(); + iStateMachine->ChangeState( EPhoneStateConference ); } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -198,7 +198,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer ); SetTouchPaneButtons( EPhoneWaitingCallButtons ); @@ -240,7 +240,7 @@ } } } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -341,7 +341,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleConferenceIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); @@ -353,7 +353,7 @@ MakeTransitionAccordingToActiveCallsL(); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // -------------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -265,7 +265,7 @@ void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId ) { __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); if ( IsConferenceBubbleInSelectionMode() ) @@ -291,7 +291,7 @@ SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // CBA updates in above if-else conditions iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); } @@ -316,7 +316,7 @@ if( iRingingCallId == aCallId ) { - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -351,7 +351,7 @@ { SetTouchPaneButtons( EPhoneConferenceButtons ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // CBA updates in above if-else conditions iStateMachine->ChangeState( EPhoneStateConference ); } @@ -376,7 +376,7 @@ void CPhoneConferenceAndWaiting::HandleConferenceIdleL() { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); TPhoneCmdParamInteger activeCallCount; @@ -449,7 +449,7 @@ // come earlier than idle for conference member break; } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -494,7 +494,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleWentOneToOneL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update conference bubble iViewCommandHandle->ExecuteCommandL( @@ -523,7 +523,7 @@ // Go to Conference And Single And Waiting state iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -297,16 +297,13 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -322,7 +319,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); } @@ -336,7 +333,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); @@ -358,7 +355,7 @@ SetTouchPaneButtons( EPhoneWaitingCallButtons ); SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Go to Conference And Single And Waiting state UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); @@ -385,7 +382,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); @@ -431,7 +428,7 @@ iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting ); } } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -444,10 +441,7 @@ "CPhoneConferenceAndWaitingAndCallSetup::HandleIdleL"); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -481,7 +475,7 @@ } else { - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); TPhoneCmdParamCallStateData callStateData; callStateData.SetCallState( EPEStateRinging ); iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, @@ -509,7 +503,7 @@ UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } } } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneemergency.cpp --- a/phoneapp/phoneuistates/src/cphoneemergency.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -207,10 +207,7 @@ // Re-enable global notes, this enables secui (if needed) to come on top // if call creation was rejected by user - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); if ( iOnScreenDialer && IsDTMFEditorVisibleL() ) { @@ -332,7 +329,7 @@ if ( aCallId == KPEEmergencyCallId ) { - if ( !IsSimOk() || IsSimStateNotPresentWithSecurityModeEnabled() ) + if ( !IsSimOk() ) { TPhoneCmdParamBoolean visibleMode; visibleMode.SetBoolean( ETrue ); @@ -351,19 +348,19 @@ iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar ); // Disable global notes when the phone is dialling - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( ETrue ); - iViewCommandHandle->ExecuteCommandL( - EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + DisableGlobalNotifiersL(); // Capture keys when the phone is dialling CaptureKeysDuringCallNotificationL( ETrue ); // Indicate that the Phone needs to be sent to the background if // an application other than the top application is in the foreground - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); - + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); + // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; uidParam.SetInteger( KUidPhoneApplication.iUid ); @@ -405,12 +402,8 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); + EnableEikonNotifiersL(); if( TouchCallHandlingSupported() ) { @@ -445,7 +438,7 @@ emergencyHeaderParam.SetCipheringIndicatorAllowed( iStateMachine->PhoneEngineInfo()->SecureSpecified() ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Notify the view iViewCommandHandle->ExecuteCommandL( @@ -461,7 +454,7 @@ aCallId, &headerParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateInCallCbaL(); } @@ -474,7 +467,7 @@ { __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectedL() "); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); TPhoneCmdParamCallHeaderData emergencyHeaderParam; emergencyHeaderParam.SetCallState( EPEStateConnected ); @@ -484,7 +477,7 @@ aCallId, &emergencyHeaderParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); SetToolbarDimming( ETrue ); UpdateInCallCbaL(); } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp --- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -21,8 +21,6 @@ #include #include #include -#include -#include #include "phoneui.pan" #include "phonerssbase.h" @@ -36,7 +34,6 @@ #include "tphonecmdparamglobalnote.h" #include "tphonecmdparamnote.h" #include "cphonemainresourceresolver.h" -#include "cphonecenrepproxy.h" // ================= MEMBER FUNCTIONS ======================= @@ -113,32 +110,9 @@ TPhoneCmdParamGlobalNote globalNoteParam; globalNoteParam.SetType( EAknGlobalInformationNote ); - - if ( CPhoneCenRepProxy::Instance()-> - IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) ) - { - // Show varied note if clear code customization is enabled - TInt variedNote( KErrNotFound ); - //Get varied resource - variedNote = ResourceVariation(); - if ( variedNote != KErrNotFound ) - { - globalNoteParam.SetTextResourceId( variedNote ); - } - else - { - // If varied resource is not found, show original note. - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( aResourceId ) ); - } - } - else - { - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( aResourceId ) ); - } + globalNoteParam.SetTextResourceId( + CPhoneMainResourceResolver::Instance()-> + ResolveResourceID( aResourceId ) ); globalNoteParam.SetTone( EAvkonSIDInformationTone ); iViewCommandHandle->ExecuteCommandL( @@ -169,32 +143,9 @@ TPhoneCmdParamGlobalNote globalNoteParam; globalNoteParam.SetType( EAknGlobalErrorNote ); - - if ( CPhoneCenRepProxy::Instance()-> - IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) ) - { - // Show varied note if clear code customization is enabled - TInt variedNote( KErrNotFound ); - //Get varied resource - variedNote = ResourceVariation(); - if ( variedNote != KErrNotFound ) - { - globalNoteParam.SetTextResourceId( variedNote ); - } - else - { - // If varied resource is not found, show original note. - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( aResourceId ) ); - } - } - else - { - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( aResourceId ) ); - } + globalNoteParam.SetTextResourceId( + CPhoneMainResourceResolver::Instance()-> + ResolveResourceID( aResourceId ) ); globalNoteParam.SetTone( CAknNoteDialog::EErrorTone ); iViewCommandHandle->ExecuteCommandL( @@ -225,32 +176,9 @@ TPhoneCmdParamGlobalNote globalNoteParam; globalNoteParam.SetType( EAknGlobalWarningNote ); - - if ( CPhoneCenRepProxy::Instance()-> - IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) ) - { - // Show varied note if clear code customization is enabled - TInt variedNote( KErrNotFound ); - //Get varied resource - variedNote = ResourceVariation(); - if ( variedNote != KErrNotFound ) - { - globalNoteParam.SetTextResourceId( variedNote ); - } - else - { - // If varied resource is not found, show original note. - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( aResourceId ) ); - } - } - else - { - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( aResourceId ) ); - } + globalNoteParam.SetTextResourceId( + CPhoneMainResourceResolver::Instance()-> + ResolveResourceID( aResourceId ) ); globalNoteParam.SetTone( EAvkonSIDWarningTone ); iViewCommandHandle->ExecuteCommandL( @@ -281,7 +209,6 @@ __PHONELOG1( EBasic, EPhoneControl, "PhoneUIControl: CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL - aErrorInfo.iErrorCode =%d ", aErrorInfo.iErrorCode); - iCallId = aErrorInfo.iCallId; switch( aErrorInfo.iErrorCode ) { @@ -640,7 +567,6 @@ aErrorInfo.iErrorCode); break; } - iCallId = KErrNotFound; } // ----------------------------------------------------------- @@ -681,124 +607,4 @@ ->CallType( aCallId )== EPECallTypeCSVoice ); } -// ----------------------------------------------------------------------------- -// CPhoneErrorMessagesHandler::ResourceVariation -// ----------------------------------------------------------------------------- -TInt CPhoneErrorMessagesHandler::ResourceVariation() const - { - TInt resource( KErrNotFound ); - - TInt callId = (KErrNotFound == iCallId) ? - iStateMachine->PhoneEngineInfo()->CallId() : - iCallId; - - //get exit code error from EngineInfo - TInt callError = iStateMachine->PhoneEngineInfo()->ProtocolError( callId ); - - switch( callError ) - { - case KErrGsmCCUnassignedNumber: - resource = R_NOTE_VAR_CAUSE_1; - break; - - case KErrGsmCCNoRouteToDestination: - resource = R_NOTE_VAR_CAUSE_3; - break; - - case KErrGsmCCOperatorDeterminedBarring: - resource = R_NOTE_VAR_CAUSE_8; - break; - - case KErrGsmCCUserBusy: - resource = R_NOTE_VAR_CAUSE_17; - break; - - case KErrGsmCCUserNotResponding: - resource = R_NOTE_VAR_CAUSE_18; - break; - - case KErrGsmCCCallRejected: - resource = R_NOTE_VAR_CAUSE_21; - break; - - case KErrGsmCCNumberChanged: - resource = R_NOTE_VAR_CAUSE_22; - break; - - case KErrGsmCCDestinationOutOfOrder: - resource = R_NOTE_VAR_CAUSE_27; - break; - - case KErrGsmCCFacilityRejected: - resource = R_NOTE_VAR_CAUSE_29; - break; - - case KErrGsmCCNetworkOutOfOrder: - resource = R_NOTE_VAR_CAUSE_38; - break; - - case KErrGsmCCTemporaryFailure: - resource = R_NOTE_VAR_CAUSE_41; - break; - - case KErrGsmCCSwitchingEquipmentCongestion: - resource = R_NOTE_VAR_CAUSE_42; - break; - - case KErrGsmCCAccessInformationDiscarded: - resource = R_NOTE_VAR_CAUSE_43; - break; - - case KErrGsmCCRequestedChannelNotAvailable: - resource = R_NOTE_VAR_CAUSE_44; - break; - - case KErrGsmCCResourceNotAvailable: - resource = R_NOTE_VAR_CAUSE_47; - break; - - case KErrGsmCCIncomingCallsBarredInCug: - resource = R_NOTE_VAR_CAUSE_55; - break; - - case KErrGsmCCBearerCapabilityNotAuthorised: - resource = R_NOTE_VAR_CAUSE_57; - break; - - case KErrGsmCCServiceNotAvailable: - resource = R_NOTE_VAR_CAUSE_63; - break; - - case KErrGsmCCBearerServiceNotImplemented: - resource = R_NOTE_VAR_CAUSE_65; - break; - - case KErrGsmCCRequestedFacilityNotImplemented: - resource = R_NOTE_VAR_CAUSE_69; - break; - - case KErrGsmCCUserNotInCug: - resource = R_NOTE_VAR_CAUSE_87; - break; - - case KErrGsmCCIncompatibleDestination: - resource = R_NOTE_VAR_CAUSE_88; - break; - - case KErrGsmCCSemanticallyIncorrectMessage: - resource = R_NOTE_VAR_CAUSE_95; - break; - - case KErrGsmCCUnspecifiedProtocolError: - resource = R_NOTE_VAR_CAUSE_111; - break; - - case KErrGsmCCUnspecifiedInterworkingError: - resource = R_NOTE_VAR_CAUSE_127; - break; - default: - break; - } - return resource; - } // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp --- a/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -252,6 +252,9 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneGeneralGsmMessagesHandler::HandleIncomingCallForwardedL()" ); + + iActiveState.SetDivertIndication( ETrue ); + } // ----------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonegsmincall.cpp --- a/phoneapp/phoneuistates/src/cphonegsmincall.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonegsmincall.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -289,13 +289,8 @@ &uidParam ); // Disable global notes when there is an incoming call - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( ETrue ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled, - &globalNotifierParam ); - + DisableGlobalNotifiersL(); + DisableEikonNotifiersL(); } // ----------------------------------------------------------- @@ -399,4 +394,53 @@ EPhoneViewShowGlobalNote, &globalNoteParam ); } + +// --------------------------------------------------------- +// CPhoneGsmInCall::SetDivertIndication +// --------------------------------------------------------- +// +EXPORT_C void CPhoneGsmInCall::SetDivertIndication( const TBool aDivertIndication ) + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneGsmInCall::SetDivertIndication()"); + + CPhoneState::SetDivertIndication( aDivertIndication ); + + TRAP_IGNORE( HandeDivertIndicationL() ); + } + +// --------------------------------------------------------- +// CPhoneGsmInCall::HandeDivertIndicationL +// --------------------------------------------------------- +// +void CPhoneGsmInCall::HandeDivertIndicationL() + { + __LOGMETHODSTARTEND( EPhoneControl, "CPhoneGsmInCall::HandeDivertIndicationL()"); + + TBuf< KPhoneContactNameMaxLength > remoteInfoText( KNullDesC ); + TInt ringingCallId ( KErrNotFound ); + + ringingCallId = GetRingingCallL(); + + if( ringingCallId > KErrNotFound ) + { + TPhoneCmdParamCallHeaderData divertData; + + divertData.SetCallFlag( CBubbleManager::EDiverted ); + + GetRemoteInfoDataL( ringingCallId, remoteInfoText ); + divertData.SetCLIText( + remoteInfoText, + CBubbleManager::ERight ); + + divertData.SetCiphering( + iStateMachine->PhoneEngineInfo()->IsSecureCall( ringingCallId ) ); + divertData.SetCipheringIndicatorAllowed( + iStateMachine->PhoneEngineInfo()->SecureSpecified() ); + + iViewCommandHandle->ExecuteCommandL( + EPhoneViewUpdateCallHeaderRemoteInfoData, ringingCallId, + &divertData ); + } + } + // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneincoming.cpp --- a/phoneapp/phoneuistates/src/cphoneincoming.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -165,9 +165,9 @@ // Prevent execution of CPhoneStateIncoming::HandleIdleL, only remove // the call bubble - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); iWaitingCallId = KErrNotFound; } @@ -193,12 +193,16 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneIncoming::HandleIncomingL()"); + TPhoneCmdParamCallStateData callState; callState.SetCallState( EPEStateConnected ); iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallIdByState, &callState ); TInt connectedCall = callState.CallId(); - TransitionHandlerL().IncomingCallUiUpdateLC(); + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiAppear ) : + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -208,10 +212,11 @@ TPhoneCmdParamBoolean dialerParam; dialerParam.SetBoolean( ETrue ); + AllowShowingOfWaitingCallHeaderL( dialerParam ); // Close fast swap window if it's displayed - EikonEnv()->DismissTaskList(); + CEikonEnv::Static()->DismissTaskList(); // If the 1st incoming call became Connected, this is waiting call // If the 1st incoming call went just Idle, this is a normal call @@ -230,8 +235,11 @@ } SetToolbarDimming( EFalse ); + // Display incoming call DisplayIncomingCallL( aCallId, dialerParam ); - TransitionHandlerL().EndUiUpdateAndEffect(); + + EndUiUpdate(); + EndTransEffect(); if ( connectedCall > KErrNotFound ) { @@ -265,8 +273,12 @@ // Indicate that the Phone needs to be sent to the background if // an application other than the top application is in the foreground - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); - + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); + // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; uidParam.SetInteger( KUidPhoneApplication.iUid ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphoneresourceresolvergsm.cpp --- a/phoneapp/phoneuistates/src/cphoneresourceresolvergsm.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneresourceresolvergsm.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -40,8 +40,7 @@ // might leave. // ----------------------------------------------------------------------------- // -EXPORT_C CPhoneResourceResolverGSM::CPhoneResourceResolverGSM() : - iEnv( *CEikonEnv::Static() ) // codescanner::performance::eikonenvstatic +EXPORT_C CPhoneResourceResolverGSM::CPhoneResourceResolverGSM(): iEnv( *CEikonEnv::Static() ) { } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonesingleandalerting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -196,7 +196,7 @@ // Close menu bar, if it is displayed iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); - TransitionHandlerL().BeginUiUpdateLC(); + CPhoneState::BeginUiUpdateLC(); // Show bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -205,7 +205,7 @@ &callHeaderParam ); SetTouchPaneButtons( EPhoneTwoSinglesButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Set Hold flag to view TPhoneCmdParamBoolean holdFlag; @@ -240,7 +240,8 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndAlerting::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + + BeginUiUpdateLC(); // Remove call iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -276,7 +277,8 @@ UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateAlerting ); } - TransitionHandlerL().EndUiUpdate(); + + EndUiUpdate(); } // ----------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -204,17 +204,14 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetup::HandleConnectingL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); // Stop capturing keys CaptureKeysDuringCallNotificationL( EFalse ); @@ -230,7 +227,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, &callHeaderParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Set Hold flag to view EFalse that dtmf menu item not delete TPhoneCmdParamBoolean holdFlag; @@ -251,7 +248,7 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetup::HandleConnectedL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Show bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -276,8 +273,9 @@ SetTouchPaneButtons( EPhoneTwoSinglesButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + // Go to two singles state UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); iStateMachine->ChangeState( EPhoneStateTwoSingles ); @@ -290,7 +288,7 @@ void CPhoneSingleAndCallSetup::HandleIdleL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetup::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); // Find out do we have single or outgoing call left @@ -328,7 +326,7 @@ UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); iStateMachine->ChangeState( EPhoneStateCallSetup ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -423,12 +423,9 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update bubble content UpdateRemoteInfoDataL( aCallId ); @@ -439,7 +436,7 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, &callHeaderParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Set call waiting cba UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); @@ -507,13 +504,15 @@ holdFlag.SetBoolean( EFalse ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); SetTouchPaneButtons( EPhoneCallSetupButtons ); SetToolbarDimming( ETrue ); SetToolbarButtonLoudspeakerEnabled(); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + + // Go to Call Setup And Waiting state // No need to update cbas iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting ); } @@ -546,11 +545,12 @@ holdFlag.SetBoolean( ETrue ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); SetTouchPaneButtons( EPhoneWaitingCallButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + // Go to Single And Waiting state UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); iStateMachine->ChangeState( EPhoneStateWaitingInSingle ); } @@ -579,12 +579,13 @@ holdFlag.SetBoolean( EFalse ); iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); SetTouchPaneButtons( EPhoneCallSetupButtons ); - TransitionHandlerL().EndUiUpdate(); - UpdateCbaL( EPhoneCallHandlingInCallCBA ); + EndUiUpdate(); + // Go to Single And Alerting state + UpdateCbaL( EPhoneCallHandlingInCallCBA ); iStateMachine->ChangeState( EPhoneStateAlertingInSingle ); } @@ -592,17 +593,19 @@ // CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL // ----------------------------------------------------------- // -void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL( TInt /*aCallId*/ ) +void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL()"); - TransitionHandlerL().BeginUiUpdateLC(); + + BeginUiUpdateLC(); SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer ); SetTouchPaneButtons( EPhoneTwoSinglesButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + // Go to two singles state UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); iStateMachine->ChangeState( EPhoneStateTwoSingles ); } @@ -611,17 +614,17 @@ // CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL // ----------------------------------------------------------- // -void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL( TInt /*aCallId*/ ) +void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); SetTouchPaneButtons( EPhoneWaitingCallButtons ); SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // Go to two singles state and waiting UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -372,7 +372,7 @@ if( iSingleCallId == aCallId ) { // Idle message came for active call - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Remove call iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -423,14 +423,14 @@ // Play ringtone SetRingingTonePlaybackL( callStateData.CallId() ); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); SetToolbarDimming( ETrue ); iStateMachine->ChangeState( EPhoneStateIncoming ); } else { - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Remove call iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -461,19 +461,8 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); } } - - if ( IsVideoCall( iSingleCallId ) ) - { - TPhoneCmdParamInteger uidParam; - uidParam.SetInteger( KVtUiAppUidValue.iUid ); - - // Set video Phone as the top application - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication, - &uidParam ); - } - SetTouchPaneButtons( EPhoneIncallButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // CBA updates in above if-else conditions iStateMachine->ChangeState( EPhoneStateSingle ); } @@ -583,7 +572,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() "); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); // Show bubble TPhoneCmdParamCallHeaderData callHeaderParam; @@ -618,7 +607,7 @@ } SetTouchPaneButtons( EPhoneTwoSinglesButtons ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); // CBA updates in above if-else conditions iStateMachine->ChangeState( EPhoneStateTwoSingles ); } @@ -711,7 +700,7 @@ // CPhoneSingleAndWaiting::HandleDisconnectingL // ----------------------------------------------------------- // -void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt /*aCallId*/ ) +void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::HandleDisconnectingL( ) "); } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonesinglecall.cpp --- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -82,10 +82,7 @@ CPhoneGsmInCall::ConstructL(); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); TPhoneCmdParamBoolean holdFlag; holdFlag.SetBoolean( EFalse ); @@ -497,11 +494,15 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::HandleIncomingL()"); + CPhonePubSubProxy::Instance()->ChangePropertyValue( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, EPhoneScreensaverNotAllowed ); - TransitionHandlerL().IncomingCallUiUpdateLC(); + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiAppear ) : + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -509,20 +510,23 @@ SetNumberEntryVisibilityL( EFalse ); } - // Get allow waiting call header param value. TPhoneCmdParamBoolean dialerParam; dialerParam.SetBoolean( ETrue ); + + // Get allow waiting call header param value. AllowShowingOfWaitingCallHeaderL( dialerParam ); // Close fast swap window if it's displayed - EikonEnv()->DismissTaskList(); + CEikonEnv::Static()->DismissTaskList(); // Show incoming call buttons - SetTouchPaneButtons( EPhoneWaitingCallButtons ); - + SetTouchPaneButtons( EPhoneWaitingCallButtons ); + + // Display incoming call DisplayIncomingCallL( aCallId, dialerParam ); - TransitionHandlerL().EndUiUpdateAndEffect(); - + + EndUiUpdate(); + EndTransEffect(); // This query is required to dismiss // Operation cannot be completed in waiting and single state if ( iSwitchToVideoQuery ) @@ -539,7 +543,7 @@ // void CPhoneSingleCall::DisplayIncomingCallL( TInt aCallId, - const TPhoneCmdParamBoolean /*aCommandParam*/ ) + const TPhoneCmdParamBoolean aCommandParam ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::DisplayIncomingCallL()"); @@ -557,8 +561,12 @@ // Indicate that the Phone needs to be sent to the background if // an application other than the top application is in the foreground - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); - + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); + // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; uidParam.SetInteger( KUidPhoneApplication.iUid ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonestatemachinegsm.cpp --- a/phoneapp/phoneuistates/src/cphonestatemachinegsm.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonestatemachinegsm.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -295,10 +295,6 @@ { __PHONELOGSTATECHANGE( iOldStateId, iNewStateId ); iOldStateId = iNewStateId; - - // Needs to be set or any attempts to access eikon env handle - // will fail - iState->SetEikonEnv( EikonEnv() ); } return iState; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonetwosingles.cpp --- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -76,10 +76,7 @@ CPhoneGsmInCall::ConstructL(); // Re-enable global notes - TPhoneCmdParamBoolean globalNotifierParam; - globalNotifierParam.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, - &globalNotifierParam ); + EnableGlobalNotifiersL(); CPhonePubSubProxy::Instance()->ChangePropertyValue( KPSUidScreenSaver, @@ -195,7 +192,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSingles::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Remove call iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId ); @@ -245,7 +242,7 @@ default: break; } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -355,7 +352,7 @@ callLabelId, CCoeEnv::Static() ); callHeaderParam.SetCLIText( conferenceText, CBubbleManager::ERight ); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); callHeaderParam.SetCiphering( iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) ); @@ -378,9 +375,11 @@ SetTouchPaneButtons( EPhoneConferenceButtons ); SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); UpdateCbaL( EPhoneCallHandlingInCallCBA ); + + // Go to conference state // No need for CBA update iStateMachine->ChangeState( EPhoneStateConference ); } @@ -392,12 +391,17 @@ void CPhoneTwoSingles::HandleIncomingL( TInt aCallId ) { __LOGMETHODSTARTEND( EPhoneUIStates, - "CPhoneTwoSingles::HandleIncomingL()"); + "CPhoneTwoSingles::HandleIncomingL()"); + CPhonePubSubProxy::Instance()->ChangePropertyValue( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, EPhoneScreensaverNotAllowed ); - TransitionHandlerL().IncomingCallUiUpdateLC(); + + IsNumberEntryUsedL() ? + BeginTransEffectLC( ECallUiAppear ) : + BeginTransEffectLC( ENumberEntryOpen ); + BeginUiUpdateLC(); // Hide the number entry if it exists if ( IsNumberEntryUsedL() ) @@ -405,22 +409,27 @@ SetNumberEntryVisibilityL( EFalse ); } - // Get allow waiting call header param value. TPhoneCmdParamBoolean dialerParam; dialerParam.SetBoolean( ETrue ); + + // Get allow waiting call header param value. AllowShowingOfWaitingCallHeaderL( dialerParam ); // Close fast swap window if it's displayed - EikonEnv()->DismissTaskList(); + CEikonEnv::Static()->DismissTaskList(); + // Display incoming call DisplayIncomingCallL( aCallId, dialerParam ); // Set touch controls SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer ); + SetTouchPaneButtons( EPhoneWaitingCallButtons ); - TransitionHandlerL().EndUiUpdateAndEffect(); + EndUiUpdate(); + EndTransEffect(); + // Go to incoming state UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting ); } @@ -431,7 +440,7 @@ // void CPhoneTwoSingles::DisplayIncomingCallL( TInt aCallId, - const TPhoneCmdParamBoolean /*aCommandParam*/ ) + const TPhoneCmdParamBoolean aCommandParam ) { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSingles::DisplayIncomingCallL()"); @@ -443,7 +452,11 @@ // Indicate that the Phone needs to be sent to the background if // an application other than the top application is in the foreground - SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() ); + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( !TopAppIsDisplayedL() ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); // Bring Phone app in the foreground TPhoneCmdParamInteger uidParam; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -217,7 +217,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSinglesAndWaiting::HandleIdleL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); if ( !IsNumberEntryUsedL() ) { iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); @@ -232,7 +232,7 @@ { StateTransitionToSingleAndWaitingL(); } - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); } // ----------------------------------------------------------- @@ -309,7 +309,7 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSinglesAndWaiting::HandleConnectedConferenceL()"); - TransitionHandlerL().BeginUiUpdateLC(); + BeginUiUpdateLC(); // Update call state TPhoneCmdParamCallHeaderData callHeaderParam; @@ -343,11 +343,17 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateConference, aCallId, &callHeaderParam ); - SetNeedToReturnToForegroundAppStatusL( EFalse ); + // Clear the flag + TPhoneCmdParamBoolean booleanParam; + booleanParam.SetBoolean( EFalse ); + iViewCommandHandle->ExecuteCommandL( + EPhoneViewSetNeedToReturnToForegroundAppStatus, + &booleanParam ); - TransitionHandlerL().EndUiUpdate(); + EndUiUpdate(); + // Go to Conference And Waiting state // No need for CBA update - iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting ); + iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting ); } // ----------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/bwins/phoneuiutilsu.def --- a/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def Wed Oct 13 14:31:22 2010 +0300 @@ -328,5 +328,4 @@ ?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@VTCallBack@@@Z @ 327 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class TCallBack) ?ContactMatcher@TPhoneCmdParamReconnectQuery@@QBEPAVCPhCntMatcher@@XZ @ 328 NONAME ; class CPhCntMatcher * TPhoneCmdParamReconnectQuery::ContactMatcher(void) const ?ConvertToNumeric@CPhoneQwertyHandler@@QAEHAAUTKeyEvent@@@Z @ 329 NONAME ; int CPhoneQwertyHandler::ConvertToNumeric(struct TKeyEvent &) - ?DoVanityNumberConversion@PhoneVanityDialingUtils@@SAXAAVTDes16@@@Z @ 330 NONAME ; void PhoneVanityDialingUtils::DoVanityNumberConversion(class TDes16 &) diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/eabi/phoneuiutilsu.def --- a/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def Wed Oct 13 14:31:22 2010 +0300 @@ -420,5 +420,4 @@ _ZThn4_N26CPhoneResourceResolverBaseD1Ev @ 419 NONAME _ZThn4_NK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 420 NONAME _ZN19CPhoneQwertyHandler16ConvertToNumericER9TKeyEvent @ 421 NONAME - _ZN23PhoneVanityDialingUtils24DoVanityNumberConversionER6TDes16 @ 422 NONAME diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/group/phoneuiutils.mmp --- a/phoneapp/phoneuiutils/group/phoneuiutils.mmp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/group/phoneuiutils.mmp Wed Oct 13 14:31:22 2010 +0300 @@ -53,7 +53,6 @@ SOURCE phoneloggerviewcommands.cpp SOURCE phonestatestrings.cpp SOURCE phonestatestringsgsm.cpp -SOURCE phonevanitydialingutils.cpp SOURCE rphoneanimclearblacklist.cpp SOURCE tphonecmdparamappinfo.cpp SOURCE tphonecmdparamaudiooutput.cpp diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/inc/cphoneresourceresolverbase.h --- a/phoneapp/phoneuiutils/inc/cphoneresourceresolverbase.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/inc/cphoneresourceresolverbase.h Wed Oct 13 14:31:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 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" diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/inc/phoneconstants.h --- a/phoneapp/phoneuiutils/inc/phoneconstants.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/inc/phoneconstants.h Wed Oct 13 14:31:22 2010 +0300 @@ -161,18 +161,14 @@ // Used in CPhoneKeys // The character to be used as the 'wait' character, by DTMF code. -const TUint KPhoneDtmfWaitCharacter = 'w'; -const TUint KPhoneDtmfWaitCharacterUpper = 'W'; +const TUint KPhoneDtmfWaitCharacter = 'w'; // The character to be used as the 'soft pause' character, by DTMF code. const TUint KPhoneDtmfPauseCharacter = 'p'; -const TUint KPhoneDtmfPauseCharacterUpper = 'P'; // The character to be used as the 'speed-dial' character, by DTMF code. const TUint KPhoneDtmfSpeedDialCharacter = '+'; -const TUint KPhoneDtmfPlusCharacter = 135; // Bluetooth SU-8W '+' - // The length of the speed dial prefix, used to prevent buffer overflow const TUint KPhoneDtmfSpeedDialPrefixLength = 1; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/inc/phonerssbase.h --- a/phoneapp/phoneuiutils/inc/phonerssbase.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/inc/phonerssbase.h Wed Oct 13 14:31:22 2010 +0300 @@ -138,6 +138,8 @@ EPhoneVideoCallIncoming, EPhoneVideoCallIncomingShort, + // "Muted" + EPhoneInCallMutedText, // "Call" EPhoneCall, // " Call %N" diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/inc/phonevanitydialingutils.h --- a/phoneapp/phoneuiutils/inc/phonevanitydialingutils.h Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Helper class for converting vanity dialing numbers -* -*/ - - -#ifndef PHONEVANITYDIALINGUTILS_H -#define PHONEVANITYDIALINGUTILS_H - - -// INCLUDES -#include - - -// CLASS DECLARATION - -/** -* Defines helper function for vanity dialing number conversion -*/ -class PhoneVanityDialingUtils - { - public: - /** - * Converts vanity dialing number to normal phone number - * @param aDes Phone number to be converted - */ - IMPORT_C static void DoVanityNumberConversion( TDes& aDes ); - }; - - -#endif //PHONEVANITYDIALINGUTILS_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/inc/tphonecmdparamtranseffect.h --- a/phoneapp/phoneuiutils/inc/tphonecmdparamtranseffect.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/inc/tphonecmdparamtranseffect.h Wed Oct 13 14:31:22 2010 +0300 @@ -37,17 +37,17 @@ enum TPhoneTransEffectType { EPhoneTransEffectNone, - /* These two effects are for internal transitions(CallUi <-> Dialer) */ EPhoneTransEffectCallUiAppear, EPhoneTransEffectCallUiDisappear, - /* These two effect types can be used only when CallUi or Dialer is - opened/closed from some other app. These cannot be used for - internal transitions between CallUi<->Dialer.*/ - EPhoneTransEffectPhoneUiOpen, - EPhoneTransEffectPhoneUiClose, + // These 3 effect types can be used only when dialer is + // opened/closed when some other app than phone is visible + // on the foreground/in the background. + // These cannot be used for internal transitions (=call ui<->dialer). + EPhoneTransEffectDialerOpen, + EPhoneTransEffectDialerClose, EPhoneTransEffectDialerCreate, - /* For applying effect to external app launch done from dialer. - Effects triggered by App FW don't work properly.*/ + // For applying effect to external app launch done from dialer. + // Effects triggered by App FW don't work properly. EPhoneTransEffectAppStartFromDialer, EPhoneTransEffectStop }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/inc/tphonecommandparam.h --- a/phoneapp/phoneuiutils/inc/tphonecommandparam.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/inc/tphonecommandparam.h Wed Oct 13 14:31:22 2010 +0300 @@ -102,7 +102,6 @@ EPhoneParamIdGlobalWaitNote, EPhoneNumberEntryObserver, EPhoneParamIdPointer, - EPhoneParamIdEffect, // Add new params before this EPhoneParamIdLast }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/src/cphonekeys.cpp --- a/phoneapp/phoneuiutils/src/cphonekeys.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/src/cphonekeys.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -86,13 +86,9 @@ case KPhoneDtmfHashCharacter: // Hash case KPhoneDtmfStarCharacter: // Asterisk // the following key can be got via taps of * - case KPhoneDtmfSpeedDialCharacter: // Plus - case KPhoneDtmfPlusCharacter: // SU-8W Plus - - case KPhoneDtmfPauseCharacterUpper: // DTMF Soft-Pause character 'P' - case KPhoneDtmfWaitCharacterUpper: // DTMF Wait character 'W' - case KPhoneDtmfPauseCharacter: // DTMF Soft-Pause character 'p' - case KPhoneDtmfWaitCharacter: // DTMF Wait character 'w' + case KPhoneDtmfSpeedDialCharacter: // Plus + case KPhoneDtmfPauseCharacter: // DTMF Soft-Pause character + case KPhoneDtmfWaitCharacter: // DTMF Wait character result = ETrue; break; default: diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp --- a/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -49,7 +49,7 @@ // ----------------------------------------------------------------------------- // EXPORT_C CPhoneResourceResolverBase::CPhoneResourceResolverBase(): - iEnv( *CEikonEnv::Static() ) // codescanner::performance::eikonenvstatic + iEnv( *CEikonEnv::Static() ) { if ( FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) ) { @@ -1096,6 +1096,10 @@ retVal = R_PHONE_DISCONNECTING_NETWORK_WAIT_NOTE; break; + case EPhoneInCallMutedText: + retVal = R_PHONE_INCALL_MUTED_PANE; + break; + case EPhoneInCallNumberText: retVal = R_PHONEUI_INCALL_CALL_NUMBER; break; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/src/phonevanitydialingutils.cpp --- a/phoneapp/phoneuiutils/src/phonevanitydialingutils.cpp Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,163 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Helper class for converting vanity dialing numbers -* -*/ - -// INCLUDE FILES -#include "phonevanitydialingutils.h" - -// CONSTANTS -const TInt KCharA = 'A'; -const TInt KCharB = 'B'; -const TInt KCharC = 'C'; -const TInt KCharD = 'D'; -const TInt KCharE = 'E'; -const TInt KCharF = 'F'; -const TInt KCharG = 'G'; -const TInt KCharH = 'H'; -const TInt KCharI = 'I'; -const TInt KCharJ = 'J'; -const TInt KCharK = 'K'; -const TInt KCharL = 'L'; -const TInt KCharM = 'M'; -const TInt KCharN = 'N'; -const TInt KCharO = 'O'; -const TInt KCharP = 'P'; -const TInt KCharQ = 'Q'; -const TInt KCharR = 'R'; -const TInt KCharS = 'S'; -const TInt KCharT = 'T'; -const TInt KCharU = 'U'; -const TInt KCharV = 'V'; -const TInt KCharW = 'W'; -const TInt KCharX = 'X'; -const TInt KCharY = 'Y'; -const TInt KCharZ = 'Z'; - -const TInt KChar2 = '2'; -const TInt KChar3 = '3'; -const TInt KChar4 = '4'; -const TInt KChar5 = '5'; -const TInt KChar6 = '6'; -const TInt KChar7 = '7'; -const TInt KChar8 = '8'; -const TInt KChar9 = '9'; - -_LIT( KPhoneVanityValidFirstChars, "0123456789+" ); -_LIT( KPhoneVanityValidChars, "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789*#+pw" ); - -// --------------------------------------------------------- -// CouldBeVanityNumber -// -// Vanity dialing numbers start with a number, and after that they -// contain only upper case letters (A-Z) and numbers -// for example: 555PIZZA, +3583ONE2THREE -// --------------------------------------------------------- -// -TBool CouldBeVanityNumber( TDesC& aDes ) - { - if ( !aDes.Length() ) - { - return EFalse; - } - - TBool possibleVanityNumber = ETrue; - - // check first character - TPtrC validFirstChar( KPhoneVanityValidFirstChars ); - if ( validFirstChar.Locate( aDes[0] ) == KErrNotFound ) - { - possibleVanityNumber = EFalse; - } - - // check rest of the string - TInt i = 1; - TPtrC validChar( KPhoneVanityValidChars ); - while ( possibleVanityNumber && i < aDes.Length() ) - { - if ( validChar.Locate( aDes[i] ) == KErrNotFound ) - { - possibleVanityNumber = EFalse; - } - i++; - } - - return possibleVanityNumber; - } - -// --------------------------------------------------------- -// PhoneVanityDialingUtils::DoVanityNumberConversion -// -// --------------------------------------------------------- -// -EXPORT_C void PhoneVanityDialingUtils::DoVanityNumberConversion( TDes& aDes ) - { - if ( CouldBeVanityNumber( aDes ) ) - { - for ( TInt i = 0; i < aDes.Length(); i++ ) - { - switch ( aDes[i] ) - { - case KCharA: - case KCharB: - case KCharC: - aDes[i] = KChar2; - break; - case KCharD: - case KCharE: - case KCharF: - aDes[i] = KChar3; - break; - case KCharG: - case KCharH: - case KCharI: - aDes[i] = KChar4; - break; - case KCharJ: - case KCharK: - case KCharL: - aDes[i] = KChar5; - break; - case KCharM: - case KCharN: - case KCharO: - aDes[i] = KChar6; - break; - case KCharP: - case KCharQ: - case KCharR: - case KCharS: - aDes[i] = KChar7; - break; - case KCharT: - case KCharU: - case KCharV: - aDes[i] = KChar8; - break; - case KCharW: - case KCharX: - case KCharY: - case KCharZ: - aDes[i] = KChar9; - break; - default: - break; - } - } - } - } - -// End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiutils/src/tphonecmdparamtranseffect.cpp --- a/phoneapp/phoneuiutils/src/tphonecmdparamtranseffect.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiutils/src/tphonecmdparamtranseffect.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -32,7 +32,6 @@ iType( EPhoneTransEffectNone ), iAppUid( KNullUid ) { - iParamId = EPhoneParamIdEffect; } // --------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/inc/c3dringingtoneinterface.inl --- a/phoneapp/phoneuiview/inc/c3dringingtoneinterface.inl Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/inc/c3dringingtoneinterface.inl Wed Oct 13 14:31:22 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include // CONSTANTS _LIT8( KCoUtlResolverData, "default" ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/inc/cphoneaudiocontroller.h --- a/phoneapp/phoneuiview/inc/cphoneaudiocontroller.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/inc/cphoneaudiocontroller.h Wed Oct 13 14:31:22 2010 +0300 @@ -73,7 +73,13 @@ * @param aCommandParam command parameter */ void HandleIhfChange( TPhoneCommandParam* aCommandParam ); - + + /** + * Update control using the specified data + * @param aCommandParam command parameter + */ + void HandleMuteChange( TPhoneCommandParam* aCommandParam ); + /** * Gets volume level from navi pane control. * @return Volume level. @@ -127,6 +133,14 @@ void PushL(CAknNavigationDecorator& aNew); /** + * Callback function. Called when navi pane should be updated + * back to default. + * @param aAny pointer to instance of this class. + * @return KErrNone always. + */ + static TInt DoUpdateNaviPaneToDefault( TAny* aAny ); + + /** * Get current volume decorator (Ihf or Ear) * @return Current volume decorator */ @@ -143,6 +157,12 @@ * @return Current Ihf or Ear volume level */ TInt VolumeLevel(); + + /** + * Select decorator based on current audio status + * @return Selected decorator (Ihf, Ear or Muted). + */ + CAknNavigationDecorator& SelectDecoratorL(); /** * Set volume level for given volume control @@ -169,6 +189,9 @@ // ETrue IHF is active TBool iIhfMode; + + // ETrue if transfer to or from IHF pending + TBool iIhfTransferPending; // Owned non-IHF volume control. CAknNavigationDecorator* iEarVolumeControl; @@ -176,9 +199,20 @@ // Non-IHF volume, from 1 to 10 TInt iEarVolume; + // Owned muted indicator + CAknNavigationDecorator* iMutedControl; + + // ETrue phone is muted + TBool iMuted; + + // ETrue if timed control transfer to muted is pending + TBool iTimedMuteTransferPending; + // Pointer the current control that is in navi pane CAknNavigationDecorator* iOldControl; - + + // Owned timer to update navi pane + CPhoneTimer* iNaviPaneUpdateTimer; /** * ETrue if Telephony is the foreground application, diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/inc/cphonemenucontroller.h --- a/phoneapp/phoneuiview/inc/cphonemenucontroller.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/inc/cphonemenucontroller.h Wed Oct 13 14:31:22 2010 +0300 @@ -112,8 +112,6 @@ void SetAllowDtmfOptionsFlag( TBool aAllowDtmfOptions ); void SetVoipEnabledFlag( TPhoneCommandParam* aCommandParam ); - - void SetHideVoipCallDTMFVisibilityFlag ( TBool aHideVideoCallDTMFVisibility ); void SetHideVideoCallDTMFVisibilityFlag ( TBool aHideVideoCallDTMFVisibility ); @@ -194,7 +192,6 @@ TBool iAllowDtmfOptionsFlag; TBool iVoipEnabledFlag; TBool iHideVideoCallDTMFVisibility; - TBool iHideVoipCallDTMFVisibility; TBool iInvalidCsPhoneNumber; TBool iSecurityMode; // Eikon environment delivered from CPhoneViewController diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/inc/cphonetoolbarcontroller.h --- a/phoneapp/phoneuiview/inc/cphonetoolbarcontroller.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/inc/cphonetoolbarcontroller.h Wed Oct 13 14:31:22 2010 +0300 @@ -67,41 +67,13 @@ * Disables toolbar */ void HideToolbar(); - - /** - * Sets mute flag. - * @param aCommandParam command parameter - */ + void SetMuteFlag( TPhoneCommandParam* aCommandParam ); - /** - * Sets integrated handsfree in use -flag. - * @param aCommandParam command parameter - */ void SetIhfFlag( TPhoneCommandParam* aCommandParam ); - - /** - * Sets wired accessory in use -flag. - * @param aCommandParam command parameter - */ + void SetWiredAccFlag( TPhoneCommandParam* aCommandParam ); - - /** - * Sets Bluetooth accessory in use -flag. - * @param aCommandParam command parameter - */ - void SetBTAccFlag( TPhoneCommandParam* aCommandParam ); - - /** - * Sets Bluetooth accessory is available -flag. - * @param aCommandParam command parameter - */ - void SetBTAccAvailableFlag( TPhoneCommandParam* aCommandParam ); - - /** - * Sets call is in progress state -flag. - * @param aCommandParam command parameter - */ + void SetCallInProgressFlag( TPhoneCommandParam* aCommandParam ); /** @@ -199,23 +171,13 @@ * CoeEnv */ CCoeEnv& iCoeEnv; - - // Muted or not + TBool iMuteFlag; - // Integrated handsfree in use or not TBool iIhfFlag; - // Wired accessory in use or not TBool iWiredAccFlag; - // Bluetooth accessory in use or not - TBool iBTAccFlag; - - // Bluetooth accessory is available or not - TBool iBTAccAvailableFlag; - - // A call is progressing or not TBool iCallInProgress; // Dim activate IHF button diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h --- a/phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h Wed Oct 13 14:31:22 2010 +0300 @@ -237,9 +237,7 @@ EPhoneViewSetIncallBubbleFalse, EPhoneViewIsDisplayingMenuOrDialog, - EPhoneViewSetVoipCallDTMFVisibilityFlag, - - EPhoneAmountOfCommands // Don't remove this, this should always be the last in list. + EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list. }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/src/cphoneaudiocontroller.cpp --- a/phoneapp/phoneuiview/src/cphoneaudiocontroller.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/src/cphoneaudiocontroller.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -19,9 +19,9 @@ // INCLUDE FILES #include #include - +#include #include - +#include #include #include #include @@ -39,6 +39,9 @@ #include "phoneui.hrh" // CONSTANTS +// Defines how long time volume control is shown when volume is changed +// while device is muted. Duration in microseconds. +const TInt KPhoneDelayVolumeControlToDefaultAfterReleased = 1000000; // ================= MEMBER FUNCTIONS ======================= // C++ default constructor can NOT contain any code, that @@ -78,6 +81,13 @@ // To get touch input, pen check in HandleControlEventL() iEarVolumeControl->DecoratedControl()->SetObserver( this ); iIhfVolumeControl->DecoratedControl()->SetObserver( this ); + + // Create "muted" navi decorator + HBufC* mutedText = StringLoader::LoadLC( R_PHONE_INCALL_MUTED_PANE ); + iMutedControl = iStatusPane->NaviPane().CreateMessageLabelL( *mutedText ); + CleanupStack::PopAndDestroy( mutedText ); + + iNaviPaneUpdateTimer = CPhoneTimer::NewL(); iActivateRecoveryId = CPhoneRecoverySystem::Instance()->AddL( TCallBack( DoRecoverActivateL, this ), @@ -111,6 +121,8 @@ CCoeEnv::Static()->RemoveForegroundObserver( *this ); CPhoneRecoverySystem::Remove( iActivateRecoveryId ); + delete iNaviPaneUpdateTimer; + delete iMutedControl; delete iIhfVolumeControl; delete iEarVolumeControl; } @@ -126,8 +138,8 @@ if ( iVolumeControlCount == 1 ) // First time activation { // Decide whether decorator should be Ear or ihf decorator - CAknNavigationDecorator& selectedVolumeDecorator =VolumeDecorator(); - PushL( selectedVolumeDecorator ); + CAknNavigationDecorator& selectedDecorator = SelectDecoratorL(); + PushL( selectedDecorator ); } } @@ -156,11 +168,16 @@ if( iVolumeControlCount ) { - // Decide whether decorator should be Ear, Ihf decorator - CAknNavigationDecorator& selectedVolumeDecorator = VolumeDecorator(); - PushL( selectedVolumeDecorator ); - TInt volumeLevel = VolumeLevel(); - SetVolumeLevel( VolumeControl(), volumeLevel ); + // Decide whether decorator should be Ear, Ihf or Muted decorator + CAknNavigationDecorator& selectedDecorator = SelectDecoratorL(); + PushL( selectedDecorator ); + + if( &selectedDecorator != iMutedControl ) + { + TInt volumeLevel = VolumeLevel(); + + SetVolumeLevel( VolumeControl(), volumeLevel ); + } } } @@ -208,12 +225,34 @@ { iEarVolume = volumeParam->Integer(); } + + if( iMuted ) + { + // Enable timed control transition in muted state + iTimedMuteTransferPending = ETrue; + } + else + { + iTimedMuteTransferPending = EFalse; + } // Activate the approriate volume control CPhoneRecoverySystem::Instance()->RecoverNow( iActivateRecoveryId, CTeleRecoverySystem::EPhonePriorityStandard ); - + + if( iTimedMuteTransferPending ) + { + iTimedMuteTransferPending = EFalse; + + // Cancel any pending request + iNaviPaneUpdateTimer->CancelTimer(); + + // Activate change to Muted decorator after given delay + iNaviPaneUpdateTimer->After( + KPhoneDelayVolumeControlToDefaultAfterReleased, + TCallBack( DoUpdateNaviPaneToDefault, this ) ); + } } // --------------------------------------------------------- @@ -230,6 +269,28 @@ static_cast( aCommandParam ); iIhfMode = booleanParam->Boolean(); + + // Set state transition flag + iIhfTransferPending = ETrue; + } + +// --------------------------------------------------------- +// CPhoneAudioController::HandleMuteChange +// +// Updates incall indicator according to current call state. +// --------------------------------------------------------- +// +void CPhoneAudioController::HandleMuteChange( + TPhoneCommandParam* aCommandParam ) + { + __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioController::HandleMuteChange()"); + TPhoneCmdParamBoolean* booleanParam = + static_cast( aCommandParam ); + + iMuted = booleanParam->Boolean(); + + // Decide whether decorator should be ear, ihf or muted decorator + TRAP_IGNORE( PushL( SelectDecoratorL() ) ); } // ----------------------------------------------------------------------------- @@ -258,6 +319,20 @@ } // ----------------------------------------------------------------------------- +// CPhoneAudioController::DoUpdateNaviPaneToDefault +// ----------------------------------------------------------------------------- +// +TInt CPhoneAudioController::DoUpdateNaviPaneToDefault( TAny* aAny ) + { + __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioController::DoUpdateNaviPaneToDefault()"); + CPhoneAudioController* self = static_cast< CPhoneAudioController* >( aAny ); + CPhoneRecoverySystem::Instance()->RecoverNow( + self->iActivateRecoveryId, + CTeleRecoverySystem::EPhonePriorityStandard ); + return KErrNone; + } + +// ----------------------------------------------------------------------------- // CPhoneAudioController::HandleControlEventL // ----------------------------------------------------------------------------- // @@ -367,6 +442,43 @@ } // ----------------------------------------------------------------------------- +// CPhoneAudioController::SelectDecoratorL +// ----------------------------------------------------------------------------- +// +CAknNavigationDecorator& CPhoneAudioController::SelectDecoratorL() + { + __LOGMETHODSTARTEND( EPhoneUIView,"CPhoneAudioController::SelectDecoratorL()" ); + CAknNavigationDecorator* newDecorator = NULL; + if ( !iMuted ) + { + __PHONELOG( EBasic, EPhoneUIView,"CPhoneAudioController::SelectDecoratorL() - volume decorator " ); + newDecorator = &VolumeDecorator(); + } + else + { + if ( iIhfTransferPending || !iTimedMuteTransferPending ) + { + __PHONELOG( EBasic, EPhoneUIView,"CPhoneAudioController::SelectDecoratorL() - muted decorator " ); + newDecorator = iMutedControl; + } + else + { + __PHONELOG( EBasic, EPhoneUIView,"CPhoneAudioController::SelectDecoratorL() - volume decorator " ); + newDecorator = &VolumeDecorator(); + + // In muted state the volume decorator must be first + // pushed to container to enable volume popup showing + PushL( *newDecorator ); + } + } + + // Clear IHF transfer flag. + iIhfTransferPending = EFalse; + + return *newDecorator; + } + +// ----------------------------------------------------------------------------- // CPhoneAudioController::SetVolumeLevel // ----------------------------------------------------------------------------- // diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/src/cphonebubblewrapper.cpp --- a/phoneapp/phoneuiview/src/cphonebubblewrapper.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/src/cphonebubblewrapper.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -55,7 +55,6 @@ #include "mphonenumberentry.h" #include "cphonenumberentry.h" #include "phonebubbleextensionmanager.h" -#include "phonevanitydialingutils.h" #include "mphonecustomization.h" @@ -554,14 +553,6 @@ aCallHeaderParam->CNAPText(), aCallHeaderParam->CNAPTextClippingDirection() ); - // Set CLI type to be used in conference call participant list - CBubbleManager::TBubbleParticipantListCLI partipantCli = - ( aCallHeaderParam->ParticipantCLI() == - TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText ) ? - CBubbleManager::EParticipantListCNAP : - CBubbleManager::EParticipantListCLIText; - iBubbleManager->SetParticipantListCLI( aBubble, partipantCli ); - iBubbleManager->SetCallFlags( aBubble, aCallHeaderParam->CallFlag() ); // Set ciphering indicator @@ -662,18 +653,13 @@ AknTextUtils::ConvertDigitsTo( *entryContent->String(), EDigitTypeWestern ); - if ( FeatureManager::FeatureSupported( KFeatureIdFfHomeScreenVanityDialing ) ) - { - PhoneVanityDialingUtils::DoVanityNumberConversion( *entryContent->String() ); - } - __PHONELOG1( EBasic, EPhoneUIView, "CPhoneBubbleWrapper::GetNumberEntryContent(%S)", entryContent->String() ); } // ----------------------------------------------------------------------------- -// CPhoneBubbleWrapper.::GetLocalizedNumberEntryContent +// CPhoneBubbleWrapper.::GetNumberEntryContent // ----------------------------------------------------------------------------- // void CPhoneBubbleWrapper::GetLocalizedNumberEntryContent( @@ -706,6 +692,7 @@ if ( iUseDialer ) { iDialerNumberEntry->CreateNumberEntry(); + iDialerNumberEntry->GetNumberEntry()->SetFocus( ETrue ); } else { @@ -1394,9 +1381,9 @@ RemoveConferenceL(); } - iBubbleManager->RemoveCallHeader( bubble ); - iMapping->RemoveFromMapping( aCallId ); - iBubbleManager->EndChanges(); + iBubbleManager->RemoveCallHeader( bubble ); + iMapping->RemoveFromMapping( aCallId ); + iBubbleManager->EndChanges(); } } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/src/cphonemenucontroller.cpp --- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -277,11 +277,9 @@ break; case EPhoneNumberAcqCmdVideoCall: - if ( onScreenDialer && iNumberEntryEmpty ) - { - menuPane->DeleteMenuItem( menuItemArray[ i ] ); - } - else if ( iServiceCodeFlag ) + if ( iServiceCodeFlag && + FeatureManager::FeatureSupported( + KFeatureIdVideocallMenuVisibility )) { menuPane->DeleteMenuItem( menuItemArray[ i ] ); } @@ -355,8 +353,7 @@ break; case EPhoneInCallCmdDtmfListQuery: - if ( ( iHoldFlag && !iAllowDtmfOptionsFlag ) || iHideVideoCallDTMFVisibility - || iHideVoipCallDTMFVisibility ) + if ( ( iHoldFlag && !iAllowDtmfOptionsFlag ) || iHideVideoCallDTMFVisibility ) { menuPane->DeleteMenuItem( menuItemArray[ i ] ); } @@ -1067,14 +1064,6 @@ } // --------------------------------------------------------- -// CPhoneMenuController::SetHideVideoCallDTMFVisibility -// --------------------------------------------------------- -// -void CPhoneMenuController::SetHideVoipCallDTMFVisibilityFlag( TBool aHideVoipCallDTMFVisibility ) - { - __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneMenuController::SetHideVoipCallDTMFVisibilityFlag()" ); - iHideVoipCallDTMFVisibility = aHideVoipCallDTMFVisibility; - } // CPhoneMenuController::SetHideVideoCallDTMFVisibility // --------------------------------------------------------- // diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp --- a/phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -42,7 +42,7 @@ _LIT ( KPhoneMifFileName, "phoneui.mif" ); _LIT( KToolbarButtonEmptyStr, "" ); -const TInt KNumberOfButtons = 6; +const TInt KNumberOfButtons = 5; struct SPhoneToolbarButton { TInt iIconIndex; @@ -71,11 +71,7 @@ { EMbmPhoneuiQgn_indi_tb_handset, EMbmPhoneuiQgn_indi_tb_handset_mask, EPhoneInCallCmdHandset - }, - { EMbmPhoneuiQgn_indi_tb_bthf, - EMbmPhoneuiQgn_indi_tb_bthf, - EPhoneInCallCmdBtHandsfree - } + } }; @@ -207,27 +203,8 @@ iToolbar->HideItem( EPhoneInCallCmdUnmute, !iMuteFlag, ETrue ); // Show 'Handset'/'Ihf' icon - if ( iWiredAccFlag ) - { - __PHONELOG( EBasic, EPhoneUIView, "CPhoneToolbarController::UpdateToolbar(), wired "); - iToolbar->HideItem( EPhoneInCallCmdHandset, ETrue, EFalse ); - iToolbar->HideItem( EPhoneInCallCmdBtHandsfree, ETrue, EFalse ); - iToolbar->HideItem( EPhoneInCallCmdActivateIhf, EFalse, ETrue ); - } - else if ( iBTAccAvailableFlag && !iBTAccFlag ) - { - __PHONELOG( EBasic, EPhoneUIView, "CPhoneToolbarController::UpdateToolbar(), BT "); - iToolbar->HideItem( EPhoneInCallCmdActivateIhf, ETrue, EFalse ); - iToolbar->HideItem( EPhoneInCallCmdHandset, ETrue, EFalse ); - iToolbar->HideItem( EPhoneInCallCmdBtHandsfree, EFalse, ETrue ); - } - else - { - __PHONELOG( EBasic, EPhoneUIView, "CPhoneToolbarController::UpdateToolbar(), else "); - iToolbar->HideItem( EPhoneInCallCmdHandset, !iIhfFlag, EFalse ); - iToolbar->HideItem( EPhoneInCallCmdActivateIhf, iIhfFlag, EFalse ); - iToolbar->HideItem( EPhoneInCallCmdBtHandsfree, ETrue, ETrue ); - } + iToolbar->HideItem( EPhoneInCallCmdActivateIhf, iIhfFlag, EFalse ); + iToolbar->HideItem( EPhoneInCallCmdHandset, !iIhfFlag, ETrue ); } // --------------------------------------------------------------------------- @@ -287,10 +264,6 @@ resourceId = R_PHONEUI_TOOLTIP_HANDSET; break; - case EPhoneInCallCmdBtHandsfree: - resourceId = R_PHONEUI_TOOLTIP_BT_HANDSFREE; - break; - default: aText = KNullDesC().Alloc(); break; @@ -324,9 +297,6 @@ case EPhoneInCallCmdHandset: skinId = KAknsIIDQgnIndiButtonHandset; break; - case EPhoneInCallCmdBtHandsfree: - skinId = KAknsIIDQgnIndiButtonBluetooth; - break; default: skinId = KAknsIIDNone; break; @@ -439,38 +409,6 @@ } } } -// --------------------------------------------------------- -// CPhoneToolbarController::SetBTAccFlag -// --------------------------------------------------------- -// -void CPhoneToolbarController::SetBTAccFlag( TPhoneCommandParam* aCommandParam ) - { - if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdBoolean ) - { - TPhoneCmdParamBoolean* booleanParam = - static_cast( aCommandParam ); - iBTAccFlag = booleanParam->Boolean(); - UpdateToolbar(); - } - } - -// --------------------------------------------------------- -// CPhoneToolbarController::SetBTAccAvailableFlag -// --------------------------------------------------------- -// -void CPhoneToolbarController::SetBTAccAvailableFlag( TPhoneCommandParam* aCommandParam ) - { - // Check is the given parameter valid - if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdBoolean ) - { - TPhoneCmdParamBoolean* accFlag = - static_cast( aCommandParam ); - - iBTAccAvailableFlag = accFlag->Boolean(); - UpdateToolbar(); - } - } - // --------------------------------------------------------- // CPhoneToolbarController::SetCallInProgressFlag @@ -518,7 +456,6 @@ iToolbar->SetItemDimmed( EPhoneInCallCmdUnmute, aDimmed, ETrue ); iToolbar->SetItemDimmed( EPhoneInCallCmdActivatEPhonebook, aDimmed, ETrue ); iToolbar->SetItemDimmed( EPhoneInCallCmdHandset, aDimmed, ETrue ); - iToolbar->SetItemDimmed( EPhoneInCallCmdBtHandsfree, aDimmed, ETrue ); // Don't dim/undim iHF when complete toolbar dimming is changed. if ( !iWiredAccFlag ) { diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuiview/src/cphoneviewcontroller.cpp --- a/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -140,8 +140,8 @@ // Kastor effect IDs, aknskincontent/101f84b9.sel // These effects cannot be used for internal transitions (Call UI<->Dialer) -const TInt KTouchPhoneUiOpenEffect = 3; -const TInt KTouchPhoneUiCloseEffect = 5; +const TInt KTouchDialerOpenEffect = 3; +const TInt KTouchDialerCloseEffect = 5; const TInt KTouchCallUiOpenEffect = 1000; const TInt KTouchCallUiCloseEffect = 1001; @@ -841,6 +841,7 @@ iMenuController->SetMuteFlag( aCommandParam ); iBubbleWrapper->SetPhoneMuted( aCommandParam ); iIncallIndicator->HandleMuteChange( aCommandParam ); + iAudioController->HandleMuteChange( aCommandParam ); iToolbarController->SetMuteFlag( aCommandParam ); if ( iButtonsController ) { @@ -1121,15 +1122,7 @@ booleanParam->Boolean() ); break; } - - case EPhoneViewSetVoipCallDTMFVisibilityFlag: - { - TPhoneCmdParamBoolean* booleanParam = - static_cast( aCommandParam ); - iMenuController->SetHideVoipCallDTMFVisibilityFlag( - booleanParam->Boolean() ); - break; - } + case EPhoneViewSetVideoCallDTMFVisibilityFlag: { TPhoneCmdParamBoolean* booleanParam = @@ -3379,7 +3372,7 @@ // btaa menu options iMenuController->SetBTAccFlag( &btaaParam ); - iToolbarController->SetBTAccFlag( &btaaParam ); + iAudioController->HandleIhfChange( &ihfParam ); if ( iButtonsController ) @@ -3419,8 +3412,7 @@ // btaa menu options iMenuController->SetBTAccAvailableFlag( &btAvailableParam ); - iToolbarController->SetBTAccAvailableFlag( &btAvailableParam ); - + if ( iButtonsController ) { iButtonsController->SetBTAccAvailableFlag( &btAvailableParam ); @@ -3859,11 +3851,11 @@ switch ( aType ) { case EPhoneTransEffectDialerCreate: - case EPhoneTransEffectPhoneUiOpen: - useEffect = KTouchPhoneUiOpenEffect; + case EPhoneTransEffectDialerOpen: + useEffect = KTouchDialerOpenEffect; break; - case EPhoneTransEffectPhoneUiClose: - useEffect = KTouchPhoneUiCloseEffect; + case EPhoneTransEffectDialerClose: + useEffect = KTouchDialerCloseEffect; break; case EPhoneTransEffectAppStartFromDialer: useEffect = AknTransEffect::EApplicationStart; @@ -4136,7 +4128,7 @@ /* In case transition is from idle to dialer or to incoming call show transition effects as well. */ else if ( isIdleInForeground && - ( aType == EPhoneTransEffectPhoneUiOpen || + ( aType == EPhoneTransEffectDialerOpen || aType == EPhoneTransEffectCallUiAppear ) ) { okToUseEffect = ETrue; @@ -4145,7 +4137,7 @@ when call is created from some other then phone app for example logs or from phonebook*/ else if ( !isPhoneForeground && !isIdleInForeground && - ( aType == EPhoneTransEffectPhoneUiOpen || + ( aType == EPhoneTransEffectDialerOpen || aType == EPhoneTransEffectCallUiAppear ) ) { okToUseEffect = ETrue; @@ -4164,7 +4156,7 @@ switch ( aType ) { case EPhoneTransEffectDialerCreate: - case EPhoneTransEffectPhoneUiOpen: + case EPhoneTransEffectDialerOpen: okToUse = !iDialerActive; break; case EPhoneTransEffectAppStartFromDialer: @@ -4172,7 +4164,7 @@ break; /* No need to check dialer activity below because effects are common to callhandling/dialer */ - case EPhoneTransEffectPhoneUiClose: + case EPhoneTransEffectDialerClose: case EPhoneTransEffectCallUiAppear: case EPhoneTransEffectCallUiDisappear: okToUse = ETrue; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp --- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -802,7 +802,9 @@ __LOGMETHODSTARTEND( PhoneUIVoIPExtension, "CPhoneCustomizationVoip::ModifyNumberAcquisitionMenuL"); - if ( aResourceId == R_PHONEUI_NUMBERACQ_OPTIONS_CALL_MENU && + if ( ( aResourceId == R_PHONEUI_NUMBERACQ_OPTIONS_CALL_MENU || + aResourceId == R_PHONEUI_NUMBERACQ_OPTIONS_MENU || + aResourceId == R_PHONEUIDIALER_OPTIONS_MENU ) && VoIPSupportedL() ) { InsertInternetCallMenuItemL( aResourceId, aMenuPane ); @@ -823,7 +825,7 @@ // ----------------------------------------------------------- // void CPhoneCustomizationVoip::InsertInternetCallMenuItemL( - TInt /* aResourceId */, CEikMenuPane& aMenuPane ) + TInt aResourceId, CEikMenuPane& aMenuPane ) { __LOGMETHODSTARTEND( PhoneUIVoIPExtension, "CPhoneCustomizationVoip::InsertInternetCallMenuItemL" ); @@ -851,11 +853,38 @@ HBufC* phoneNumber = PhoneNumberFromEntryLC(); - // If number entry is empty don't add internet call option - if ( phoneNumber->Length() ) + TInt index(KErrNotFound); + + if ( aResourceId == R_PHONEUI_NUMBERACQ_OPTIONS_CALL_MENU ) { + if ( !CPhoneKeys::Validate( phoneNumber->Des() ) ) + { + if ( aMenuPane.MenuItemExists( EPhoneNumberAcqCmdCall, index ) ) + { + aMenuPane.DeleteMenuItem( EPhoneNumberAcqCmdCall ); + } + + if ( aMenuPane.MenuItemExists( EPhoneNumberAcqCmdVideoCall, index ) ) + { + aMenuPane.DeleteMenuItem( EPhoneNumberAcqCmdVideoCall ); + } + } + aMenuPane.AddMenuItemL( voipMenuItem->iData ); } + else if ( !aMenuPane.MenuItemExists( EPhoneNumberAcqCmdCall, index ) ) + { + // Call menu is removed if user inserts anything that is not + // a valid cs number, so must add Internet call option here where + // we know that voip is however supported. + + // If number entry is empty don't add internet call option + if ( phoneNumber->Length() ) + { + // Internet call item must be on the top of the menu + aMenuPane.InsertMenuItemL( voipMenuItem->iData, 0 ); + } + } CleanupStack::PopAndDestroy( 3, &voipServices ); } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuivoipextension/src/cphonestatemachinevoip.cpp --- a/phoneapp/phoneuivoipextension/src/cphonestatemachinevoip.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuivoipextension/src/cphonestatemachinevoip.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -157,10 +157,6 @@ if ( madeStateTransition ) { iOldStateId = iNewStateId; - - // Needs to be set or any attempts to access eikon env handle - // will fail - iState->SetEikonEnv( EikonEnv() ); } return iState; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp --- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -198,11 +198,9 @@ &customDialerParam ); // Open transfer dialer - phoneState-> - TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ); + phoneState->BeginTransEffectLC( ECallUiDisappear ); iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry ); - phoneState-> - TransitionHandlerL().EndTransEffect(); + phoneState->EndTransEffect(); // Update CBA to transfer dialer CBA TPhoneCmdParamInteger resourceId; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneapp/silenceactionplugin/data/silenceringingtone_activate.rul --- a/phoneapp/silenceactionplugin/data/silenceringingtone_activate.rul Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneapp/silenceactionplugin/data/silenceringingtone_activate.rul Wed Oct 13 14:31:22 2010 +0300 @@ -12,10 +12,7 @@ - - - - + diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/inc/CPhCntContactManager.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/CPhCntContactManager.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/inc/CPhCntContactManager.h Wed Oct 13 14:31:22 2010 +0300 @@ -106,7 +106,7 @@ */ MPhCntContactMatchStrategy* CreateContactMatchStrategyL( MVPbkContactFindObserver& aObserver, - TDuplicateRemovalStrategy aStrategy ); + TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ); /** * From MPhCntContactManager. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/inc/CPhCntMatcherImpl.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/CPhCntMatcherImpl.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/inc/CPhCntMatcherImpl.h Wed Oct 13 14:31:22 2010 +0300 @@ -21,8 +21,6 @@ #include #include "CPhCntMatcher.h" #include "MVPbkContactLink.h" -#include "MPhCntContactManager.h" -#include "tphcntcontactselectionstrategy.h" class MPhCntContactStores; class CPhCntContactManager; @@ -167,14 +165,16 @@ TInt GetContactL( MPhCntMatch*& aMatch, const TDesC& aTelNumber ); - + /** - * Matches contacts + * Match contacts against product specific stores. + * + * @since S60 v3.2 + * @param aLinkArray Array of contacts to match + * @return Error code. */ - TInt MatchContactL( - const MVPbkContactLinkArray*& aContactLinkArray, - const TDesC& aTelNumber, - MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ); + TInt MatchFromAdditionalStore( const MVPbkContactLinkArray& aLinkArray ) const; + protected: @@ -259,9 +259,6 @@ * Own. */ MPhCntContactMatchStrategy* iCSMatchStrategy; - - - TPhCntContactSelectionStrategy iContactSelectionStrategy; }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/inc/MPhCntContactManager.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/MPhCntContactManager.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/inc/MPhCntContactManager.h Wed Oct 13 14:31:22 2010 +0300 @@ -54,7 +54,7 @@ enum TDuplicateRemovalStrategy { ERemoveDuplicates, EDontRemoveDuplicates - }; + }; /** * Retrieves contact from phonebook. @@ -81,12 +81,13 @@ * * @since S60 v3.1 * @param aObserver Contact match strategy observer. - * @param aStrategy Contact dupe removal strategy + * @param aRemoveDuplicatesStrategy Contact dupe removal strategy + * * @return New contact match strategy instance. */ virtual MPhCntContactMatchStrategy* CreateContactMatchStrategyL( MVPbkContactFindObserver& aObserver, - TDuplicateRemovalStrategy aStrategy )= 0; + TDuplicateRemovalStrategy aRemoveDuplicatesStrategy )= 0; /** * Gives access to contact name formatter. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h Wed Oct 13 14:31:22 2010 +0300 @@ -20,18 +20,28 @@ #define CPHCNTCONTACTMATCHSTRATEGY_H #include +#include #include +#include // KBestMatchingPhoneNumbers #include "mphcntcontactmatchstrategy.h" #include "mphcntcontactstoreeventobserver.h" +#include "MPhCntContactManager.h" + class CVPbkContactManager; class MVPbkContactFindObserver; class CVPbkPhoneNumberMatchStrategy; +class CRepository; class CVPbkContactStoreUriArray; class CPhCntContactStoreUris; class CCntRawPhoneNumberExtractor; +// Digit count used to match CS number. +const TInt KPhCntMatchMin = 7; +const TInt KPhCntMatchMax = 11; +const TInt KPhCntMatchDefault = KBestMatchingPhoneNumbers; + /** * Strategy for matcing CS contacts. * @@ -40,7 +50,7 @@ */ NONSHARABLE_CLASS( CPhCntContactMatchStrategy ) : public CBase, - public MPhCntContactMatchStrategy, + public MPhCntContactMatchStrategy, private MPhCntContactStoreEventObserver { public: @@ -52,14 +62,13 @@ * @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. + * @param aRemoveDuplicatesStrategy Contact dupe removal strategy */ static CPhCntContactMatchStrategy* NewL( CVPbkContactManager& aContactManager, CPhCntContactStoreUris& aContactStoreUris, MVPbkContactFindObserver& aObserver, - TUint32 aMatchFlags ); + MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ); /** * Destructor. @@ -78,8 +87,8 @@ */ void FindMatchesL( const TDesC& aPhoneNumber ); -private: - +private: + /** * Creates contact match strategy with given numbers * of digits. @@ -89,19 +98,6 @@ */ TInt CreateContactMatchStrategy(); -// From base class MCenRepNotifyHandlerCallback - - /** - * From base class MCenRepNotifyHandlerCallback - * This callback method is used to notify the client about - * changes for string value keys, i.e. key type is EStringKey. - * - * @param aId Id of the key that has changed. - * @param aNewValue The new value of the key. - */ - void HandleNotifyString( TUint32 aId, const TDesC16& aNewValue ); - - // From base class MPhCntContactStoreEventObserver /** @@ -116,12 +112,11 @@ * Method to ease unit testing. Creates the actual instance of iMatchStrategy. */ virtual TInt DoCreateMatchStrategy(); - + /** - * Makes the actual matching request using number - * Declared virtual to ease unit testing. + * Removes postfix from aNumber */ - virtual void DoMatchL( const TDesC& aNumber ); + TDesC* RemoveExtraCharactersLC( const TDesC& aNumber ); protected: @@ -129,10 +124,26 @@ CVPbkContactManager& aContactManager, CPhCntContactStoreUris& aContactStoreUris, MVPbkContactFindObserver& aObserver, - TUint32 aMatchFlags ); + MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ); void ConstructL(); + TUint32 FillMatchFlags() const; + + virtual TInt ReadMatchDigitsValueL(); + + /** + * Makes the actual matching request using number + * Declared virtual to ease unit testing. + */ + virtual void DoMatchL( const TDesC& aNumber ); + + /** + * Enables to inject match strategy to ease unit testing + */ + void SetVPbkPhoneNumberMatchStrategy( + CVPbkPhoneNumberMatchStrategy* aMatchStrategy ); + private: // data /** @@ -140,7 +151,7 @@ * Own. */ CVPbkPhoneNumberMatchStrategy* iMatchStrategy; - + /** * Contact manager is needed with match strategy. * Not own. @@ -167,24 +178,19 @@ CVPbkContactStoreUriArray* iUriArray; /** + * Number of digits used with matching. + */ + TInt iNumberOfDigits; + + /** * Number extractor. * Own. */ 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; - + + MPhCntContactManager::TDuplicateRemovalStrategy iRemoveDuplicatesStrategy; + }; +#endif // CPHCNTCONTACTMATCHSTRATEGY_H -#endif // CPHCNTCONTACTMATCHSTRATEGY_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/inc/cphcntspeeddialimpl.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/cphcntspeeddialimpl.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/inc/cphcntspeeddialimpl.h Wed Oct 13 14:31:22 2010 +0300 @@ -126,8 +126,6 @@ void CopyNumberL( TDes& aAppendTo, const TDesC& aNumber ); - void ParseNumber( TDes& aNumber ); - /** * Setups the field info with new attributes. * @param aContact Contact information diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/inc/tphcntcontactselectionstrategy.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/tphcntcontactselectionstrategy.h Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implements contact selection strategy. -* -*/ - - -#ifndef TPHCNTCONTACTSELECTIONSTRATEGY_H_ -#define TPHCNTCONTACTSELECTIONSTRATEGY_H_ - -// System includes -#include -#include - -// Forward declarations -class MVPbkContactLinkArray; -class CVPbkContactStoreUriArray; - -// Constants -const TInt KNoContact = -1; -const TInt KManyContacts = -2; - - -/** - * Implements contact selection strategy. - * - */ -NONSHARABLE_CLASS( TPhCntContactSelectionStrategy ) - { -public: - - /** Defines the options for contact selection strategy */ - enum TAllowSeveralMatches - { - EAllowSingleMatch, - EAllowSeveralMatches - }; - -public: - TPhCntContactSelectionStrategy( ); - -public: - /** - * Sets the contact selection strategy used in conjunction with - * ApplyStrategy -method. - * - * @param aSeveralMatchesAllowed Option for contact selection strategy. - */ - void SetContactSelectionStrategy( TAllowSeveralMatches aSeveralMatchesAllowed ); - - /** - * Returns the selected contact according to strategy. - * If a call to SetContactSelectionStrategy is not made, - * EAllowSingleMatch strategy is applied. - * - * @param aContactLinkArray Array of matching contacts. - * @return index in array of selected contact. - * KNoContact if empty array is passed. - * KNoContact if several matches and EAllowSingleMatch set. - */ - TInt ApplyStrategy( const MVPbkContactLinkArray& aContactLinkArray ); - - /** - * Returns the selected contact if single match from - * additional contact stores is found. - * - * @param aContactLinkArray Array of matching contacts. - * @param aAdditionalStoreUriArray Array of additional contact stores. - * @return index in array of selected contact. - * KNoContact if empty array is passed. - * KManyContacts if several matches. - */ - TInt ApplyAdditonalStoreStrategy( const MVPbkContactLinkArray& aContactLinkArray, - const CVPbkContactStoreUriArray& aAdditionalStoreUriArray ); - -protected: - /** - * Returns the URI of the contact store of the contact. - * - * @param aContactLinkArrayIndex Specifies the contact. - * @return URI of the contact store. - */ - virtual TVPbkContactStoreUriPtr GetContactStoreUri( TInt aContactLinkArrayIndex ); - -private: - TInt ApplySingleMatchStrategy( ); - TInt ApplySeveralMatchesStrategy( ); - -private: - TAllowSeveralMatches iSeveralMatchesAllowed; - - /* Not owned */ - const MVPbkContactLinkArray* iContactLinkArray; - }; - - -#endif /* TPHCNTCONTACTSELECTIONSTRATEGY_H_ */ diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp --- a/phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/src/CPhCntContactManager.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -116,20 +116,14 @@ // MPhCntContactMatchStrategy* CPhCntContactManager::CreateContactMatchStrategyL( MVPbkContactFindObserver& aObserver, - TDuplicateRemovalStrategy aStrategy ) + TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ) { - const TUint32 removeDuplicatesStrategyFlag = - CVPbkPhoneNumberMatchStrategy::EVPbkDuplicatedContactsMatchFlag | - CVPbkPhoneNumberMatchStrategy::EVPbkBestMatchingFlag; - const TUint32 dontRemoveDuplicatesStrategyFlag = - CVPbkPhoneNumberMatchStrategy::EVPbkBestMatchingFlag; - + return CPhCntContactMatchStrategy::NewL( *iContactManager, *iContactStoreUris, aObserver, - aStrategy == ERemoveDuplicates ? - removeDuplicatesStrategyFlag : dontRemoveDuplicatesStrategyFlag ); + aRemoveDuplicatesStrategy ); } // --------------------------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/src/CPhCntMatcherImpl.cpp --- a/phoneengine/PhoneCntFinder/ContactService/src/CPhCntMatcherImpl.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/src/CPhCntMatcherImpl.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -15,16 +15,15 @@ * */ + + #include #include #include #include #include #include -#include -#include -#include -#include + #include "CPhCntMatcherImpl.h" #include "cphcntmatchcontact.h" @@ -36,28 +35,8 @@ #include "MPhoneCntPbkOwner.h" #include "cphcntvpbkcontactid.h" #include "cphcntcontactmatchstrategy.h" +#include -// Local functions -/** - * Gets contact selection strategy from localvariation flag. - */ -TPhCntContactSelectionStrategy::TAllowSeveralMatches - GetContactSelectionStrategyL() - { - CRepository* repository = CRepository::NewLC( KCRUidTelVariation ); - TInt variationFlag; - User::LeaveIfError( repository->Get( KTelVariationFlags, variationFlag ) ); - CleanupStack::PopAndDestroy( repository ); - - if( variationFlag & KTelephonyLVFlagShowContactWhenSeveralMatches ) - { - return TPhCntContactSelectionStrategy::EAllowSeveralMatches; - } - else - { - return TPhCntContactSelectionStrategy::EAllowSingleMatch; - } - } // --------------------------------------------------------------------------- @@ -212,8 +191,12 @@ TEFLOGSTRING( KTAOBJECT, "CNT CPhCntMatcherImpl::GetContactL" ); // Try to find matching contact. const MVPbkContactLinkArray* linkArray = NULL; - TInt err = MatchContactL( linkArray, aTelNumber, - MPhCntContactManager::EDontRemoveDuplicates ); + delete iCSMatchStrategy; + iCSMatchStrategy = 0; + iCSMatchStrategy = iContactManager.CreateContactMatchStrategyL( *iMatchContact, + MPhCntContactManager::EDontRemoveDuplicates ); + TInt err( iMatchContact->MatchContact( linkArray, aTelNumber, + *iCSMatchStrategy ) ); CPhCntContact* match( NULL ); TInt index( KErrNotFound ); @@ -221,22 +204,18 @@ // Apply exact match on additional stores first. // If match is found, don't care about other stores as // these come first. - if( !err ) - { - const CVPbkContactStoreUriArray& additionalStores = iContactManager.AdditionalContactStoreUris(); - index = iContactSelectionStrategy.ApplyAdditonalStoreStrategy( *linkArray, additionalStores ); - - const TBool manyContactsFound = index == KManyContacts; - const TBool singleContactFound = - index != KNoContact && index != KManyContacts; - - if ( singleContactFound ) + if( !err && ( linkArray->Count() > 1 ) ) + { + index = MatchFromAdditionalStore( *linkArray ); + + // Single match on additonal stores + if ( index != KErrNotFound && index != KErrAlreadyExists ) { FetchContact( match, linkArray->At( index ), aTelNumber ); aMatch = match; return err; } - else if ( manyContactsFound ) + else if ( index == KErrAlreadyExists ) //Several matches on additional stores { aMatch = match; return KErrNotFound; @@ -245,46 +224,30 @@ if( !err && ( linkArray->Count() > 1 ) ) { - err = MatchContactL( linkArray, aTelNumber, - MPhCntContactManager::ERemoveDuplicates ); + delete iCSMatchStrategy; + iCSMatchStrategy = 0; + iCSMatchStrategy = iContactManager.CreateContactMatchStrategyL( + *iMatchContact, MPhCntContactManager::ERemoveDuplicates ); + err = iMatchContact->MatchContact( linkArray, aTelNumber, + *iCSMatchStrategy ); } if ( !err ) { - index = iContactSelectionStrategy.ApplyStrategy( *linkArray ); + // If only one contact, no additional checks needed + if ( linkArray->Count() == 1 ) + { + index = 0; + } } + // Finally fetch contact details - if ( index != KNoContact ) + if ( index != KErrNotFound ) { FetchContact( match, linkArray->At( index ), aTelNumber ); - aMatch = match; } - else - { - err = KErrNotFound; - } - - TEFLOGSTRING2( KTAMESIN,"CNT CPhCntMatcherImpl::GetContactL,err: %d", err ); - return err; - } -// --------------------------------------------------------------------------- -// Matches contact -// --------------------------------------------------------------------------- -// -TInt CPhCntMatcherImpl::MatchContactL( - const MVPbkContactLinkArray*& aContactLinkArray, - const TDesC& aTelNumber, - MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ) - { - delete iCSMatchStrategy; - iCSMatchStrategy = NULL; - iCSMatchStrategy = iContactManager.CreateContactMatchStrategyL( - *iMatchContact, - aRemoveDuplicatesStrategy ); - - const TInt err( iMatchContact->MatchContact( aContactLinkArray, aTelNumber, - *iCSMatchStrategy ) ); + aMatch = match; return err; } @@ -331,9 +294,6 @@ // void CPhCntMatcherImpl::ConstructL() { - const TPhCntContactSelectionStrategy::TAllowSeveralMatches strategy = - GetContactSelectionStrategyL(); - iContactSelectionStrategy.SetContactSelectionStrategy( strategy ); } // --------------------------------------------------------------------------- @@ -363,3 +323,37 @@ return err; } +// -------------------------------------------------------------------------- +// CPhCntMatcherImpl::MatchFromAdditionalStore +// -------------------------------------------------------------------------- +// +TInt CPhCntMatcherImpl::MatchFromAdditionalStore( + const MVPbkContactLinkArray& linkArray ) const + { + TEFLOGSTRING( KTAOBJECT, "CNT CPhCntMatcherImpl::MatchFromAdditionalStore" ); + TInt ret( KErrNotFound ); + TInt found(0); // count of found contacts from additional stores. + + for ( TInt i = 0; i < linkArray.Count(); i++ ) + { + TVPbkContactStoreUriPtr uri = + linkArray.At( i ).ContactStore().StoreProperties().Uri(); + + // Compare if contact is from additional store. + if ( iContactManager.AdditionalContactStoreUris().IsIncluded( uri ) ) + { + // Contact found from additional store. + found++; + ret = i; + } + } + + if ( found > 1) + { + // Multiple matches from additional stores -> no match. + ret = KErrAlreadyExists; + } + + return ret; + } + diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/src/cphcntcontactmatchstrategy.cpp --- a/phoneengine/PhoneCntFinder/ContactService/src/cphcntcontactmatchstrategy.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/src/cphcntcontactmatchstrategy.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -17,16 +17,15 @@ #include +#include +#include #include -#include // KBestMatchingPhoneNumbers #include "cphcntcontactmatchstrategy.h" #include "cphcntcontactstoreuris.h" #include "CPhoneRawMatchNumberExtractor.h" - - // ======== MEMBER FUNCTIONS ======== @@ -34,11 +33,11 @@ CVPbkContactManager& aContactManager, CPhCntContactStoreUris& aContactStoreUris, MVPbkContactFindObserver& aObserver, - TUint32 aMatchFlags ) : + MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ) : iContactManager( aContactManager ), iContactStoreUris( aContactStoreUris ), iObserver( aObserver ), - iMatchFlags( aMatchFlags ) + iRemoveDuplicatesStrategy( aRemoveDuplicatesStrategy ) { iContactStoreUris.SetObserver( *this ); } @@ -49,13 +48,42 @@ // --------------------------------------------------------------------------- // void CPhCntContactMatchStrategy::ConstructL() - { + { + iNumberOfDigits = KPhCntMatchDefault; + + TInt matchDigitsValue = ReadMatchDigitsValueL(); + + // If we can find a proper value from the cenrep, use it. + if ( matchDigitsValue >= KPhCntMatchMin && matchDigitsValue <= KPhCntMatchMax ) + { + iNumberOfDigits = matchDigitsValue; + } + else if ( matchDigitsValue == KBestMatchingPhoneNumbers ) + { + iNumberOfDigits = matchDigitsValue; + } + User::LeaveIfError( CreateContactMatchStrategy() ); iNumberExtractor = new( ELeave )CCntRawPhoneNumberExtractor(); iNumberExtractor->ConstructL(); } +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +TInt CPhCntContactMatchStrategy::ReadMatchDigitsValueL() + { + CRepository* cenRepSession = CRepository::NewL( KCRUidTelConfiguration ); + + TInt matchDigitsValue (KErrNotFound); + // Find digit count to be used with matching. + cenRepSession->Get( KTelMatchDigits, matchDigitsValue ); + + delete cenRepSession; + return matchDigitsValue; + } // --------------------------------------------------------------------------- // Static constructor. @@ -65,14 +93,14 @@ CVPbkContactManager& aContactManager, CPhCntContactStoreUris& aContactStoreUris, MVPbkContactFindObserver& aObserver, - TUint32 aMatchFlags ) + MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ) { CPhCntContactMatchStrategy* self = new( ELeave ) CPhCntContactMatchStrategy( aContactManager, aContactStoreUris, aObserver, - aMatchFlags ); + aRemoveDuplicatesStrategy ); CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop( self ); @@ -89,6 +117,7 @@ { iNumberExtractor->Release(); } + delete iMatchStrategy; delete iUriArray; } @@ -145,6 +174,7 @@ return err; } + // --------------------------------------------------------------------------- // From base class MPhCntContactStoreEventObserver // Updates match strategy. @@ -162,13 +192,16 @@ // --------------------------------------------------------------------------- // TInt CPhCntContactMatchStrategy::DoCreateMatchStrategy() - { + { + TUint32 flags = FillMatchFlags(); + CVPbkPhoneNumberMatchStrategy::TConfig config( - KBestMatchingPhoneNumbers, - *iUriArray, - CVPbkPhoneNumberMatchStrategy::EVPbkSequentialMatch, - iMatchFlags - ); + iNumberOfDigits, + *iUriArray, + CVPbkPhoneNumberMatchStrategy::EVPbkSequentialMatch, + flags + ); + TRAPD( err, iMatchStrategy = CVPbkPhoneNumberMatchStrategy::NewL( config, iContactManager, @@ -177,11 +210,68 @@ } // --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +TUint32 CPhCntContactMatchStrategy::FillMatchFlags() const + { + TUint32 flags = CVPbkPhoneNumberMatchStrategy::EVPbkMatchFlagsNone; + + if ( iRemoveDuplicatesStrategy == MPhCntContactManager::ERemoveDuplicates ) + { + flags |= CVPbkPhoneNumberMatchStrategy::EVPbkDuplicatedContactsMatchFlag; + } + + if ( iNumberOfDigits == KBestMatchingPhoneNumbers ) + { + flags |= CVPbkPhoneNumberMatchStrategy::EVPbkBestMatchingFlag; + } + + return flags; + } + + +// --------------------------------------------------------------------------- // Makes the actual matching request. // --------------------------------------------------------------------------- // void CPhCntContactMatchStrategy::DoMatchL( const TDesC& aNumber ) { - iMatchStrategy->MatchL( aNumber ); + + //extra characters should not be removed when using BestMatching algorithm + if ( iNumberOfDigits == KBestMatchingPhoneNumbers ) + { + iMatchStrategy->MatchL( aNumber ); + } + else + { + TDesC* rawNumber = RemoveExtraCharactersLC( aNumber ); + iMatchStrategy->MatchL( *rawNumber ); + CleanupStack::PopAndDestroy( rawNumber ); + } } + +// --------------------------------------------------------------------------- +// Removes postfix from aNumber +// --------------------------------------------------------------------------- +// +TDesC* CPhCntContactMatchStrategy::RemoveExtraCharactersLC( const TDesC& aNumber ) + { + HBufC* rawNumber = HBufC::NewLC( aNumber.Length() ); + TPtr rawNumberPtr = rawNumber->Des(); + iNumberExtractor->ExtractRawNumber( aNumber, rawNumberPtr ); + return rawNumber; + } + +// --------------------------------------------------------------------------- +// Enables to inject match strategy to ease unit testing +// --------------------------------------------------------------------------- +// +void CPhCntContactMatchStrategy::SetVPbkPhoneNumberMatchStrategy( + CVPbkPhoneNumberMatchStrategy* aMatchStrategy ) + { + delete iMatchStrategy; + iMatchStrategy = aMatchStrategy; + } + diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/src/cphcntspeeddialimpl.cpp --- a/phoneengine/PhoneCntFinder/ContactService/src/cphcntspeeddialimpl.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/src/cphcntspeeddialimpl.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -33,11 +33,6 @@ #include "CPhCntContact.h" #include "cphcntvpbkcontactid.h" #include "CPhCntContactManager.h" -#include "pevirtualengine.h" - -// Characters that are needed to be stripped out -// from phone number before dialing. -_LIT( KInvalidPhonenumberCharacters, " ()-" ); // ======== MEMBER FUNCTIONS ======== @@ -102,27 +97,6 @@ User::Leave( KErrArgument ); } } - -// --------------------------------------------------------------------------- -// CPhCntSpeedDialImpl::ParseNumber -// --------------------------------------------------------------------------- -// -void CPhCntSpeedDialImpl::ParseNumber( TDes& aNumber ) - { - TBuf< KPEPhoneNumberMaxLength > parsedNumber = KNullDesC(); - TLex parser( aNumber ); - TChar c; - while( !parser.Eos() ) - { - c = parser.Get(); - if ( KErrNotFound == KInvalidPhonenumberCharacters().Locate( c ) ) - { - parsedNumber.Append( c ); - } - } - aNumber = parsedNumber; - } - // --------------------------------------------------------------------------- // CPhCntSpeedDialImpl::CopyContactInfoToFieldInfoL // --------------------------------------------------------------------------- @@ -212,7 +186,6 @@ TPhCntNumber speedDial( contact->SpeedDialNumber( aSpeedDialPosition ) ); CopyNumberL( aPhoneNumber, speedDial.Number() ); CleanupStack::PopAndDestroy( contact ); - ParseNumber( aPhoneNumber ); } return err; } @@ -236,7 +209,6 @@ CopyNumberL( aPhoneNumber, speedDial.Number() ); CopyContactInfoToFieldInfoL( *contact, aSpeedDialPosition, aFieldInfo ); CleanupStack::PopAndDestroy( contact ); - ParseNumber( aPhoneNumber ); } return err; } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/ContactService/src/tphcntcontactselectionstrategy.cpp --- a/phoneengine/PhoneCntFinder/ContactService/src/tphcntcontactselectionstrategy.cpp Wed Sep 15 12:12:21 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -/* -* Copyright (c) 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". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implementation of TPhCntContactSelectionStrategy class. -* -*/ - -#include -#include -#include -#include -#include - -#include "tphcntcontactselectionstrategy.h" - -const TInt KFirstContactInList = 0; - -// ======== MEMBER FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TPhCntContactSelectionStrategy::TPhCntContactSelectionStrategy( ) - { - iSeveralMatchesAllowed = TPhCntContactSelectionStrategy::EAllowSingleMatch; - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -void TPhCntContactSelectionStrategy::SetContactSelectionStrategy( - TAllowSeveralMatches aSeveralMatchesAllowed ) - { - iSeveralMatchesAllowed = aSeveralMatchesAllowed; - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TInt TPhCntContactSelectionStrategy::ApplyStrategy( - const MVPbkContactLinkArray& aContactLinkArray ) - { - iContactLinkArray = &aContactLinkArray; - - if ( iSeveralMatchesAllowed == TPhCntContactSelectionStrategy::EAllowSingleMatch ) - { - return ApplySingleMatchStrategy( ); - } - else - { - return ApplySeveralMatchesStrategy( ); - } - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TInt TPhCntContactSelectionStrategy::ApplyAdditonalStoreStrategy( - const MVPbkContactLinkArray& aContactLinkArray, - const CVPbkContactStoreUriArray& aAdditionalStoreUriArray ) - { - iContactLinkArray = &aContactLinkArray; - - TInt ret( KNoContact ); - TInt contactsFoundFromAdditionalStore(0); - - for ( TInt i = 0; i < aContactLinkArray.Count(); i++ ) - { - TVPbkContactStoreUriPtr uri = GetContactStoreUri( i ); - - if ( aAdditionalStoreUriArray.IsIncluded( uri ) ) - { - contactsFoundFromAdditionalStore++; - ret = i; - } - } - - if ( contactsFoundFromAdditionalStore > 1 ) - { - // Multiple matches from additional stores -> no match. - ret = KManyContacts; - } - - return ret; - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TVPbkContactStoreUriPtr TPhCntContactSelectionStrategy::GetContactStoreUri( - TInt aContactLinkArrayIndex ) - { - return iContactLinkArray->At( aContactLinkArrayIndex ).ContactStore().StoreProperties().Uri(); - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TInt TPhCntContactSelectionStrategy::ApplySingleMatchStrategy( ) - { - if ( iContactLinkArray->Count() == 1 ) - { - return KFirstContactInList; - } - else - { - return KNoContact; - } - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TInt TPhCntContactSelectionStrategy::ApplySeveralMatchesStrategy( ) - { - if ( iContactLinkArray->Count() >= 1 ) - { - return KFirstContactInList; - } - else - { - return KNoContact; - } - } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/Group/phonecntfinder.mmp --- a/phoneengine/PhoneCntFinder/Group/phonecntfinder.mmp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/Group/phonecntfinder.mmp Wed Oct 13 14:31:22 2010 +0300 @@ -79,7 +79,6 @@ SOURCE tphcntcontactstorestate.cpp SOURCE cphcntcontactdataselectionimpl.cpp SOURCE cphcntstoreloaderimpl.cpp -SOURCE tphcntcontactselectionstrategy.cpp USERINCLUDE ../ContactService/inc USERINCLUDE ../inc diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/PhoneCntFinder/inc/CPhCntMatcher.h --- a/phoneengine/PhoneCntFinder/inc/CPhCntMatcher.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/PhoneCntFinder/inc/CPhCntMatcher.h Wed Oct 13 14:31:22 2010 +0300 @@ -54,7 +54,7 @@ * @param aTelNumber Number to match against. * @return Error code: KErrNone - one match found * KErrNotFound - no matches found - * KErrNotFound - several matches -> no match + * KErrAlreadyExists - several matches -> no match * KErrUnderflow - Number too short for matching * KErrAccessDenied - Can't get phonebook instance * other - normal Symbian OS error diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp --- a/phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -32,7 +32,7 @@ // None // CONSTANTS - +const TInt KDtmfSilent = 0; const TInt KDtmfPauseAfterTone = 45000; const TInt KDtmfToneZero = 0; const TInt KBufSize = 10; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/audiohandling/src/cpegsmaudiodata.cpp --- a/phoneengine/audiohandling/src/cpegsmaudiodata.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/audiohandling/src/cpegsmaudiodata.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -35,7 +35,7 @@ // None. // CONSTANTS -const TInt KDtmfSilent = 0; +// None. // MACROS // None. @@ -158,14 +158,9 @@ "AUD CPEGsmAudioData::PlayDtmfTone, aTone = %s, volume = %d", &aTone, volume ); - - // If profile key tones setting is OFF, the volume will be O - // Don't play dtmf tone here to avoid interrupting the possible touch tone's playing. - if ( KDtmfSilent != volume ) - { - iDtmfTonePlayer->SetVolume( volume ); - iDtmfTonePlayer->PlayDtmfTone( aTone ); - } + + iDtmfTonePlayer->SetVolume( volume ); + iDtmfTonePlayer->PlayDtmfTone( aTone ); } // ----------------------------------------------------------------------------- diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/contacthandling/inc/cpecontactextensionwrapper.h --- a/phoneengine/contacthandling/inc/cpecontactextensionwrapper.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/contacthandling/inc/cpecontactextensionwrapper.h Wed Oct 13 14:31:22 2010 +0300 @@ -74,10 +74,7 @@ * From CTelMatchingExtension. * @see CTelMatchingExtension. */ - TInt GetAddressForMatching( - RBuf& aParsedAddress, - TInt& aMeaningfulDigits, - TBool& aAllowUserNameMatch ); + TInt GetAddressForMatching( RBuf& aParsedAddress, TInt& aMeaningfulDigits ); /** * From CTelMatchingExtension. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/contacthandling/src/cpecontactextensionwrapper.cpp --- a/phoneengine/contacthandling/src/cpecontactextensionwrapper.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/contacthandling/src/cpecontactextensionwrapper.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -117,12 +117,9 @@ // --------------------------------------------------------------------------- // TInt CPEContactExtensionWrapper::GetAddressForMatching( - RBuf& aParsedAddress, - TInt& aMeaningfulDigits, - TBool& aAllowUserNameMatch ) + RBuf& aParsedAddress, TInt& aMeaningfulDigits ) { - return iPlugin->GetAddressForMatching( - aParsedAddress, aMeaningfulDigits, aAllowUserNameMatch ); + return iPlugin->GetAddressForMatching( aParsedAddress, aMeaningfulDigits ); } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/contacthandling/src/cpecontactmatch.cpp --- a/phoneengine/contacthandling/src/cpecontactmatch.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/contacthandling/src/cpecontactmatch.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -691,10 +691,8 @@ RBuf parsedAddress; CleanupClosePushL( parsedAddress ); TInt digitsformatching( 0 ); - TBool allowUserNameMatch( EFalse ); - User::LeaveIfError( plugin.GetAddressForMatching( - parsedAddress, digitsformatching, allowUserNameMatch ) ); - + User::LeaveIfError( plugin.GetAddressForMatching( parsedAddress, digitsformatching ) ); + CDesCArray* array = new ( ELeave ) CDesC16ArrayFlat( 1 ); CleanupStack::PushL( array ); User::LeaveIfError( plugin.GetContactStoreUris( *array ) ); @@ -706,20 +704,17 @@ // Digits for matching. Supported range is between 4-20. // If not valid value use whole address length for matching. - if ( digitsformatching != 0 && - ( digitsformatching < KMinValueOfMeaningfulDigits || - digitsformatching > KMaxValueOfMeaningfulDigits ) ) - { - digitsformatching = parsedAddress.Length(); - } - + digitsformatching = ( digitsformatching < KMinValueOfMeaningfulDigits || + digitsformatching > KMaxValueOfMeaningfulDigits ) ? + parsedAddress.Length() : digitsformatching; + // Use service specific parameters for matching. TEFLOGSTRING3( KTAINT, "CNT MatchWithVoipAddressUsingExtensionL >\ CPhCntMatcher::MatchVoipNumber, NUMBER: %S, CALL ID: %d", &remoteNumber, aCallId ) iContactMatcher->MatchVoipNumber( aMatch, parsedAddress.Left( Min( parsedAddress.Length(), KPEPhoneNumberMaxLength ) ), - allowUserNameMatch, array, digitsformatching ); + ETrue, array, digitsformatching ); CleanupStack::PopAndDestroy( array ); CleanupStack::PopAndDestroy( &parsedAddress ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/engineinfo/inc/cpecallinfo.h --- a/phoneengine/engineinfo/inc/cpecallinfo.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/engineinfo/inc/cpecallinfo.h Wed Oct 13 14:31:22 2010 +0300 @@ -474,16 +474,6 @@ * Returns transfer call back flag. */ TBool DoCallBackRequest() const; - - /** - * Sets protocol spesific error code - */ - void SetProtocolError( TInt aError ); - - /** - * Gets protocol spesific error code - */ - TInt ProtocolError() const; private: @@ -659,11 +649,6 @@ * Flag which indicates if call back request is needed */ TBool iDoCallBackRequest; - - /** - * Protocol specific error - */ - TInt iProtocolSpesificErrorCode; }; #endif // C_CPECALLINFO_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/engineinfo/inc/cpeengineinfoimpl.h --- a/phoneengine/engineinfo/inc/cpeengineinfoimpl.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/engineinfo/inc/cpeengineinfoimpl.h Wed Oct 13 14:31:22 2010 +0300 @@ -647,20 +647,6 @@ * @see MPEEngineInfo::CallBackAddress */ const TDesC& CallBackAddress() const; - - /** - * Sets the protocol spesific error code - * @param aError is the error code from Etel. - * @return None. - */ - void SetProtocolError( TInt aError, TInt aCallId ); - - /** - * Gets the protocol spesific error code - * @param aCallId is the call identification number. - * @return TInt. - */ - TInt ProtocolError( const TInt aCallId ) const; // Functions from MPEDataStore (reading values) public: diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/engineinfo/inc/mpeengineinfo.h --- a/phoneengine/engineinfo/inc/mpeengineinfo.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/engineinfo/inc/mpeengineinfo.h Wed Oct 13 14:31:22 2010 +0300 @@ -720,20 +720,6 @@ */ virtual const TDesC& CallBackAddress() const = 0; - /** - * Sets the protocol spesific error code - * @param aError is the error code from Etel. - * @return None. - */ - virtual void SetProtocolError( TInt aError, TInt aCallId ) = 0; - - /** - * Gets the protocol spesific error code - * @param aCallId is the call identification number. - * @return TInt. - */ - virtual TInt ProtocolError( const TInt aCallId ) const = 0; - }; // MPEEngineInfo #endif //MPEENGINEINFO_H diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/engineinfo/src/cpecallinfo.cpp --- a/phoneengine/engineinfo/src/cpecallinfo.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/engineinfo/src/cpecallinfo.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -107,7 +107,6 @@ iForwardAddressChoices = NULL; iCallIndex = KPEInvalidCallIndex; iDoCallBackRequest = EFalse; - iProtocolSpesificErrorCode = KErrNone; } // --------------------------------------------------------------------------- @@ -669,22 +668,6 @@ { return iDoCallBackRequest; } + -// --------------------------------------------------------------------------- -// Sets protocol spesific error code -// --------------------------------------------------------------------------- -// -void CPECallInfo::SetProtocolError( TInt aError ) - { - iProtocolSpesificErrorCode = aError; - } - -// --------------------------------------------------------------------------- -// Gets protocol spesific error code -// --------------------------------------------------------------------------- -// -TInt CPECallInfo::ProtocolError() const - { - return iProtocolSpesificErrorCode; - } // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/engineinfo/src/cpeengineinfoimpl.cpp --- a/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -2680,24 +2680,4 @@ return stateExists; } -// ----------------------------------------------------------------------------- -// CPEEngineInfoImpl::SetProtocolError -// Sets the protocol spesific error code to callinfo -// ----------------------------------------------------------------------------- -// -void CPEEngineInfoImpl::SetProtocolError( TInt aError, TInt aCallId ) - { - iCurrentCalls[ aCallId ]->SetProtocolError( aError ); - } - -// ----------------------------------------------------------------------------- -// CPEEngineInfoImpl::ProtocolError -// Gets the protocol spesific error code from callinfo -// ----------------------------------------------------------------------------- -// -TInt CPEEngineInfoImpl::ProtocolError( const TInt aCallId ) const - { - return iCurrentCalls[ aCallId ]->ProtocolError(); - } - // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/cenrep/keys_s60telephony.xls Binary file phoneengine/phonemodel/cenrep/keys_s60telephony.xls has changed diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/conf/s60telephony.confml Binary file phoneengine/phonemodel/conf/s60telephony.confml has changed diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/conf/s60telephony_101F87E3.crml Binary file phoneengine/phonemodel/conf/s60telephony_101F87E3.crml has changed diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/conf/s60telephony_102828F8.crml Binary file phoneengine/phonemodel/conf/s60telephony_102828F8.crml has changed diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/group/bld.inf --- a/phoneengine/phonemodel/group/bld.inf Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/group/bld.inf Wed Oct 13 14:31:22 2010 +0300 @@ -42,9 +42,6 @@ backup_registration.xml /epoc32/data/z/private/1000a86c/backup_registration.xml backup_registration.xml /epoc32/release/winscw/udeb/z/private/1000a86c/backup_registration.xml backup_registration.xml /epoc32/release/winscw/urel/z/private/1000a86c/backup_registration.xml -backup_registration.xml /epoc32/data/z/private/100058b3/backup_registration.xml -backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058b3/backup_registration.xml -backup_registration.xml /epoc32/release/winscw/urel/z/private/100058b3/backup_registration.xml // SIS stubs ../data/phonemodel_stub.sis /epoc32/data/z/system/install/phonemodel_stub.sis diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/inc/cpemessagehandler.h --- a/phoneengine/phonemodel/inc/cpemessagehandler.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/inc/cpemessagehandler.h Wed Oct 13 14:31:22 2010 +0300 @@ -836,9 +836,6 @@ TBool iEmergencyCallActive; // TBool iBtaaDisconnected; - // Flag to associate switch to vid/voice call operation and video call's reconnect operation. - // Use to fetch the right SwitchToNumber. - TBool iSwitchToVidCalReconFlag; //Client Information, member variable because emergency call from phone client //is not allowed to allocate memory. CPEClientInformation* iClientInformation; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/inc/cpephonemodel.h --- a/phoneengine/phonemodel/inc/cpephonemodel.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/inc/cpephonemodel.h Wed Oct 13 14:31:22 2010 +0300 @@ -119,11 +119,6 @@ * Constructs Contact Handling Phase Two */ void ConstructContactHandlingPhaseTwoL(); - - /** - * Gets call error from callinfo - */ - void SetCallError( TInt aCallId ); // Functions from CPEPhonemodelIF @@ -326,9 +321,6 @@ // Mediator command handler CPERemotePartyInfoMediator* iMediatorCommunicationHandler; - - // Mobile call info. - RMobileCall::TMobileCallInfoV3* iCallInfo; }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/inc/telephonyvariant.hrh --- a/phoneengine/phonemodel/inc/telephonyvariant.hrh Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/inc/telephonyvariant.hrh Wed Oct 13 14:31:22 2010 +0300 @@ -35,12 +35,6 @@ */ #define KTelephonyLVFlagCoverHideSendEndKey 0x00000004 -/** -* Shows contact name in Call UI even if there are several matches for the phone number. -* -*/ -#define KTelephonyLVFlagShowContactWhenSeveralMatches 0x00000008 - /** * KTelephonyLVFlagScrollSoftKeys defines status of scroll softkeys. When the * flag is set on in KTelephonyConfigFlags scroll softkeys are enabled. @@ -96,13 +90,6 @@ #define KTelephonyLVFlagAdvancedENCheck 0x00000200 /** -* Clear Code Customization -* When the flag is set, different notes are shown if call fails. -* Requrement id: 414-7525. -*/ -#define KTelephonyLVFlagClearCodeCustomization 0x00000400 - -/** * KTelephonyLVFlagArbitraryVideoScaling defines if video player * implementation in the device support arbitrary scaling. * When the flag is set, arbitrary scaling is applied. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/rom/phonengengine.iby --- a/phoneengine/phonemodel/rom/phonengengine.iby Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/rom/phonengengine.iby Wed Oct 13 14:31:22 2010 +0300 @@ -44,7 +44,7 @@ file=ABI_DIR\BUILD_DIR\peservicehandling.dll SHARED_LIB_DIR\peservicehandling.dll data=DATAZ_\private\1000A86C\backup_registration.xml private\1000A86C\backup_registration.xml -data=DATAZ_\private\100058B3\backup_registration.xml private\100058B3\backup_registration.xml + // SIS stubs data=ZSYSTEM\install\audiohandling_stub.sis System\Install\audiohandling_stub.sis diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/src/cpemessagehandler.cpp --- a/phoneengine/phonemodel/src/cpemessagehandler.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -162,7 +162,6 @@ iExternalDataHandler( aExternalDataHandler ), iSimStateMonitor( aSimStateMonitor ), iFsSession( aFsSession ), - iSwitchToVidCalReconFlag( EFalse ), iServiceHandling( aServiceHandling ), iDataStore( *aModel.DataStore() ) { @@ -1880,17 +1879,8 @@ // Check the phone number for prefix change and change the prefix if needed CheckPrefix(); - if( iSwitchToVidCalReconFlag ) - { - phoneNumber = iDataStore.SwitchToNumberCommand(); - // Clear flag to match the previous set operation in HandleSwitchToVideoOrVoice() function. - iSwitchToVidCalReconFlag = EFalse; - } - else - { - phoneNumber = iDataStore.PhoneNumber(); - } - + phoneNumber = iDataStore.PhoneNumber(); + __ASSERT_ALWAYS( !( phoneNumber == KNullDesC ), User::Leave( ECCPErrorInvalidPhoneNumber )); // Number parser operations @@ -2735,7 +2725,6 @@ iDataStore.SetSwitchToNumberCommand( iDataStore.WholeOutgoingPhoneNumber( aCallId ) ); // Clear phonenumber to prevent using the wrong number in MO video call. iDataStore.SetPhoneNumber( KNullDesC() ); - iSwitchToVidCalReconFlag = ETrue; } else { @@ -2764,8 +2753,6 @@ TInt errorCode( ECCPErrorNone ); TPEPhoneNumber phoneNumber = iDataStore.SwitchToNumberCommand(); - RemovePreAndPostFix( phoneNumber ); - TEFLOGSTRING2( KTAINT, "PE CPEMessageHandler::ContinueSwitchToCall, phoneNumber : %S", &phoneNumber ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneengine/phonemodel/src/cpephonemodel.cpp --- a/phoneengine/phonemodel/src/cpephonemodel.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneengine/phonemodel/src/cpephonemodel.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -43,7 +43,6 @@ // CONSTANTS const TInt KDriveProfile ( 6 ); const TInt KPECallTimerOff = 0; -const TInt KTimesToSplitValue = 16; // ==================== LOCAL FUNCTIONS ==================== @@ -97,8 +96,6 @@ TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::ConstructL: 5" ); iActiveStarter->StartUp(); TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::ConstructL: 6" ); - // Reserve needed callinfo and remoteinfo from heap. - iCallInfo = new ( ELeave ) RMobileCall::TMobileCallInfoV3; }// ConstructL // ----------------------------------------------------------------------------- @@ -148,7 +145,6 @@ delete iCallHandling; delete iExternalDataHandler; delete iCallStackCutter; - delete iCallInfo; if ( iActiveStarter ) { @@ -971,7 +967,6 @@ "PE cpephonemodel::sendmessage > iEngineMonitor.HandleError: messageName=%s, CallId=%d", messageName2.Ptr( ), aCallId ); #endif - SetCallError( aCallId ); TPEErrorInfo errorInfo; errorInfo.iErrorCode = errorCode; errorInfo.iCallId = aCallId; @@ -984,7 +979,6 @@ KTAERROR, "PE cpephonemodel::sendmessage > iEngineMonitor.HandleError: messageName=EPEMessageCallHandlingError, CallId=%d" , aCallId ); - SetCallError( aCallId ); TPEErrorInfo errorInfo = iEngineInfo->ErrorInfo(); errorInfo.iCallId = aCallId; errorInfo.iErrorType = EPECcp; @@ -1002,7 +996,6 @@ TEFLOGSTRING( KTAERROR, "PE cpephonemodel::sendmessage > iEngineMonitor.HandleError: messageName=EPEMessageServiceHandlingError" ); - SetCallError( aCallId ); TPEErrorInfo errorInfo = iEngineInfo->ErrorInfo(); errorInfo.iCallId = aCallId; errorInfo.iErrorType = EPECch; @@ -1136,7 +1129,11 @@ break; case MEngineMonitor::EPEMessageAudioOutputPreferenceChanged: - errorCode = iMessageHandler->HandleRoutePreferenceChanged(); + //Don't handle route preference mode change if no active calls exist. + if ( iCallHandling->GetNumberOfCalls() ) + { + errorCode = iMessageHandler->HandleRoutePreferenceChanged(); + } break; case MEngineMonitor::EPEMessageConferenceIdle: @@ -1512,25 +1509,4 @@ return KErrNone; } -// ----------------------------------------------------------------------------- -// SetCallError -// ----------------------------------------------------------------------------- -// -void CPEPhoneModel::SetCallError( TInt aCallId ) - { - TInt callError = KErrNone; - if ( iCallHandling ) - { - TInt err = iCallHandling->GetCallInfo( *iCallInfo, aCallId ); - - if ( err == KErrNone && ( iCallInfo->iExitCode & 0xFFFF0000 ) && - aCallId > KErrNotFound ) - { - callError = ( iCallInfo->iExitCode >> KTimesToSplitValue ); - //Set protocol spesific error code to EngineInfo - EngineInfo()->SetProtocolError( callError, aCallId ); - } - } - } - // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp --- a/phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -109,7 +109,7 @@ const CAiwGenericParamList& aInParamList, CAiwGenericParamList& /*aOutParamList*/, TUint aCmdOptions, - const MAiwNotifyCallback* aCallback ) + const MAiwNotifyCallback* /*aCallback*/ ) { // Cancel bit must always be checked. Support can be implemented if necessary. @@ -132,23 +132,7 @@ if ( index >= 0 && genericParam ) { - TInt err = SetCallImagePathL( genericParam ); - if ( aCallback ) - { - TInt eventId = err ? KAiwEventError : KAiwEventCompleted; - // Must cast this because of AIW bug - MAiwNotifyCallback* nonConstCallback = - const_cast ( aCallback ); - CAiwGenericParamList* eventParamList = CAiwGenericParamList::NewL(); - CleanupStack::PushL( eventParamList ); - nonConstCallback->HandleNotifyL( - aCmdId, - eventId, - *eventParamList, - aInParamList ); - CleanupStack::PopAndDestroy( eventParamList ); - } - User::LeaveIfError( err ); + User::LeaveIfError( SetCallImagePathL( genericParam ) ); } } } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/Inc/BMUtils.h --- a/phoneuis/BubbleManager/Inc/BMUtils.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/Inc/BMUtils.h Wed Oct 13 14:31:22 2010 +0300 @@ -431,6 +431,21 @@ CEikImage*& aBubble ); /** + * Makes bubble image transparent based on given + * 9-piece mask frame. + * @since 3.1 + * @param aFrameID Skin id for frame. + * @param aOuterRect Outer rectangle. + * @param aInnerRect Inner rectangle. + * @param aBubble Bubble image. + */ + static void AddTransparencyToBubbleImageL( + const TAknsItemID& aFrameID, + const TRect& aOuterRect, + const TRect& aInnerRect, + CEikImage*& aBubble ); + + /** * Adds call object image to bubble image. * @since 3.1 * @param aCOImage Image. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/Src/BMBubbleOutlookVideo.cpp --- a/phoneuis/BubbleManager/Src/BMBubbleOutlookVideo.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/Src/BMBubbleOutlookVideo.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/Src/BMBubbleOutlookVideoCnap.cpp --- a/phoneuis/BubbleManager/Src/BMBubbleOutlookVideoCnap.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/Src/BMBubbleOutlookVideoCnap.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/Src/BMMainPaneControl.cpp --- a/phoneuis/BubbleManager/Src/BMMainPaneControl.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/Src/BMMainPaneControl.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -410,8 +410,8 @@ iScaledImage = NULL; // create a bitmap for scaled size - TRAPD( err, iScaledImage = new (ELeave) CFbsBitmap ); - if ( err != KErrNone ) + iScaledImage = new CFbsBitmap(); + if ( !iScaledImage ) { // no scaling in error cases iScaler->SetState( CTelBubbleImageScaler::EScalingIdle ); @@ -421,8 +421,8 @@ TSize size = aSourceBitmap->SizeInPixels(); TRect scaledRect( 0, 0, size.iWidth * SCALE_FACTOR, size.iHeight * SCALE_FACTOR ); - TRAP( err, iScaledImage->Create( scaledRect.Size(), aSourceBitmap->DisplayMode() ) ); - if ( err != KErrNone ) + TInt error = iScaledImage->Create( scaledRect.Size(), aSourceBitmap->DisplayMode() ); + if ( error != KErrNone ) { delete iScaledImage; iScaledImage = NULL; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/Src/BMUtils.cpp --- a/phoneuis/BubbleManager/Src/BMUtils.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/Src/BMUtils.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -1465,6 +1465,72 @@ } // --------------------------------------------------------------------------- +// BubbleUtils::AddTransparencyToBubbleImageL +// --------------------------------------------------------------------------- +// +void BubbleUtils::AddTransparencyToBubbleImageL( + const TAknsItemID& aFrameID, + const TRect& aOuterRect, + const TRect& aInnerRect, + CEikImage*& aBubble ) + { + + const CFbsBitmap* currentMask = aBubble->Mask(); + TSize maskSize( currentMask->SizeInPixels() ); + TRect rect( maskSize ); + + // create transparency frame + CFbsBitmap* transparency = new(ELeave) CFbsBitmap; + CleanupStack::PushL( transparency ); + User::LeaveIfError( transparency->Create( aOuterRect.Size(), + EGray256 ) ); + CFbsBitmapDevice* transparencyDev = CFbsBitmapDevice::NewL( transparency ); + CleanupStack::PushL( transparencyDev ); + CFbsBitGc* transparencyCtx; + User::LeaveIfError( transparencyDev->CreateContext( transparencyCtx ) ); + CleanupStack::PushL( transparencyCtx ); + MAknsSkinInstance* skin = AknsUtils::SkinInstance(); + AknsDrawUtils::DrawFrame( skin, + *transparencyCtx, + aOuterRect, + aInnerRect, + aFrameID, + KAknsIIDDefault, + KAknsDrawParamDefault ); + + CleanupStack::PopAndDestroy( 2, transparencyDev ); + + // create solid black mask + CFbsBitmap* solidBlack = new(ELeave) CFbsBitmap; + CleanupStack::PushL( solidBlack ); + User::LeaveIfError( solidBlack->Create( maskSize, EGray256 ) ); + CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL( solidBlack ); + CleanupStack::PushL( dev ); + CFbsBitGc* gc; + User::LeaveIfError( dev->CreateContext( gc ) ); + CleanupStack::PushL( gc ); + + gc->SetBrushColor( KRgbBlack ); + gc->SetBrushStyle( CGraphicsContext::ESolidBrush ); + gc->DrawRect( rect ); + + // blit original mask on the black mask using transparency mask + gc->BitBltMasked( TPoint(0,0), + currentMask, + TRect( currentMask->SizeInPixels() ), + transparency, + ETrue ); + + CleanupStack::PopAndDestroy( 2, dev); + + CleanupStack::Pop(solidBlack); + aBubble->SetMask( solidBlack ); + + CleanupStack::PopAndDestroy( transparency ); + delete currentMask; + } + +// --------------------------------------------------------------------------- // BubbleUtils::PrepareCallObjectToBubbleImageL // --------------------------------------------------------------------------- // diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout.cpp --- a/phoneuis/BubbleManager/laf/BMLayout.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout.h --- a/phoneuis/BubbleManager/laf/BMLayout.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout.h Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include /** * Layout coordinates from Application LAF diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout2.cpp --- a/phoneuis/BubbleManager/laf/BMLayout2.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout2.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout2.h --- a/phoneuis/BubbleManager/laf/BMLayout2.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout2.h Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include /** * Layout coordinates from Application LAF diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout3.cpp --- a/phoneuis/BubbleManager/laf/BMLayout3.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout3.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout3.h --- a/phoneuis/BubbleManager/laf/BMLayout3.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout3.h Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include /** * Call3 (video cli) layout coordinates from Application LAF diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout4.cpp --- a/phoneuis/BubbleManager/laf/BMLayout4.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout4.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout4.h --- a/phoneuis/BubbleManager/laf/BMLayout4.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout4.h Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include /** * Layout coordinates from Application LAF diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout6.cpp --- a/phoneuis/BubbleManager/laf/BMLayout6.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout6.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/BubbleManager/laf/BMLayout6.h --- a/phoneuis/BubbleManager/laf/BMLayout6.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/BubbleManager/laf/BMLayout6.h Wed Oct 13 14:31:22 2010 +0300 @@ -20,7 +20,7 @@ #include #include -#include +#include /** * Layout coordinates from Application LAF * diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/inc/cdialer.h --- a/phoneuis/dialer/inc/cdialer.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/inc/cdialer.h Wed Oct 13 14:31:22 2010 +0300 @@ -434,9 +434,6 @@ void OnPeninputUiActivated(); private: // Data - - // Component controls of dialer. - RPointerArray iComponentControls; // Keypad container - owned CDialerKeyPadContainer* iKeypadArea; @@ -482,11 +479,6 @@ * Is qwerty mode on. */ TBool iQwertyMode; - - /** - * Is hybrid keyboard mode used. - */ - TBool iHybridKeyboardMode; /** * Server wich sends events via callback when the virtual keyboard is opened/closed. diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cdialer.cpp --- a/phoneuis/dialer/src/cdialer.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cdialer.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -52,6 +52,9 @@ /// ROM drive. _LIT( KDialerResourceFile, "dialer.rsc" ); +// number entry, keypad area, easydialing, toolbar +const TInt KContainedControlsInTelephonyMode = 4; + // ========================= MEMBER FUNCTIONS ================================ @@ -93,8 +96,6 @@ delete iEasyDialer; delete iDialingExtensionObserver; delete iToolbar; - - iComponentControls.Close(); UnLoadResources(); DIALER_PRINT("CDialer::~CDialer>"); @@ -119,19 +120,12 @@ SetParent( const_cast(&aContainer) ); iNumberEntry = CDialerNumberEntry::NewL( *this ); - iComponentControls.Append( iNumberEntry ); iController = aController; - // Keypad and toolbar are not used in small displays. - if ( ! FeatureManager::FeatureSupported( KFeatureIdFfSmallScreenTouch ) ) - { - iKeypadArea = CDialerKeyPadContainer::NewL( *this, EModeEasyDialing ); - iComponentControls.Append( iKeypadArea ); - - iToolbar = CDialerToolbarContainer::NewL( *this, iController ); - iComponentControls.Append( iToolbar ); - } + iKeypadArea = CDialerKeyPadContainer::NewL( *this, EModeEasyDialing ); + + iToolbar = CDialerToolbarContainer::NewL( *this, iController ); // try to create easydialing plugin. If plugin is not present, iEasydialer gets value NULL. LoadEasyDialingPlugin(); @@ -155,7 +149,6 @@ { User::LeaveIfError( iPeninputServer.Connect() ); iPeninputServer.AddPenUiActivationHandler( this, EPluginInputModeAll ); - iVirtualKeyBoardOpen = iPeninputServer.IsVisible(); } #endif DIALER_PRINT("CDialer::ConstructL>"); @@ -203,10 +196,7 @@ if ( aController && iController != aController ) { iController = aController; - if ( iToolbar ) - { - iToolbar->SetContentProviderL( iController ); - } + iToolbar->SetContentProviderL( iController ); iNumberEntry->SetNumberEntryPromptTextL( iController->NumberEntryPromptTextL() ); SizeChanged(); UpdateToolbar(); @@ -245,11 +235,7 @@ iController->SetNumberEntryIsEmpty( !numAvailable ); iToolbar->UpdateButtonStates(); iToolbar->DrawDeferred(); - - if ( iKeypadArea ) - { - iKeypadArea->DrawDeferred(); // needed to remove drawing problem from leftmost button column - } + iKeypadArea->DrawDeferred(); // needed to remove drawing problem from leftmost button column } } @@ -379,13 +365,15 @@ void CDialer::RemoveNumberEntry() { ResetEditorToDefaultValues(); + iVirtualKeyBoardOpen = EFalse; iIsUsed = EFalse; // easydialer change begins if (iEasyDialer) { - TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingClosePopup ); ); + TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingClosePopup ); + iEasyDialer->HandleCommandL( EEasyDialingVkbClosed ) ); iEasyDialer->Reset(); } // easydialer change ends @@ -410,9 +398,14 @@ // void CDialer::OpenVkbL() { + iVirtualKeyBoardOpen = ETrue; UpdateEdwinState( EVirtualKeyboardEditor ); iNumberEntry->HandleCommandL( EDialerCmdTouchInput ); + if ( iEasyDialer ) + { + iEasyDialer->HandleCommandL( EEasyDialingVkbOpened ); + } } // --------------------------------------------------------------------------- @@ -453,10 +446,7 @@ // void CDialer::EnableTactileFeedback( const TBool aEnable ) { - if ( iKeypadArea ) - { - iKeypadArea->EnableTactileFeedback( aEnable ); - } + iKeypadArea->EnableTactileFeedback( aEnable ); } // --------------------------------------------------------- @@ -467,6 +457,10 @@ { iQwertyMode = aMode; UpdateNumberEntryConfiguration(); + if ( iEasyDialer && aMode ) + { + TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingVkbClosed ) ); + } } // --------------------------------------------------------- @@ -515,45 +509,34 @@ AknsUtils::RegisterControlPosition( this ); TRect parentRect( Rect() ); + // Method is called before containers are created. + if ( !iKeypadArea ) + { + return; + } + TDialerVariety variety = ( Layout_Meta_Data::IsLandscapeOrientation() ? EDialerVarietyLandscape : EDialerVarietyPortrait ); - // keypad area - if ( iKeypadArea ) - { - TDialerOperationMode keypadOpMode = - ( EasyDialingEnabled() ? EModeEasyDialing : EModeDialer ); - - iKeypadArea->SetOperationMode( keypadOpMode ); - AknLayoutUtils::LayoutControl( - iKeypadArea, parentRect, - AknLayoutScalable_Apps::dia3_keypad_num_pane( variety ).LayoutLine() ); - } + TDialerOperationMode keypadOpMode = + ( EasyDialingEnabled() ? EModeEasyDialing : EModeDialer ); + iKeypadArea->SetOperationMode( keypadOpMode ); + AknLayoutUtils::LayoutControl( + iKeypadArea, parentRect, + AknLayoutScalable_Apps::dia3_keypad_num_pane( variety ).LayoutLine() ); - // toolbar - if ( iToolbar ) - { - AknLayoutUtils::LayoutControl( - iToolbar, parentRect, - AknLayoutScalable_Apps::dia3_keypad_fun_pane( variety ).LayoutLine() ); - } + AknLayoutUtils::LayoutControl( + iToolbar, parentRect, + AknLayoutScalable_Apps::dia3_keypad_fun_pane( variety ).LayoutLine() ); - // Use hybrid keyboard mode if there is no visible virtual keypad. - iHybridKeyboardMode = !iKeypadArea; - // easy dial contacts list if ( iEasyDialer ) { AknLayoutUtils::LayoutControl( iEasyDialer, parentRect, AknLayoutScalable_Apps::dia3_listscroll_pane( variety ).LayoutLine() ); - - iEasyDialer->SetKeyboardMode( - iHybridKeyboardMode ? - CDialingExtensionInterface::EHybridQwerty : - CDialingExtensionInterface::EDefaultKeyboard ); } // number entry @@ -577,7 +560,13 @@ // TInt CDialer::CountComponentControls() const { - return iComponentControls.Count(); + TInt count( KContainedControlsInTelephonyMode ); + + if ( !iEasyDialer ) + { + count--; + } + return count; } // --------------------------------------------------------------------------- @@ -588,7 +577,9 @@ // CCoeControl* CDialer::ComponentControl( TInt aIndex ) const { - return iComponentControls[ aIndex ]; + CCoeControl* currentControl(NULL); + currentControl = ComponentControlForDialerMode( aIndex ); + return currentControl; } // --------------------------------------------------------------------------- @@ -661,7 +652,12 @@ { // Clear editor flags and report // edwin state changed. + iVirtualKeyBoardOpen = EFalse; UpdateNumberEntryConfiguration(); + if ( iEasyDialer ) + { + iEasyDialer->HandleCommandL( EEasyDialingVkbClosed ); + } } } @@ -723,6 +719,42 @@ } // --------------------------------------------------------------------------- +// CDialer::ComponentControlForDialerMode +// +// Returns contained control by given index in ohonedialer mode. +// +// --------------------------------------------------------------------------- +// +CCoeControl* CDialer::ComponentControlForDialerMode( const TInt aIndex ) const + { + CCoeControl* currentControl(NULL); + + switch ( aIndex ) + { + case 0: + currentControl = iNumberEntry; + break; + case 1: + currentControl = iKeypadArea; + break; + + case 2: + currentControl = iToolbar; + break; + case 3: + currentControl = iEasyDialer; + break; + + default: + { + __ASSERT_DEBUG( EFalse, _L("CDialer::ComponentControl no such component defined")); + } + } + + return currentControl; + } + +// --------------------------------------------------------------------------- // CDialer::EdwinState // // Returns edwin state of the editor. @@ -764,14 +796,8 @@ TInt flags = EAknEditorFlagNoT9 | EAknEditorFlagLatinInputModesOnly | EAknEditorFlagSelectionVisible; - - // Use numeric input mode if in hybrid mode and virtual keyboard - // is not open. This signals to AvKON that hybrid mode needs to - // be used. - TInt inputMode = ( iHybridKeyboardMode && !vkbOpen ) ? - EAknEditorNumericInputMode : EAknEditorTextInputMode; - edwinState->SetDefaultInputMode( inputMode ); - edwinState->SetCurrentInputMode( inputMode ); + edwinState->SetDefaultInputMode( EAknEditorTextInputMode ); + edwinState->SetCurrentInputMode( EAknEditorTextInputMode ); if ( EVirtualKeyboardEditor == aType || vkbOpen ) { @@ -779,6 +805,10 @@ // here. flags = ( flags |= EAknEditorFlagNoEditIndicators ); } + else + { + iVirtualKeyBoardOpen = EFalse; + } edwinState->SetFlags( flags ); edwinState->SetPermittedInputModes( @@ -850,8 +880,6 @@ iDialingExtensionObserver = CDialingExtensionObserver::NewL( iEasyDialer, iNumberEntry, this ); iEasyDialer->AddObserverL( iDialingExtensionObserver ); - - iComponentControls.Append( iEasyDialer ); } ); if ( error ) @@ -920,12 +948,7 @@ void CDialer::OnPeninputUiDeactivated() { DIALER_PRINT( "CDialer::OnPeninputUiDeactivated" ) - iVirtualKeyBoardOpen = EFalse; FocusChanged( EDrawNow ); - if ( iEasyDialer ) - { - TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingVkbClosed ) ); - } } // --------------------------------------------------------------------------- @@ -937,10 +960,5 @@ void CDialer::OnPeninputUiActivated() { DIALER_PRINT( "CDialer::OnPeninputUiActivated" ) - iVirtualKeyBoardOpen = ETrue; - if ( iEasyDialer ) - { - TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingVkbOpened ) ); - } } // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cdialercontainerbase.cpp --- a/phoneuis/dialer/src/cdialercontainerbase.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cdialercontainerbase.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cdialerkeypadcontainer.cpp --- a/phoneuis/dialer/src/cdialerkeypadcontainer.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cdialerkeypadcontainer.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include // for KDC_APP_RESOURCE_DIR diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cdialernumberentry.cpp --- a/phoneuis/dialer/src/cdialernumberentry.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cdialernumberentry.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -25,16 +25,15 @@ #include #include // CEikImage #include // TResourceReader -#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -51,8 +50,6 @@ const TInt KNumberEntryControlCount = 2; // = number entry, label _LIT( KPhoneValidChars, "0123456789*#+pwPW" ); -_LIT( KPhoneVanityValidChars, "0123456789*#+pwABCDEFGHIJKLMNOPQRSTUVWXYZ" ); - const TInt KKeyCtrlA( 1 ); const TInt KKeyCtrlC( 3 ); const TInt KKeyCtrlV( 22 ); @@ -192,10 +189,9 @@ { DoSetFocus( aFocus, aDrawNow ); } - DIALER_PRINT("numberentry::SetFocus>"); } - + // --------------------------------------------------------------------------- // CDialerNumberEntry::SetLateFocus // --------------------------------------------------------------------------- @@ -231,7 +227,7 @@ iEditor->SetFocus( aFocus ); } - // Don't allow usage of late focuser until next layout change or Dialer launch + // Don't allow usage of late focuser until next layout change iLateFocuserCanBeUsed = EFalse; DIALER_PRINT("numberentry::DoSetFocus>"); @@ -581,7 +577,7 @@ HandleEditorFormatting(); iEditor->DrawDeferred(); - + // Allow usage of late focuser iLateFocuserCanBeUsed = ETrue; } @@ -958,40 +954,22 @@ // ----------------------------------------------------------------------------- // CDialerNumberEntry::Validate +// +// Copied from cphonekeys. // ----------------------------------------------------------------------------- // TBool CDialerNumberEntry::Validate( const TDesC& aString ) { DIALER_PRINT("numberentry::Validate"); - - if ( aString.Length() == 0 ) + TLex input( aString ); + TPtrC valid( KPhoneValidChars ); + + while ( valid.Locate( input.Peek() ) != KErrNotFound ) { - return EFalse; - } - - // check first character - TPtrC valid( KPhoneValidChars ); - if ( valid.Locate( aString[0] ) == KErrNotFound ) - { - return EFalse; + input.Inc(); } - // if vanitydialing feature is enabled, also capital A-Z are accepted after first character - if ( FeatureManager::FeatureSupported( KFeatureIdFfHomeScreenVanityDialing ) ) - { - valid.Set( KPhoneVanityValidChars ); - } - - // check rest of the string - for ( TInt i = 1; i < aString.Length(); i++ ) - { - if ( valid.Locate( aString[i] ) == KErrNotFound ) - { - return EFalse; - } - } - - return ETrue; + return !input.Remainder().Length(); } // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cdialervideocontainer.cpp --- a/phoneuis/dialer/src/cdialervideocontainer.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cdialervideocontainer.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -27,9 +27,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cdialingextensionobserver.cpp --- a/phoneuis/dialer/src/cdialingextensionobserver.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cdialingextensionobserver.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -154,7 +154,7 @@ { if ( !iEikonEnvironment ) { - iEikonEnvironment = CEikonEnv::Static(); // codescanner::performance::eikonenvstatic + iEikonEnvironment = CEikonEnv::Static(); } if( iEikonEnvironment && iEikonEnvironment->EikAppUi() ) diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cvideodtmfdialer.cpp --- a/phoneuis/dialer/src/cvideodtmfdialer.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cvideodtmfdialer.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -106,7 +106,7 @@ // Constructor CVideoDTMFDialer::CVideoDTMFDialer( ) : - iEikEnv( *CEikonEnv::Static() ) // codescanner::performance::eikonenvstatic + iEikEnv( *CEikonEnv::Static() ) { // Empty } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/dialer/src/cvideodtmfdialerstub.cpp --- a/phoneuis/dialer/src/cvideodtmfdialerstub.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/dialer/src/cvideodtmfdialerstub.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -66,7 +66,7 @@ // Constructor CVideoDTMFDialer::CVideoDTMFDialer( ) : - iEikEnv( *CEikonEnv::Static() ) // codescanner::performance::eikonenvstatic + iEikEnv( *CEikonEnv::Static() ) { // Empty } diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/data/easydialingpluginresources.rss --- a/phoneuis/easydialing/data/easydialingpluginresources.rss Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/data/easydialingpluginresources.rss Wed Oct 13 14:31:22 2010 +0300 @@ -114,13 +114,9 @@ }, MENU_ITEM { - command = EEasyDialingVoiceCall; - txt = qtn_call_sub_voice; - }, - MENU_ITEM - { - command = EEasyDialingVideoCall; - txt = qtn_call_sub_video; + command = EEasyDialingVoiceCall; + cascade = r_easydialing_options_call_menu; + txt = text_number_call; }, MENU_ITEM { @@ -146,6 +142,30 @@ } +// --------------------------------------------------------- +// +// r_easydialing_options_call_menu +// Number Acquisition view options call menu pane. +// +// --------------------------------------------------------- +// +RESOURCE MENU_PANE r_easydialing_options_call_menu + { + items= + { + MENU_ITEM + { + command = EEasyDialingVoiceCall; + txt = qtn_call_sub_voice; + }, + MENU_ITEM + { + command = EEasyDialingVideoCall; + txt = qtn_call_sub_video; + } + }; + } + //---------------------------------------------------------------------------- // r_easydialing_options_on_off_menu_item // diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/group/easydialingplugin.mmp --- a/phoneuis/easydialing/group/easydialingplugin.mmp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/group/easydialingplugin.mmp Wed Oct 13 14:31:22 2010 +0300 @@ -131,6 +131,5 @@ // Libraries used for R&D purposes only DEBUGLIBRARY flogger.lib - // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/group/iconlist.txt --- a/phoneuis/easydialing/group/iconlist.txt Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/group/iconlist.txt Wed Oct 13 14:31:22 2010 +0300 @@ -1,5 +1,3 @@ -c8,8 qgn_indi_org_arrow_right.svg -c8,8 qgn_indi_org_arrow_left.svg --c8,8 qgn_indi_org_arrow_down.svg --c8,8 qgn_prop_nrtyp_sim_contact.svg --c8,8 qgn_prop_nrtyp_sdn.svg \ No newline at end of file +-c8,8 qgn_indi_org_arrow_down.svg \ No newline at end of file diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/dialingextensioninterface.h --- a/phoneuis/easydialing/inc/dialingextensioninterface.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/dialingextensioninterface.h Wed Oct 13 14:31:22 2010 +0300 @@ -88,29 +88,6 @@ class CDialingExtensionInterface : public CCoeControl { public: - - - /** - * Enumeration for keyboard modes. Keyboardmode affect on how search string is matched - * with contacts. - */ - typedef enum - { - - /* - * ENormalKeyboard is used when there is no QWERTY keyboard, or non-hybrid mode - * QWERTY keyboard. - */ - EDefaultKeyboard = 0, - - /* - * EHybridQwerty is used with hybrid mode QWERTY keyboard. Hybrid mode means - * that keys where a letter and number share a common key, short press to that key - * produces the number, not the letter. - */ - EHybridQwerty - - } TKeyboardMode; /** * Creates an instance of plugin. @@ -206,13 +183,6 @@ */ virtual TBool IsEnabled() const = 0; - - /** - * Set keyboard mode to be used in matching. - * @param aMode Mode to be used. - */ - virtual void SetKeyboardMode( TKeyboardMode aMode ) = 0; - private: // data /** ECom instance identifier key. */ diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/easydialingcontactdata.h --- a/phoneuis/easydialing/inc/easydialingcontactdata.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/easydialingcontactdata.h Wed Oct 13 14:31:22 2010 +0300 @@ -76,34 +76,6 @@ /** - * Gets SIM contact status of the contact - * @return ETrue, if contact is a SIM contact, EFalse otherwise. - */ - TBool IsSimContact(); - - - /** - * Sets SIM contact status of the contact - * @param aSim Boolean value containing the status. - */ - void SetSimContact(TBool aSim); - - - /** - * Gets Service Dialing Number status of the contact - * @return ETrue, if contact is a SDN contact, EFalse otherwise. - */ - TBool IsSdnContact(); - - - /** - * Sets Service Dialing Number status of the contact - * @param aSdn Boolean value containing the status. - */ - void SetSdnContact(TBool aSdn); - - - /** * Returns the loading status of the contact. * @return ETrue, if contact data loading has completed, EFalse otherwise. */ @@ -114,7 +86,7 @@ * Sets loading status to complete. */ void LoadingComplete(); - + /** * Deletes the thumbnail image of the contact. @@ -167,25 +139,19 @@ /** Thumbnail bitmap. Owned. */ CFbsBitmap* iThumbnail; - + /** ETrue if this is a favourite contact. */ TBool iFav; - - /** ETrue if this is a normal SIM contact. */ - TBool iSimContact; - - /** ETrue if this is a service number contact. */ - TBool iSdnContact; - + /** ETrue is asynchronous loading of contact data is complete. */ TBool iLoaded; - + /** ETrue if voice call is a possible action with this contact. */ TBool iVoiceCallAvailable; /** ETrue if video call is a possible action with this contact. */ TBool iVideoCallAvailable; - + /** ETrue if SMS or MMS is a possible action with this contact. */ TBool iUniEditorAvailable; }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/easydialingcontactdatamanager.h --- a/phoneuis/easydialing/inc/easydialingcontactdatamanager.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/easydialingcontactdatamanager.h Wed Oct 13 14:31:22 2010 +0300 @@ -20,9 +20,8 @@ #define __EASYDIALINGCONTACTDATAMANAGER_H__ #include -#include #include -#include +#include #include #include #include @@ -31,7 +30,6 @@ #include "easydialingcontactdata.h" // FORWARD DECLARATIONS -class CPbk2StoreConfiguration; class CVPbkContactManager; class MContactDataManagerObserver; class MVPbkFieldType; @@ -47,16 +45,15 @@ public CBase, public MPbk2ImageGetObserver, public MVPbkSingleContactOperationObserver, - public MVPbkContactStoreListObserver, + public MVPbkContactStoreObserver, public MVPbkOperationErrorObserver, public MVPbkOperationResultObserver, - public MPbk2StoreConfigurationObserver, public MPbkGlobalSettingObserver, public MVPbkContactViewObserver { public: - + /** * Contact name display order */ @@ -65,32 +62,26 @@ EFirstnameLastname, ELastnameFirstname }; - -public: // constructor and destructor + +public: /** - * Two-phased constructor + * Constructor. */ - static CEasyDialingContactDataManager* NewL(); + CEasyDialingContactDataManager(CVPbkContactManager* aContactManager); + /** * Destructor. */ ~CEasyDialingContactDataManager(); -private: // constructors - /** - * Constructor. - */ - CEasyDialingContactDataManager(); - /** * Second phase constructor of the class. */ void ConstructL(); -public: // new methods /** * Sets the observer. Observer is notified when thumbnail loading is complete * @param aObserver @@ -98,11 +89,6 @@ void SetObserver(MContactDataManagerObserver* aObserver); /** - * Gets a handle to the VPbk contact manager - */ - CVPbkContactManager& ContactManager(); - - /** * Sets the size of the thumbnails. If the loaded thumbnail is larger than * the set size, thumnail is scaled to the size. If the set size is different * from the old one, deletes all loaded thumbnails, which causes them to be @@ -122,39 +108,14 @@ HBufC* GetThumbnailIdL( MVPbkContactLink* aContact, TBool aMatchThumbnail, TBool aFav ); /** - * Gets internal index for a contact item with the given internal ID. - */ - TInt IndexForId( const TDesC& aId ) const; - - /** * Gets the thumbnail for a contact item. If thumbnail is not loaded, starts * loading it. - * @param aIndex Internal index for the contact, obtained with IndexForId + * @param aContact Contact link * @param aThumbnail Outparam. Contact thumbnail. NULL if contact doesn't have thumbnail + * @param aFav Outparam. Favourite status * @return true if contact data has been loaded */ - TBool GetThumbnail( TInt aIndex, CFbsBitmap*& aThumbnail ); - - /** - * Checks if contact is a favorite contact - * @param aIndex Internal index fo the contact, obtained with IndexForId - * @return ETrue if contact is a favorite contact - */ - TBool IsFav( TInt aIndex ) const; - - /** - * Checks if contact is a SIM contact - * @param aIndex Internal index fo the contact, obtained with IndexForId - * @return ETrue if contact is a SIM contact - */ - TBool IsSimContact( TInt aIndex ) const; - - /** - * Checks if contact is a service number contact - * @param aIndex Internal index fo the contact, obtained with IndexForId - * @return ETrue if contact is a service number contact - */ - TBool IsSdnContact( TInt aIndex ) const; + TBool GetThumbnailAndFav(const TDesC& aId, CFbsBitmap*& aThumbnail, TBool& aFav); /** * Deletes all loaded thumbnails and cancel asynchronous operations. @@ -240,13 +201,6 @@ TNameOrder NameOrder(); /** - * Get URIs of the contact stores which are currently shown in Phonebook. - * @param aUris On return, contains heap descriptors identifying the contact - * stores which are active. Ownership of the descriptors is given. - */ - void GetCurrentStoreUrisL( RPointerArray& aUris ); - - /** * Pause the loading of contact data. This is used to make sure listbox is responsive * and smooth during panning and flicking. * @param aPause Pause on/off @@ -269,19 +223,6 @@ public: /** - * From MPbk2StoreConfigurationObserver - */ - void ConfigurationChanged(); - - /** - * From MPbk2StoreConfigurationObserver - */ - void ConfigurationChangedComplete(); - - -public: - - /** * From MPbkGlobalSettingObserver. */ void SettingChangedL( MPbkGlobalSetting::TPbkGlobalSetting aKey ); @@ -305,27 +246,25 @@ private: + /** - * From MVPbkContactStoreListObserver. + * From MVPbkContactStoreObserver. */ void StoreReady( MVPbkContactStore& aContactStore ); - + + /** - * From MVPbkContactStoreListObserver. + * From MVPbkContactStoreObserver. */ void StoreUnavailable( MVPbkContactStore& aContactStore, TInt aReason ); + /** - * From MVPbkContactStoreListObserver. + * From MVPbkContactStoreObserver. */ void HandleStoreEventL( MVPbkContactStore& aContactStore, - TVPbkContactStoreEvent aStoreEvent ); - - /** - * From MVPbkContactStoreListObserver. - */ - void OpenComplete(); - + TVPbkContactStoreEvent aStoreEvent ); + private: /** * From MVPbkOperationErrorObserver. @@ -388,15 +327,8 @@ void InformObserver(); void UpdateNameOrderL(); - - void SetupFavStoreSearchedL(); - - void SetStoreFlagsForContact( CEasyDialingContactData* aContactData ) const; private: - /** Phonebook store configuration. Owned. */ - CPbk2StoreConfiguration* iPbkStoreConfiguration; - /** Array that contains all loaded contact data. Owned. */ RPointerArray iContactDataArray; @@ -418,7 +350,7 @@ /** Contact item for which a thumbnail is being loaded. Owned. */ MVPbkStoreContact* iStoreContact; - /** Virtual phonebook contact manager. Owned. */ + /** Virtual phonebook contact manager. Not owned. */ CVPbkContactManager* iContactManager; /** Contact data manager observer. Not owned. */ @@ -430,6 +362,9 @@ /** Virtual phonebook operation handle. Owned. */ MVPbkContactOperationBase* iContactOperation; + /** Default contact store. Not owned. */ + MVPbkContactStore* iContactStore; + /** Variable which tells either to show or hide contact thumbnails. */ TBool iContactThumbnailSetting; @@ -442,9 +377,6 @@ /** Favourites view is ready to be used. */ TBool iFavsViewReady; - /** Contact store containing favourite contacts is configured to be searched. */ - TBool iFavStoreSearched; - /** Virtual phonebook operation handle for getting favourites. Owned. */ MVPbkContactOperationBase* iFavsOperation; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/easydialinglistbox.h --- a/phoneuis/easydialing/inc/easydialinglistbox.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/easydialinglistbox.h Wed Oct 13 14:31:22 2010 +0300 @@ -149,7 +149,7 @@ /** * Return contact link of current item packaged in HBufC object. If no item is - * selected in listbox returns NULL. + * selected in listbox returns NULL. * @return Contact link. Ownership is transferred to the caller. */ HBufC8* CurrentContactLinkL(); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/easydialinglistboxdata.h --- a/phoneuis/easydialing/inc/easydialinglistboxdata.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/easydialinglistboxdata.h Wed Oct 13 14:31:22 2010 +0300 @@ -155,15 +155,15 @@ const TExtendedColors& aColors ) const; /** - * Draws the Contact Thumbnail Icon if any, else draws the dummy contact thumbnail. + * Draws the Contact Thumbnail Icon if any else draws the dummy contact thumbnail. * @param aGc Graphics context. * @param aBoundingBox Rectangle containing bounds for contact thumbnail. - * @param aContactIndex Contact index for the contact data manager + * @param aDescId Descriptor containing contact id. */ - void DrawContactThumbnail( + TBool DrawContactThumbnail( CWindowGc& aGc, TRect aBoundingBox, - TInt aContactIndex ) const; + TPtrC aDescId) const; /** * Draws the Action Menu. @@ -185,21 +185,6 @@ TRect aNameRectUnMirrored, TRect aEffectiveRect) const; - /** - * Draws the SIM or Service Number icon. Takes the name rect as a parameter. Name rect - * must be unmirrored, because the mirroring is done as the last thing - * before drawing. - * @param aIcon The icon to be drawn - * @param aGc Graphics context. - * @param aNameRectUnMirrored Name rect, after which the icon is drawn - * @param aEffectiveRect The whole listbox item rect. Used for mirroring. - */ - void DrawSimIcon( - CGulIcon& aIcon, - CWindowGc& aGc, - TRect aNameRectUnMirrored, - TRect aEffectiveRect) const; - private: /** Control environment */ @@ -229,12 +214,6 @@ /** Favourite icon. Owned. */ CGulIcon* iFavouriteIcon; - /** SIM contact icon. Owned. */ - CGulIcon* iSimContactIcon; - - /** Service contact icon. Owned. */ - CGulIcon* iSdnContactIcon; - /** Pointer to listbox. Not owned. */ CEasyDialingListBox* iControl; }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/easydialingplugin.h --- a/phoneuis/easydialing/inc/easydialingplugin.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/easydialingplugin.h Wed Oct 13 14:31:22 2010 +0300 @@ -58,6 +58,8 @@ class CPSRequestHandler; class CPsQuery; +class CVPbkContactStoreUriArray; +class CVPbkContactManager; class CEasyDialingListBox; class MVPbkContactLink; class CEasyDialingCenrepListener; @@ -94,7 +96,7 @@ * Destructor. */ virtual ~CEasyDialingPlugin(); - + public: // from CCoeControl /** @@ -116,7 +118,7 @@ * From CCoeControl */ void MakeVisible( TBool aVisible ); - + /** * From CCoeControl */ @@ -211,12 +213,6 @@ */ TBool IsEnabled() const; - /** - * Tells if extension is currently enabled from settings. - * @return ETrue if extension is enabled, EFalse otherwise. - */ - void SetKeyboardMode( TKeyboardMode aMode ); - public: /** @@ -228,7 +224,7 @@ * From MEasyDialingCenrepListenerObserver. */ void EasyDialingContactThumbnailsSettingsChanged( TInt aThumbnailSettingValue ); - + /** * From MContactDataManagerObserver. */ @@ -245,11 +241,6 @@ void FavouritesChanged(); /** - * From MContactDataManagerObserver. - */ - void StoreConfigurationChanged(); - - /** * From MEDContactorObserver. */ void InformContactorEvent( MEDContactorObserver::TEvent aEvent ); @@ -288,8 +279,6 @@ void InitPredictiveContactSearchL(); - void SetupPcsSettingsL(); - void SetSortOrderL( CEasyDialingContactDataManager::TNameOrder aNameOrder ); /** @@ -457,6 +446,12 @@ /** Array of used data stores. Owned. */ RPointerArray iContactDataStores; + /** Contact store array. Owned. */ + CVPbkContactStoreUriArray* iContactStoreUriArray; + + /** Contact manager handle. Owned. */ + CVPbkContactManager* iContactManager; + /** Search result field index for first name field. */ TInt iFirstNamePCSIndex; @@ -522,7 +517,7 @@ /** Is virtual keyboard currently open or not.*/ TBool iVirtualKeyboardOpen; - + /** First line of info text shown when number entry is empty. Owned. */ HBufC* iInfoLabelTextLine1; @@ -535,11 +530,9 @@ /** Label for showing second line of info text when number entry is empty. Owned. */ CEikLabel* iInfoLabelLine2; - /** Keyboard mode to be used in matching. */ - TKeyboardMode iKeyboardMode; - - /** 'Flag' if contact have been long tapped, so ECE launcher opens. Long tap contact = True, default = False */ + /** 'Flag' if contact have been long tapped, so ECE launcher opens. Long tap contact = True, default = False */ TBool iLongTapped; + }; diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/inc/mcontactdatamanagerobserver.h --- a/phoneuis/easydialing/inc/mcontactdatamanagerobserver.h Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/inc/mcontactdatamanagerobserver.h Wed Oct 13 14:31:22 2010 +0300 @@ -30,8 +30,6 @@ virtual void NameOrderChanged() = 0; virtual void FavouritesChanged() = 0; - - virtual void StoreConfigurationChanged() = 0; }; #endif //__MCONTACTDATAMANAGEROBSERVER_H__ diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/src/easydialingcontactdata.cpp --- a/phoneuis/easydialing/src/easydialingcontactdata.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/src/easydialingcontactdata.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -26,7 +26,7 @@ // --------------------------------------------------------------------------- // CEasyDialingContactData::CEasyDialingContactData(MVPbkContactLink* aContactLink) - : iContactLink(aContactLink), iThumbnail(NULL), iFav(EFalse), iLoaded(EFalse) + : iContactLink(aContactLink), iThumbnail(NULL),iFav(EFalse), iLoaded(EFalse) { } @@ -64,7 +64,10 @@ // void CEasyDialingContactData::SetThumbnail(CFbsBitmap* aThumbnail) { - delete iThumbnail; + if (iThumbnail) + { + delete iThumbnail; + } iThumbnail = aThumbnail; } @@ -87,42 +90,6 @@ } // --------------------------------------------------------------------------- -// CEasyDialingContactData::IsSimContact -// --------------------------------------------------------------------------- -// -TBool CEasyDialingContactData::IsSimContact() - { - return iSimContact; - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactData::SetSimContact -// --------------------------------------------------------------------------- -// -void CEasyDialingContactData::SetSimContact(TBool aSim) - { - iSimContact = aSim; - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactData::IsSdnContact -// --------------------------------------------------------------------------- -// -TBool CEasyDialingContactData::IsSdnContact() - { - return iSdnContact; - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactData::SetSimContact -// --------------------------------------------------------------------------- -// -void CEasyDialingContactData::SetSdnContact(TBool aSdn) - { - iSdnContact = aSdn; - } - -// --------------------------------------------------------------------------- // CEasyDialingContactData::IsLoaded // --------------------------------------------------------------------------- // @@ -212,4 +179,7 @@ iUniEditorAvailable = aVailable; } -// end of file + + + + diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/src/easydialingcontactdatamanager.cpp --- a/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -21,8 +21,6 @@ #include #include #include -#include -#include #include #include #include @@ -30,19 +28,21 @@ #include #include #include + #include #include #include #include + #include #include #include #include -#include -#include +#include // MVPbkContactStore #include +#include + #include -#include #include "easydialingcontactdata.h" #include "easydialingcontactdatamanager.h" @@ -52,30 +52,12 @@ #include "easydialinglogger.h" // --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::NewL -// --------------------------------------------------------------------------- -// -CEasyDialingContactDataManager* CEasyDialingContactDataManager::NewL() - { - CEasyDialingContactDataManager* self = - new ( ELeave ) CEasyDialingContactDataManager(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -// --------------------------------------------------------------------------- // CEasyDialingContactDataManager::CEasyDialingContactDataManager // --------------------------------------------------------------------------- // -CEasyDialingContactDataManager::CEasyDialingContactDataManager() - : iPbkStoreConfiguration(NULL), - iImageOperation(NULL), - iContactManager(NULL), - iContactOperation(NULL), - iContactThumbnailSetting(ETrue), - iStoreReady(EFalse) +CEasyDialingContactDataManager::CEasyDialingContactDataManager(CVPbkContactManager* aContactManager) + : iImageOperation(NULL), iContactManager(aContactManager), iContactOperation(NULL), + iContactThumbnailSetting(ETrue), iStoreReady(EFalse) { } @@ -94,19 +76,11 @@ delete iImageOperation; delete iContactOperation; delete iFavsView; - - if ( iContactManager ) + if (iContactStore) { - TRAP_IGNORE( iContactManager->ContactStoresL().CloseAll( *this ) ); + iContactStore->Close( *this); } - delete iContactManager; - if ( iPbkStoreConfiguration ) - { - iPbkStoreConfiguration->RemoveObserver( *this ); - } - delete iPbkStoreConfiguration; - if ( iPbkSettings ) { iPbkSettings->Close(); @@ -120,43 +94,31 @@ // void CEasyDialingContactDataManager::ConstructL() { - // Create contact store configuration handler - iPbkStoreConfiguration = CPbk2StoreConfiguration::NewL(); - iPbkStoreConfiguration->AddObserverL( *this ); - - // Create manager for all the supported contact stores - CVPbkContactStoreUriArray* supportedStores = - iPbkStoreConfiguration->SupportedStoreConfigurationL(); - CleanupStack::PushL( supportedStores ); - iContactManager = CVPbkContactManager::NewL( *supportedStores ); - CleanupStack::PopAndDestroy( supportedStores ); - - // Open the stores and start observing them - iContactManager->ContactStoresL().OpenAllL( *this ); - iImageManager = CPbk2ImageManager::NewL(*iContactManager); + TVPbkContactStoreUriPtr uri( VPbkContactStoreUris::DefaultCntDbUri() ); + iContactStore = iContactManager->ContactStoresL().Find( uri ); + iVPbkTopContactManager = CVPbkTopContactManager::NewL( *iContactManager ); iImageManagerParams.iFlags = TPbk2ImageManagerParams::EScaleImage | TPbk2ImageManagerParams::EKeepAspectRatio; iThumbnailFieldType = iContactManager->FieldTypes().Find( R_VPBK_FIELD_TYPE_THUMBNAILPIC ); + // Open the store + iContactStore->OpenL( *this ); + // Read easydialing setting from cenrep. CRepository* cenrep = CRepository::NewL( KCRUidEasyDialSettings ); CleanupStack::PushL( cenrep ); User::LeaveIfError( cenrep->Get( KEasyDialingContactThumbnails, iContactThumbnailSetting ) ); CleanupStack::PopAndDestroy( cenrep ); - // Start observing Phoenbook setting for the name order iPbkSettings = PbkGlobalSettingFactory::CreatePersistentSettingL(); iPbkSettings->ConnectL( MPbkGlobalSetting::EGeneralSettingCategory ); iPbkSettings->RegisterObserverL( this ); // Get name order from Phonebook settings UpdateNameOrderL(); - - // Check if store with favourites is configured to be searched. - SetupFavStoreSearchedL(); } // --------------------------------------------------------------------------- @@ -169,15 +131,6 @@ } // --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::ContactManager -// --------------------------------------------------------------------------- -// -CVPbkContactManager& CEasyDialingContactDataManager::ContactManager() - { - return *iContactManager; - } - -// --------------------------------------------------------------------------- // CEasyDialingContactDataManager::SetThumbnailSize // --------------------------------------------------------------------------- // @@ -208,13 +161,12 @@ if (newIndex == KErrNotFound) { MVPbkContactLink* newLink = aContact->CloneLC(); - CEasyDialingContactData* newData = new (ELeave) CEasyDialingContactData(newLink); + CEasyDialingContactData *newThumbnail = new (ELeave) CEasyDialingContactData(newLink); CleanupStack::Pop(); // newLink newIndex = iContactDataArray.Count(); - CleanupStack::PushL(newData); - iContactDataArray.AppendL(newData); - CleanupStack::Pop(newData); - SetStoreFlagsForContact(newData); + CleanupStack::PushL(newThumbnail); + iContactDataArray.AppendL(newThumbnail); + CleanupStack::Pop(newThumbnail); } iContactDataArray[ newIndex ]->SetFav( aFav ); @@ -227,41 +179,33 @@ } // --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::IndexForId +// CEasyDialingContactDataManager::GetThumbnailAndFav // --------------------------------------------------------------------------- // -TInt CEasyDialingContactDataManager::IndexForId( const TDesC& aId ) const +TBool CEasyDialingContactDataManager::GetThumbnailAndFav(const TDesC& aId, CFbsBitmap*& aThumbnail, TBool& aFav) { + LOGSTRING("CEasyDialingContactDataManager: GetThumbnailAndFav"); TUint idVal(0); TLex lex(aId); lex.Val(idVal, EHex); - return idVal; - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::GetThumbnail -// --------------------------------------------------------------------------- -// -TBool CEasyDialingContactDataManager::GetThumbnail( TInt aIndex, CFbsBitmap*& aThumbnail ) - { - LOGSTRING("CEasyDialingContactDataManager: GetThumbnail"); TBool retVal; - CEasyDialingContactData* contactData = iContactDataArray[aIndex]; - if ( contactData->IsLoaded() ) + CEasyDialingContactData* thumbnail = iContactDataArray[idVal]; + aFav = thumbnail->Fav(); + if (thumbnail->IsLoaded()) { - aThumbnail = contactData->Thumbnail(); + aThumbnail = thumbnail->Thumbnail(); retVal = ETrue; } else { aThumbnail = NULL; retVal = EFalse; - if (iWaitingContacts.Find(aIndex) == KErrNotFound) + if (iWaitingContacts.Find(idVal) == KErrNotFound) { - LOGSTRING1("iWaitingContacts.Append %d", aIndex); - iWaitingContacts.Append(aIndex); + LOGSTRING1("iWaitingContacts.Append %d", idVal); + iWaitingContacts.Append(idVal); TRAPD(err, LoadNextContactDataL()); if (err) { @@ -269,41 +213,11 @@ } } } - LOGSTRING("CEasyDialingContactDataManager: GetThumbnail Exit"); + LOGSTRING("CEasyDialingContactDataManager: GetThumbnailAndFav Exit"); return retVal; } // --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::IsFav -// --------------------------------------------------------------------------- -// -TBool CEasyDialingContactDataManager::IsFav( TInt aIndex ) const - { - CEasyDialingContactData* contactData = iContactDataArray[aIndex]; - return contactData->Fav(); - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::IsSimContact -// --------------------------------------------------------------------------- -// -TBool CEasyDialingContactDataManager::IsSimContact( TInt aIndex ) const - { - CEasyDialingContactData* contactData = iContactDataArray[aIndex]; - return contactData->IsSimContact(); - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::IsSdnContact -// --------------------------------------------------------------------------- -// -TBool CEasyDialingContactDataManager::IsSdnContact( TInt aIndex ) const - { - CEasyDialingContactData* contactData = iContactDataArray[aIndex]; - return contactData->IsSdnContact(); - } - -// --------------------------------------------------------------------------- // CEasyDialingContactDataManager::IsFavL // --------------------------------------------------------------------------- // @@ -325,7 +239,7 @@ // TInt CEasyDialingContactDataManager::NumberOfFavsL() { - if ( iFavsView && iFavsViewReady && iFavStoreSearched ) + if ( iFavsView && iFavsViewReady ) { return iFavsView->ContactCountL(); } @@ -341,7 +255,7 @@ // MVPbkContactLink* CEasyDialingContactDataManager::FavLinkLC( TInt aIndex ) { - if ( !iFavsView || !iFavsViewReady || !iFavStoreSearched ) + if ( !iFavsView || !iFavsViewReady ) { // LC function should not return normally unless it has actually // put something to cleanup stack @@ -404,23 +318,6 @@ } // --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::GetCurrentStoreUrisL -// --------------------------------------------------------------------------- -// -void CEasyDialingContactDataManager::GetCurrentStoreUrisL( RPointerArray& aUris ) - { - CVPbkContactStoreUriArray* storeUris = iPbkStoreConfiguration->CurrentConfigurationL(); - CleanupStack::PushL( storeUris ); - for ( TInt i = 0 ; i < storeUris->Count() ; ++i ) - { - HBufC* dbUri = (*storeUris)[i].UriDes().AllocLC(); - aUris.AppendL( dbUri ); - CleanupStack::Pop( dbUri ); - } - CleanupStack::PopAndDestroy( storeUris ); - } - -// --------------------------------------------------------------------------- // CEasyDialingContactDataManager::Pause // --------------------------------------------------------------------------- // @@ -491,21 +388,17 @@ if ( !iImageOperation && !iContactOperation && iWaitingContacts.Count() && iStoreReady && !iPause ) { // first we need to load the contact item - const TInt index( iWaitingContacts[0] ); - - if ( index >= 0 && index < iContactDataArray.Count() ) + CEasyDialingContactData* tn = iContactDataArray[iWaitingContacts[0]]; + iContactOperation = iContactManager->RetrieveContactL( *(tn->ContactLink()), *this); + + if (!iContactOperation) { - CEasyDialingContactData* data = iContactDataArray[index]; - iContactOperation = iContactManager->RetrieveContactL( *(data->ContactLink()), *this); - if (!iContactOperation) - { - data->LoadingComplete(); - RDebug::Print(_L("iWaitingContacts.Remove %d"), iWaitingContacts[0]); - iWaitingContacts.Remove(0); - LoadNextContactDataL(); - } + tn->LoadingComplete(); + RDebug::Print(_L("iWaitingContacts.Remove %d"), iWaitingContacts[0]); + iWaitingContacts.Remove(0); + LoadNextContactDataL(); } - } + } LOGSTRING("CEasyDialingContactDataManager: LoadNextContactDataL Exit"); } @@ -517,14 +410,9 @@ void CEasyDialingContactDataManager::Pbk2ImageGetComplete(MPbk2ImageOperation& aOperation, CFbsBitmap* aBitmap) { LOGSTRING("CEasyDialingContactDataManager: Pbk2ImageGetComplete"); - TInt index( KErrNotFound ); - if ( iWaitingContacts.Count() > 0 ) - { - index = iWaitingContacts[0]; - LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]); - iWaitingContacts.Remove(0); - } - + TInt index = iWaitingContacts[0]; + LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]); + iWaitingContacts.Remove(0); delete &aOperation; iImageOperation = NULL; delete iStoreContact; @@ -549,30 +437,6 @@ Pbk2ImageGetComplete(aOperation, NULL); } -// ----------------------------------------------------------------------------- -// ConfigurationChanged -// From MPbk2StoreConfigurationObserver -// Called when contact store configuration changes -// ----------------------------------------------------------------------------- -// -void CEasyDialingContactDataManager::ConfigurationChanged() - { - TRAP_IGNORE( SetupFavStoreSearchedL() ); - iObserver->StoreConfigurationChanged(); - } - -// ----------------------------------------------------------------------------- -// ConfigurationChangedComplete -// From MPbk2StoreConfigurationObserver -// Called when contact store configuration change has been informed to all -// observers -// ----------------------------------------------------------------------------- -// -void CEasyDialingContactDataManager::ConfigurationChangedComplete() - { - // no implementation needed - } - // --------------------------------------------------------------------------- // CEasyDialingContactDataManager::SettingChangedL // From MPbkGlobalSettingObserver @@ -645,15 +509,13 @@ void CEasyDialingContactDataManager::DoHandleImageGetCompleteL(CFbsBitmap* aBitmap, TInt aIndex) { LOGSTRING("CEasyDialingContactDataManager: DoHandleImageGetCompleteL"); - if ( aIndex >= 0 && aIndex < iContactDataArray.Count() ) + CEasyDialingContactData *tn = iContactDataArray[aIndex]; + tn->LoadingComplete(); + if (aBitmap) { - CEasyDialingContactData* data = iContactDataArray[aIndex]; - data->LoadingComplete(); - if (aBitmap) - { - data->SetThumbnail(aBitmap); - } + tn->SetThumbnail(aBitmap); } + LoadNextContactDataL(); InformObserver(); LOGSTRING("CEasyDialingContactDataManager: DoHandleImageGetCompleteL Exit"); @@ -694,7 +556,7 @@ } LOGSTRING1("CEasyDialingContactDataManager: VoiceCallAvailable returns %d", ret); - return ret; + return ret; } @@ -715,7 +577,7 @@ } LOGSTRING1("CEasyDialingContactDataManager: VideoCallAvailable returns %d", ret); - return ret; + return ret; } @@ -736,7 +598,7 @@ } LOGSTRING1("CEasyDialingContactDataManager: UniEditorAvailable returns %d", ret); - return ret; + return ret; } @@ -785,20 +647,29 @@ iObserver->AllContactDataLoaded(); } } - + // --------------------------------------------------------------------------- // CEasyDialingContactDataManager::StoreReady -// from MVPbkContactStoreListObserver +// from MVPbkContactStoreObserver +// Called when the contact store is ready to be used, signals +// the next engine state. // @param aContactStore The store that is ready. // --------------------------------------------------------------------------- // + void CEasyDialingContactDataManager::StoreReady( MVPbkContactStore& /*aContactStore*/ ) { + // next open the favourites view + TRAPD( err, iVPbkTopContactManager->GetTopContactsViewL( *this, *this ) ); + if ( err ) + { + HandleError( err ); + } } - + // --------------------------------------------------------------------------- // CEasyDialingContactDataManager::StoreUnavailable -// from MVPbkContactStoreListObserver +// from MVPbkContactStoreObserver // Called when a contact store becomes unavailable. // @param aContactStore The store that became unavailable. // @param aReason The reason why the store is unavailable. @@ -808,46 +679,27 @@ void CEasyDialingContactDataManager::StoreUnavailable( MVPbkContactStore& /*aContactStore*/, TInt /*aReason*/ ) { - // Opening some contact database failed. Easydialing can operate without - // any database connections, but thumbnails and favourite stars can't be - // shown, and availability of action menu items can't be checked. + // Opening main contact database failed. Easydialing can operate without + // it, but thumbnails and favourite stars can't be shown, and availability + // of action menu items can't be checked. // Of course, if easydialing can't open the database, probably PCSServer // can't open it either... } // --------------------------------------------------------------------------- // CEasyDialingContactDataManager::HandleStoreEventL -// from MVPbkContactStoreListObserver +// from MVPbkContactStoreObserver // Called when changes occur in the contact store. -// IGNORED because ED plugin reacts to contact modifications by listening -// to PCS cache update events. +// IGNORED. // @param aContactStore A store whose event it is. // @param aStoreEvent The event that has occurred. // --------------------------------------------------------------------------- // -void CEasyDialingContactDataManager::HandleStoreEventL( MVPbkContactStore& /*aContactStore*/, - TVPbkContactStoreEvent /*aStoreEvent*/ ) +void CEasyDialingContactDataManager::HandleStoreEventL(MVPbkContactStore& /*aContactStore*/, + TVPbkContactStoreEvent /*aStoreEvent*/) { } -// ----------------------------------------------------------------------------- -// CEasyDialingPlugin::OpenComplete -// From MVPbkContactStoreListObserver. -// Called when all contact stores are ready to be used, signals -// the next engine state. -// -// ----------------------------------------------------------------------------- -// -void CEasyDialingContactDataManager::OpenComplete() - { - // next open the favourites view - TRAPD( err, iVPbkTopContactManager->GetTopContactsViewL( *this, *this ) ); - if ( err ) - { - HandleError( err ); - } - } - // --------------------------------------------------------------------------- // CEasyDialingContactDataManager::VPbkOperationFailed // --------------------------------------------------------------------------- @@ -859,7 +711,7 @@ // Loading list of favourite contacts failed. // Continue as if none of the contacts are favourited. delete iFavsOperation; - iFavsOperation = NULL; + iFavsOperation = NULL; delete iFavsView; iFavsView = NULL; iFavsViewReady = EFalse; @@ -991,9 +843,10 @@ // Find out the available communication methods for the contact. GetAvailableServicesL( aContact, aIndex ); + // Next initiate async thumbnail get operation. - if (GetContactThumbnailSetting()) // reads the iContactThumbnailSetting value if it is false we dont fetch images + if(GetContactThumbnailSetting()) // reads the iContactThumbnailSetting value if it is false we dont fetch images { if (iImageManager->HasImage(*iStoreContact, *iThumbnailFieldType)) { @@ -1008,7 +861,7 @@ { CEasyDialingContactData *tn = iContactDataArray[aIndex]; tn->LoadingComplete(); - LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]); + LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]); iWaitingContacts.Remove(0); delete iStoreContact; iStoreContact = NULL; @@ -1019,9 +872,9 @@ else { // Opening contact failed. Mark contact data loaded, so it's not opened again. - CEasyDialingContactData* data = iContactDataArray[aIndex]; - data->LoadingComplete(); - LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]); + CEasyDialingContactData *tn = iContactDataArray[aIndex]; + tn->LoadingComplete(); + LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]); iWaitingContacts.Remove(0); LoadNextContactDataL(); InformObserver(); @@ -1071,17 +924,13 @@ LOGSTRING("CEasyDialingContactDataManager: VPbkSingleContactOperationComplete"); delete &aOperation; iContactOperation = NULL; - if ( iWaitingContacts.Count() > 0 ) + TInt index = iWaitingContacts[0]; + LOGSTRING1("VPbkSingleContactOperationComplete, Index=%d", index); + TRAPD(err, DoHandleContactOperationCompleteL(aContact, index)); + if (err) { - TInt index = iWaitingContacts[0]; - LOGSTRING1("VPbkSingleContactOperationComplete, Index=%d", index); - TRAPD(err, DoHandleContactOperationCompleteL(aContact, index)); - if ( err ) - { - HandleError(err); - } + HandleError(err); } - LOGSTRING("CEasyDialingContactDataManager: VPbkSingleContactOperationComplete Exit"); } @@ -1150,38 +999,6 @@ } } -// --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::SetupFavStoreSearchedL -// --------------------------------------------------------------------------- -// -void CEasyDialingContactDataManager::SetupFavStoreSearchedL() - { - // Check if favourite contact store (i.e. the default contact store) is one - // of the stores configured to be searched. - CVPbkContactStoreUriArray* storeUris = - iPbkStoreConfiguration->CurrentConfigurationL(); - iFavStoreSearched = - storeUris->IsIncluded( VPbkContactStoreUris::DefaultCntDbUri() ); - delete storeUris; - } - -// --------------------------------------------------------------------------- -// CEasyDialingContactDataManager::SetStoreFlagsForContact -// --------------------------------------------------------------------------- -// -void CEasyDialingContactDataManager::SetStoreFlagsForContact( - CEasyDialingContactData* aContactData ) const - { - MVPbkContactLink* link = aContactData->ContactLink(); - const TDesC& uri = link->ContactStore().StoreProperties().Uri().UriDes(); - - TBool isSim = ( uri.Compare( VPbkContactStoreUris::SimGlobalAdnUri() ) == 0 ); - aContactData->SetSimContact( isSim ); - - TBool isSdn = ( uri.Compare( VPbkContactStoreUris::SimGlobalSdnUri() ) == 0 ); - aContactData->SetSdnContact( isSdn ); - } - // End of File diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/src/easydialinglistbox.cpp --- a/phoneuis/easydialing/src/easydialinglistbox.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/src/easydialinglistbox.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -56,6 +56,8 @@ // CONSTANTS static const TInt KListBoxMarginWidth = 2; +static const TInt KMaxVisibleItemsPortrait = 3; +static const TInt KMaxVisibleItemsLandscape = 2; // MACROS @@ -382,19 +384,8 @@ maxViewLayout.LayoutRect( aMaxRect, AknLayoutScalable_Apps::dia3_list_pane( variety ) ); TRect maxViewRect( maxViewLayout.Rect() ); maxViewRect.Shrink( KListBoxMarginWidth, KListBoxMarginWidth ); // layout data doens't include any margins but we have added some - - // Read list item size aid from layout data. Use it to determine how many - // items to show in listbox. - TAknLayoutRect listSizeAid; - listSizeAid.LayoutRect( aMaxRect, AknLayoutScalable_Apps::aid_size_list_single_double() ); - TInt itemHeightAid = listSizeAid.Rect().Height(); - TInt maxItemsShown = maxViewRect.Height() / itemHeightAid; - if ( maxViewRect.Height() % itemHeightAid > itemHeightAid / 2 ) - { - maxItemsShown++; - } - + TInt maxItemsShown = ( variety ? KMaxVisibleItemsLandscape : KMaxVisibleItemsPortrait ); TInt itemHeight = maxViewRect.Height() / maxItemsShown; TRAP_IGNORE( SetItemHeightL( itemHeight ) ); diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/src/easydialinglistboxdata.cpp --- a/phoneuis/easydialing/src/easydialinglistboxdata.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/src/easydialinglistboxdata.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -131,7 +131,7 @@ const TRect& aItemRect, const CFont* aContactNameFont, TBool aArrowIconShown, - TBool aFavOrSimIconShown, + TBool aIsFavourite, TBool aThumbnailsShown ); static TRect CompanyNameBoundingBox( const TRect& aItemRect, @@ -139,7 +139,6 @@ TBool aIsCurrentItem, TBool aThumbnailsShown ); static TRect FavouriteIconBoundingBox( const TRect& aContactNameBoundingBox ); -static TRect SimIconBoundingBox( const TRect& aContactNameBoundingBox ); static TRect MirrorLayoutBoundingBox(const TRect& aSourceRect, TRect& aBoundingBoxRect); static TInt BaseLineOffset( const TRect& aTextBoundingBox, const CFont* aFont ); static TBool ContainsRightToLeftText( const TDesC& aDesc ); @@ -252,8 +251,6 @@ delete iColorBitmap; delete iDummyThumbnail; delete iFavouriteIcon; - delete iSimContactIcon; - delete iSdnContactIcon; iContactDataManager = NULL; } @@ -310,8 +307,6 @@ { CFormattedCellListBoxData::ConstructLD(); - MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - // EasyDialing bitmap file is attempted to be read from the same directory where the // executed binary is located TFileName dllFileName; @@ -340,14 +335,6 @@ // Create the favourite icon bitmap and mask iFavouriteIcon = CreateIconL( KFavouriteIconBitmapFile, EMbmPhonebook2Qgn_prop_pb_topc, EMbmPhonebook2Qgn_prop_pb_topc_mask ); - - // Create SIM contact icon from the skin - iSimContactIcon = AknsUtils::CreateGulIconL( skin, KAknsIIDQgnPropNrtypSimContact, bitmapFileName, - EMbmEasydialingQgn_prop_nrtyp_sim_contact, EMbmEasydialingQgn_prop_nrtyp_sim_contact_mask ); - - // Create Service Dialing Number contact icon from the skin - iSdnContactIcon = AknsUtils::CreateGulIconL( skin, KAknsIIDQgnPropNrtypSdn, bitmapFileName, - EMbmEasydialingQgn_prop_nrtyp_sdn, EMbmEasydialingQgn_prop_nrtyp_sdn_mask ); } @@ -420,13 +407,11 @@ { TPtrC cellText; - TInt error = TextUtils::ColumnText( cellText, 0, aText ); + TInt error = TextUtils::ColumnText( cellText , 0, aText ); __ASSERT_DEBUG( error == KErrNone, EasyDialingPanic( EEasyDialingPanicInvalidListBoxModelString ) ); __ASSERT_DEBUG( iContactNameFont, EasyDialingPanic( EEasyDialingNoFontFound ) ); __ASSERT_DEBUG( iCompanyNameFont, EasyDialingPanic( EEasyDialingNoFontFound ) ); - TInt contactDataIndex = iContactDataManager->IndexForId( cellText ); - MAknListBoxTfxInternal* transApi = CAknListLoader::TfxApiInternal( &aGc ); if ( transApi ) { @@ -443,9 +428,6 @@ boundingBox = MirrorLayoutBoundingBox( aItemRect, boundingBox ); } - //Draws the Contact Thumbnail Icon if exists, else draws the dummy contact thumbnail - DrawContactThumbnail( aGc, boundingBox, contactDataIndex ); - // Arrow icon is drawn if the item is in focus and listbox has focus // (and not only the temporary visual focus caused by touching a list item). TBool showArrowIcon = aHighlight && iControl->IsFocused(); @@ -459,46 +441,31 @@ DrawArrowIcon( aGc, arrowRect ); } - TBool favOrSimContact = - iContactDataManager->IsFav( contactDataIndex ) || - iContactDataManager->IsSimContact( contactDataIndex ) || - iContactDataManager->IsSdnContact( contactDataIndex ); + //Draws the Contact Thumbnail Icon if exists, else draws the dummy contact thumbnail + TBool fav = DrawContactThumbnail( aGc, boundingBox, cellText ); + + error = TextUtils::ColumnText( cellText , 1, aText ); + __ASSERT_DEBUG( error == KErrNone, EasyDialingPanic( EEasyDialingPanicInvalidListBoxModelString ) ); + boundingBox = ContactNameBoundingBox( aItemRect, iContactNameFont, showArrowIcon, - favOrSimContact, + fav, iContactDataManager->GetContactThumbnailSetting() ); - - // Draw favorite or sim icon if necessary. Only one of these can be drawn. - TRect nameRectUnMirrored = boundingBox; - if ( iContactDataManager->IsFav( contactDataIndex ) ) - { - DrawFavouriteIcon( aGc, nameRectUnMirrored, aItemRect ); - } - else if ( iContactDataManager->IsSimContact( contactDataIndex ) ) - { - DrawSimIcon( *iSimContactIcon, aGc, nameRectUnMirrored, aItemRect ); - } - else if ( iContactDataManager->IsSdnContact( contactDataIndex ) ) - { - DrawSimIcon( *iSdnContactIcon, aGc, nameRectUnMirrored, aItemRect ); - } - - // Mirror the bounding box for text drawing if necessary. + TRect nameRectUnMirrored = boundingBox; // used for favourite star drawing + if ( AknLayoutUtils::LayoutMirrored() ) { boundingBox = MirrorLayoutBoundingBox( aItemRect, boundingBox ); } - // Draw 1st row text - error = TextUtils::ColumnText( cellText , 1, aText ); - __ASSERT_DEBUG( error == KErrNone, EasyDialingPanic( EEasyDialingPanicInvalidListBoxModelString ) ); - + // favourite icon size is set the same as contact name bounding box height. + TInt favouriteIconSize = boundingBox.Height(); + TInt err( KErrNone ); TRAP( err, DrawTextWithMatchHighlightL( boundingBox, aGc, cellText, iContactNameFont, aColors, aHighlight ) ); - // Draw 2nd row text if ( !err && TextUtils::ColumnText( cellText , 2, aText ) == KErrNone ) { TRect companyNameBoundingBox = CompanyNameBoundingBox( @@ -511,6 +478,12 @@ companyNameBoundingBox, aGc, cellText, iCompanyNameFont, aColors, aHighlight ) ); } + if ( !err && fav ) + { + // Draws the Favourite Icon + DrawFavouriteIcon( aGc, nameRectUnMirrored, aItemRect ); + } + if ( transApi ) { aGc.CancelClippingRect(); @@ -522,13 +495,14 @@ // DrawContactThumbnail // // Draws the Contact Thumbnail Icon if any, else draws the dummy contact thumbnail +// Also check if this is a favorite contact and return true if this is. // ----------------------------------------------------------------------------- // -void CEasyDialingListBoxData::DrawContactThumbnail( - CWindowGc& aGc, TRect aBoundingBox, TInt aContactIndex ) const +TBool CEasyDialingListBoxData::DrawContactThumbnail(CWindowGc& aGc, TRect aBoundingBox, TPtrC aCellText) const { + TBool fav(EFalse); CFbsBitmap* thumbnail(NULL); - TBool isLoaded = iContactDataManager->GetThumbnail(aContactIndex, thumbnail); + TBool isLoaded = iContactDataManager->GetThumbnailAndFav(aCellText, thumbnail, fav); if ( isLoaded && thumbnail ) { // center the thumbnail in its rect @@ -543,12 +517,13 @@ { // draw dummy thumnbnail, but only if we know that the contact doesn't // have a thumbnail, and thumbnail drawing is enabled. - AknIconUtils::SetSize( iDummyThumbnail->Bitmap(), aBoundingBox.Size() ); - AknIconUtils::SetSize( iDummyThumbnail->Mask(), aBoundingBox.Size() ); + AknIconUtils::SetSize(iDummyThumbnail->Bitmap(), aBoundingBox.Size()); + AknIconUtils::SetSize(iDummyThumbnail->Mask(), aBoundingBox.Size()); aGc.BitBltMasked( aBoundingBox.iTl, iDummyThumbnail->Bitmap(), TRect( TPoint(0,0), aBoundingBox.Size() ), iDummyThumbnail->Mask(), ETrue ); } + return fav; } @@ -616,38 +591,6 @@ sourceRect, iFavouriteIcon->Mask(), ETrue ); } } - -// ----------------------------------------------------------------------------- -// DrawSimIcon -// -// Draws the SIM or SDN contact icon -// ----------------------------------------------------------------------------- -// -void CEasyDialingListBoxData::DrawSimIcon( - CGulIcon& aIcon, - CWindowGc& aGc, - TRect aNameRectUnMirrored, - TRect aEffectiveRect ) const - { - TRect simIconBoundingBox; - - simIconBoundingBox = SimIconBoundingBox( aNameRectUnMirrored ); - - if ( AknLayoutUtils::LayoutMirrored() ) - { - simIconBoundingBox = MirrorLayoutBoundingBox(aEffectiveRect, simIconBoundingBox); - } - - aGc.SetBrushStyle( CGraphicsContext::ENullBrush ); - TRect sourceRect( TPoint(0,0), simIconBoundingBox.Size() ); - - // Set size for the bitmap and mask - AknIconUtils::SetSize( aIcon.Bitmap(), simIconBoundingBox.Size() ); - AknIconUtils::SetSize( aIcon.Mask(), simIconBoundingBox.Size() ); - aGc.BitBltMasked( simIconBoundingBox.iTl, aIcon.Bitmap(), - sourceRect, aIcon.Mask(), ETrue ); - } - // ----------------------------------------------------------------------------- // SetContactDataManager // @@ -808,7 +751,7 @@ const TRect& aItemRect, const CFont* aContactNameFont, TBool aArrowIconShown, - TBool aFavOrSimIconShown, + TBool aIsFavourite, TBool aThumbnailsShown ) { // Position X will contain the starting position of text from left side of item rect. @@ -832,9 +775,8 @@ rightMargin += KArrowIconSizePercent * aItemRect.Height() / KCent; } - // If item is favourite or a SIM contact, reserve space for the icon. - // Icon dimensions are the same as bounding box height. - if ( aFavOrSimIconShown ) + // If item is favourite, reserve space for favourite icon. Icon dimensions are the same as bounding box height. + if ( aIsFavourite ) { rightMargin += height; } @@ -930,17 +872,6 @@ } -// ----------------------------------------------------------------------------- -// SimIconBoundingBox -// Calculates the area to which the sim/sdn icon is drawn. -// ----------------------------------------------------------------------------- -// -static TRect SimIconBoundingBox( const TRect& aContactNameBoundingBox ) - { - // use the same bounding box as is used for the favourite icon - return FavouriteIconBoundingBox( aContactNameBoundingBox ); - } - // ----------------------------------------------------------------------------- // BaseLineOffset diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/src/easydialingplugin.cpp --- a/phoneuis/easydialing/src/easydialingplugin.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/src/easydialingplugin.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -46,6 +46,9 @@ // Virtual phonebook header files #include +#include +#include +#include #include // contains virtual phonebook data fields #include @@ -179,9 +182,20 @@ void CEasyDialingPlugin::ConstructL() { iLongTapped = EFalse; - // Create contact data manager. - iContactDataManager = CEasyDialingContactDataManager::NewL(); - iContactDataManager->SetObserver( this ); + + // Create a contact store array. + HBufC* defaultCdb = VPbkContactStoreUris::DefaultCntDbUri().AllocLC(); + iContactDataStores.AppendL( defaultCdb ); + CleanupStack::Pop( defaultCdb ); + + // Create a contact manager instance. + iContactStoreUriArray = CVPbkContactStoreUriArray::NewL(); + iContactStoreUriArray->AppendL( TVPbkContactStoreUriPtr( VPbkContactStoreUris::DefaultCntDbUri() ) ); + iContactManager = CVPbkContactManager::NewL( *iContactStoreUriArray ); + + iContactDataManager = new (ELeave) CEasyDialingContactDataManager(iContactManager); + iContactDataManager->ConstructL(); + iContactDataManager->SetObserver(this); // Find a handle to ca launcher extension MCCAConnectionExt. // Easydialing has to use the extension API, because it needs function CloseAppL @@ -199,7 +213,7 @@ User::LeaveIfNull( any ); iContactLauncher = static_cast( any ); - iCenrepListener = CEasyDialingCenrepListener::NewL( this ); + iCenrepListener = CEasyDialingCenrepListener::NewL(this); iContactorService = CEDContactorService::NewL( this ); @@ -230,6 +244,8 @@ delete iCenrepListener; delete iContactDataManager; delete iPredictiveSearchQuery; + delete iContactManager; + delete iContactStoreUriArray; iContactDataStores.ResetAndDestroy(); if ( iPredictiveContactSearchHandler ) @@ -392,6 +408,10 @@ iPredictiveContactSearchHandler = CPSRequestHandler::NewL(); iPredictiveContactSearchHandler->AddObserverL(this); + // Put the searched contact fields into array. + RArray contact_fields; + CleanupClosePushL(contact_fields); + // Check which relevant contact fields are indexed in PCS search. iFirstNamePCSIndex = FindContactFieldPCSIndexL( R_VPBK_FIELD_TYPE_FIRSTNAME ); iLastNamePCSIndex = FindContactFieldPCSIndexL( R_VPBK_FIELD_TYPE_LASTNAME ); @@ -415,51 +435,35 @@ User::Leave( KErrEasyDialingNoLastNamePCSIndexing ); } - SetupPcsSettingsL(); + // First name, last name and company name (if supported) are used in PCS search. + contact_fields.Append(R_VPBK_FIELD_TYPE_FIRSTNAME); + contact_fields.Append(R_VPBK_FIELD_TYPE_LASTNAME); + if ( iCompanyNamePCSIndex != KErrNotFound ) + { + contact_fields.Append(R_VPBK_FIELD_TYPE_COMPANYNAME); + } + + SetSortOrderL( iContactDataManager->NameOrder() ); + + // Create and fill ps settings object. + CPsSettings* ps_settings = CPsSettings::NewL(); + CleanupStack::PushL(ps_settings); + + ps_settings->SetSearchUrisL(iContactDataStores); + ps_settings->SetMaxResults(KEDMaximumMatchingContactsCount); + ps_settings->SetSortType(EAlphabetical); + ps_settings->SetDisplayFieldsL(contact_fields); + + // Set the PCS settings. + iPredictiveContactSearchHandler->SetSearchSettingsL(*ps_settings); + + CleanupStack::PopAndDestroy(ps_settings); + CleanupStack::PopAndDestroy(&contact_fields); iPredictiveSearchQuery = CPsQuery::NewL(); } // ----------------------------------------------------------------------------- -// SetupPcsSettingsL -// ----------------------------------------------------------------------------- -// -void CEasyDialingPlugin::SetupPcsSettingsL() - { - // Get current store configuration from Phonebook settings - iContactDataStores.ResetAndDestroy(); - iContactDataManager->GetCurrentStoreUrisL( iContactDataStores ); - - // Put the searched contact fields into array. - RArray contact_fields; - CleanupClosePushL(contact_fields); - - // First name, last name and company name (if supported) are used in PCS search. - contact_fields.Append( R_VPBK_FIELD_TYPE_FIRSTNAME ); - contact_fields.Append( R_VPBK_FIELD_TYPE_LASTNAME ); - contact_fields.Append( R_VPBK_FIELD_TYPE_COMPANYNAME ); - - // Create and fill PS settings object. - CPsSettings* ps_settings = CPsSettings::NewL(); - CleanupStack::PushL( ps_settings ); - - ps_settings->SetSearchUrisL( iContactDataStores ); - ps_settings->SetMaxResults( KEDMaximumMatchingContactsCount ); - ps_settings->SetSortType( EAlphabetical ); - ps_settings->SetDisplayFieldsL( contact_fields ); - - // Set the PCS settings. - iPredictiveContactSearchHandler->SetSearchSettingsL( *ps_settings ); - - CleanupStack::PopAndDestroy( ps_settings ); - CleanupStack::PopAndDestroy( &contact_fields ); - - // Set the sort order. This must happen after the contact store settings - // are up-to-date. - SetSortOrderL( iContactDataManager->NameOrder() ); - } - -// ----------------------------------------------------------------------------- // SetSortOrderL // ----------------------------------------------------------------------------- // @@ -469,22 +473,19 @@ CleanupClosePushL( fields ); if ( aNameOrder == CEasyDialingContactDataManager::EFirstnameLastname ) { - fields.AppendL( R_VPBK_FIELD_TYPE_FIRSTNAME ); - fields.AppendL( R_VPBK_FIELD_TYPE_LASTNAME ); + fields.Append(R_VPBK_FIELD_TYPE_FIRSTNAME); + fields.Append(R_VPBK_FIELD_TYPE_LASTNAME); } else { - fields.AppendL( R_VPBK_FIELD_TYPE_LASTNAME ); - fields.AppendL( R_VPBK_FIELD_TYPE_FIRSTNAME ); + fields.Append(R_VPBK_FIELD_TYPE_LASTNAME); + fields.Append(R_VPBK_FIELD_TYPE_FIRSTNAME); } - fields.AppendL( R_VPBK_FIELD_TYPE_COMPANYNAME ); - - // Set the same order for each contact store. PCS automatically ignores - // fields not supported by the given store. - for ( TInt i = 0 ; i < iContactDataStores.Count() ; ++i ) + if ( iCompanyNamePCSIndex != KErrNotFound ) { - iPredictiveContactSearchHandler->ChangeSortOrderL( *iContactDataStores[i], fields ); + fields.Append(R_VPBK_FIELD_TYPE_COMPANYNAME); } + iPredictiveContactSearchHandler->ChangeSortOrderL( *iContactDataStores[0], fields ); CleanupStack::PopAndDestroy( &fields ); } @@ -847,22 +848,6 @@ } // ----------------------------------------------------------------------------- -// StoreConfigurationChanged -// From MContactDataManagerObserver -// ----------------------------------------------------------------------------- -// -void CEasyDialingPlugin::StoreConfigurationChanged() - { - TRAP_IGNORE( - // Reconfigure PCS to update its store settings - SetupPcsSettingsL(); - // Contacts available have changed and a new search is needed if we have - // previous results shown. - DoHandleContactsChangedL() - ); - } - -// ----------------------------------------------------------------------------- // InformContactorEvent // From MEDContactorObserver // ----------------------------------------------------------------------------- @@ -932,10 +917,7 @@ // not to the keyboard it is made with. While this is not strictly // identical to checking the used keyboard, this behaves identically // in most of the normal cases, and makes the logic simpler. - // In case of hybrid mode keyboard, use always predictive default - // keyboard. - if ( iKeyboardMode == EDefaultKeyboard && - IsItuTCharacter( iSearchString[i] ) ) + if ( IsItuTCharacter( iSearchString[i] ) ) { item->SetMode( EPredictiveItuT ); } @@ -1025,10 +1007,8 @@ RArray fieldOrder; CleanupClosePushL( fieldOrder ); - // PCS uses the same data plugin for all the Phonebook databases - // (i.e. phone contacts, SIM contacts, SDN contacts), and there can be only - // one data order per plugin. Thus, data order for all databases supported - // by us is the same, and it's enough to ask data order just for the default CDB. + // Current implementation searches only from default database. + // Later this may be expanded to search SIM contacts as well. const TDesC& defaultCdb = VPbkContactStoreUris::DefaultCntDbUri(); iPredictiveContactSearchHandler->GetDataOrderL( defaultCdb, fieldOrder ); @@ -1094,7 +1074,7 @@ TInt indexFromEnd = numberOfPCSMatches - i - 1; MVPbkContactLink* link = iPredictiveContactSearchHandler->ConvertToVpbkLinkLC( - *(aResults[indexFromEnd]), iContactDataManager->ContactManager() ); + *(aResults[indexFromEnd]), *iContactManager ); if ( !iContactDataManager->IsFavL( link ) ) { // handle favourites separately, in another loop @@ -1461,9 +1441,8 @@ message = iContactDataManager->UniEditorAvailable( index ); } - - aMenuPane.SetItemDimmed( EEasyDialingVoiceCall, !voiceCall ); - aMenuPane.SetItemDimmed( EEasyDialingVideoCall, !videoCall ); + // Call menu item is not show if neither voice call nor video call are possible. + aMenuPane.SetItemDimmed( EEasyDialingVoiceCall, !voiceCall && !videoCall ); aMenuPane.SetItemDimmed( EEasyDialingSendMessage, !message ); LOGSTRING("EasyDialingPlugin::InitializeMenuPaneL: InitializeMenuPaneL done" ); @@ -1471,6 +1450,27 @@ return ETrue; } + else if ( aMenuResourceId == R_EASYDIALING_OPTIONS_CALL_MENU ) + { + TBool voiceCall = EFalse; + TBool videoCall = EFalse; + + if ( iContactListBox->CurrentItemIndex() >= 0 ) + { + TInt index = iContactListBox->CurrentContactDataIndex(); + + voiceCall = iContactDataManager->VoiceCallAvailable( index ); + videoCall = iContactDataManager->VideoCallAvailable( index ); + } + + aMenuPane.SetItemDimmed( EEasyDialingVoiceCall, !voiceCall ); + aMenuPane.SetItemDimmed( EEasyDialingVideoCall, !videoCall ); + + LOGSTRING("EasyDialingPlugin::InitializeMenuPaneL: InitializeMenuPaneL for call submenu done" ); + + return ETrue; + } + else if ( aMenuResourceId == R_EASYDIALING_OPTIONS_ON_OFF_CASCADE_MENU ) { if ( IsEnabled() ) @@ -1514,7 +1514,7 @@ } - TBool ret(ETrue); + TBool ret(EFalse); switch ( aCommand ) { @@ -1522,6 +1522,7 @@ iRememberFocus = ETrue; AsyncActionLaunchL( ELaunchCurrentContact ); + ret = ETrue; break; // EEasyDialingEnterKeyAction is sent when Enter key is pressed. @@ -1531,6 +1532,7 @@ // Make a call. iRememberFocus = ETrue; AsyncActionLaunchL( ECallCurrentContact ); + ret = ETrue; break; // Video call is selectable only through menu. @@ -1538,6 +1540,7 @@ // Make a video call. iRememberFocus = ETrue; AsyncActionLaunchL( EVideoCallCurrentContact ); + ret = ETrue; break; // Uni-editor message is selectable only through menu. @@ -1545,6 +1548,7 @@ // Create a message. iRememberFocus = ETrue; AsyncActionLaunchL( ESendMessageCurrentContact ); + ret = ETrue; break; // EEasyDialingCallHandlingActivated is sent when the in-call-ui of telephony gets activated @@ -1561,37 +1565,41 @@ iNewSearchNeeded = EFalse; iContactLauncher->CloseAppL(); } + ret = ETrue; break; case EEasyDialingOn: iCenrepListener->SetEasyDialingSettingsValue( 1 ); + ret = ETrue; break; case EEasyDialingOff: iCenrepListener->SetEasyDialingSettingsValue( 0 ); + ret = ETrue; break; case EEasyDialingClosePopup: // Not only Number Entry is removed but also closes down number selection popup in case it happens to be open. iContactorService->CancelService(); + ret = ETrue; break; case EEasyDialingVkbOpened: iVirtualKeyboardOpen = ETrue; + ret = ETrue; break; case EEasyDialingVkbClosed: iVirtualKeyboardOpen = EFalse; - HandleGainingForeground(); + ret = ETrue; break; default: - ret = EFalse; break; } return ret; @@ -1608,16 +1616,6 @@ } // ----------------------------------------------------------------------------- -// SetKeyboardMode -// Sets keyboard mode -// ----------------------------------------------------------------------------- -// -void CEasyDialingPlugin::SetKeyboardMode( TKeyboardMode aMode ) - { - iKeyboardMode = aMode; - } - -// ----------------------------------------------------------------------------- // AsyncSimulateKeyEvent // // ----------------------------------------------------------------------------- @@ -1677,7 +1675,7 @@ iContactToBeLaunchedName = AllocWithoutHighlightSeparatorsLC( fullNameSeparators ); CleanupStack::Pop( iContactToBeLaunchedName ); } - + CancelActionLaunchAndInputBlock(); if ( aAction == ELaunchSearch ) @@ -1729,7 +1727,7 @@ // // ----------------------------------------------------------------------------- // -void CEasyDialingPlugin::DoLaunchActionL() +void CEasyDialingPlugin::DoLaunchActionL( ) { if ( iActionToBeLaunched == EInitializePcs ) { @@ -1929,7 +1927,7 @@ // search is made, all data is loaded again. iContactDataManager->Reload(); - TRAP_IGNORE( LaunchSearchL() ); + LaunchSearchL(); } } @@ -1971,7 +1969,7 @@ if ( iSearchString.Length() > 0 && IsEnabled() ) { CAknAppUi* appUi = static_cast( iCoeEnv->AppUi() ); - if ( appUi->IsForeground() && !iVirtualKeyboardOpen ) + if ( appUi->IsForeground() ) { // Do new search immediately, if contacts change while we are on the // foreground. This can happen for example if view is switched to diff -r e30d4a1b8bad -r c26cc2a7c548 phoneuis/easydialing/src/easydialingutils.cpp --- a/phoneuis/easydialing/src/easydialingutils.cpp Wed Sep 15 12:12:21 2010 +0300 +++ b/phoneuis/easydialing/src/easydialingutils.cpp Wed Oct 13 14:31:22 2010 +0300 @@ -23,17 +23,6 @@ const TText KNameSeparatorChar = ' '; const TText KListFieldSeparatorChar = '\t'; -const TText KGraphicReplaceCharacter = ' '; - -// Zero Widthcharacters -const TUint KZWSCharacter = 0x200B; -const TUint KZWNJCharacter = 0x200C; -const TUint KZWJCharacter = 0x200D; - -inline TBool ZWSCharacter( const TChar aChar ); - -void ReplaceNonGraphicCharacters( TDes& aText, TText aChar ); - // ----------------------------------------------------------------------------- // CreateContactStringLC // @@ -48,17 +37,14 @@ // first strip control chars from the names HBufC* firstName = aFirstName.AllocLC(); TPtr fPtr = firstName->Des(); - ReplaceNonGraphicCharacters( fPtr, KGraphicReplaceCharacter ); AknTextUtils::StripCharacters( fPtr, KAknStripListControlChars ); HBufC* lastName = aLastName.AllocLC(); TPtr lPtr = lastName->Des(); - ReplaceNonGraphicCharacters( lPtr, KGraphicReplaceCharacter ); AknTextUtils::StripCharacters( lPtr, KAknStripListControlChars ); HBufC* companyName = aCompanyName.AllocLC(); TPtr cPtr = companyName->Des(); - ReplaceNonGraphicCharacters( cPtr, KGraphicReplaceCharacter ); AknTextUtils::StripCharacters( cPtr, KAknStripListControlChars ); // Calculate string lenght. If first name and last name are missing, company name is duplicated. @@ -113,49 +99,3 @@ CleanupStack::PushL( string ); return string; } - -/* - * ============================================================================== - * - * Local functions - * - * ============================================================================== - */ - -/** - * Checkif the given char is a zero width character: - * ZeroWidth Space, Zero Width Non-Joiner - * orZero Width Joiner character - * @paramaChar Given character - *@return ETrue if aChar is zero width character. - * EFalse if aChar is not specified zero width character. - */ - -inline TBool ZWSCharacter( const TChar aChar ) - { - const TChar zwsChar( KZWSCharacter ); - const TChar zwnjChar( KZWNJCharacter ); - const TChar zwjChar( KZWJCharacter ); - return ( aChar == zwsChar ) || ( aChar == zwnjChar ) || - ( aChar == zwjChar ); -} - -/** - * Replaces all non-graphic characters (!TChar::IsGraph()) in - * a string with the specified character. - **/ - -void ReplaceNonGraphicCharacters( TDes& aText, TText aChar ) - { - const TInt len = aText.Length(); - for ( TInt i = 0; i