--- a/.hgignore Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-syntax: glob
-.make.cache
-Makefile
-Makefile*.mk
-.cproject
-.project
-moc_*.cpp
-qrc_*.cpp
-*.moc
-*.bak
-*.orig
-*_0*.mmp
-*template.pkg
-*.qtplugin
-plugin_commonU.def
-
-phoneapp/phoneui2/*.loc
-phoneapp/phoneui2/*.rss
-phoneapp/phoneui2/*.pkg
-phoneuis/bubblemanager2/*.pkg
-
-syntax: regexp
-^inc/.*
--- a/phone.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phone.pro Fri Jul 09 15:40:55 2010 +0300
@@ -11,7 +11,7 @@
#
# Contributors:
#
-# Description: Project file for building Phone components
+# Description: Project file for building Phone components
#
#
@@ -25,6 +25,7 @@
SUBDIRS += phoneengine/phonemodel
SUBDIRS += phoneengine/networkhandlingstarter
SUBDIRS += phoneuis/bubblemanager2
+SUBDIRS += phoneuis/ussdeditor
SUBDIRS += phoneplugins/phoneindicatorplugin
SUBDIRS += phoneapp/phoneuiview2
SUBDIRS += phoneapp/phoneuiqtviewadapter
--- a/phoneapp/Blacklist/group/bld.inf Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Blacklist build definition.
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/phoneanimdllstd.h |../../../inc/phoneanimdllstd.h
-../group/phoneanimdll_stub.sis /epoc32/data/z/system/install/phoneanimdll_stub.sis
-
-// IBY files
-../rom/phoneanimdll.iby CORE_APP_LAYER_IBY_EXPORT_PATH(phoneanimdll.iby)
-
-PRJ_MMPFILES
-../group/phoneanimdll.mmp
-
-// End of File
--- a/phoneapp/Blacklist/group/phoneanimdll.mmp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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 project specification for blacklist window server plug-
-* in. The plug-in provides service for phone application to clear
-* blacklist upon next keypress.
-*
-*/
-
-#include <platform_paths.hrh>
-
-// Capability assignment.
-CAPABILITY CAP_GENERAL_DLL
-
-TARGET phoneanimdll.dll
-TARGETTYPE ANI
-UID 0x10003B22 0x100059FE
-
-SOURCEPATH ../src
-
-USERINCLUDE ../inc
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCE cphoneanimdll.cpp
-SOURCE cphoneblacklistanim.cpp
-
-LIBRARY euser.lib
-LIBRARY etel.lib
-LIBRARY etelmm.lib
-LIBRARY customapi.lib
-
-
-// End of File
Binary file phoneapp/Blacklist/group/phoneanimdll_stub.SIS has changed
--- a/phoneapp/Blacklist/group/phoneanimdll_stub.pkg Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2009 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: For packing phoneanimdll stub.
-;
-; phoneanimdll_stub.pkg
-
-; Languages
-&EN
-
-; Header
-#{"phoneanimdll"},(0x100059FE),1,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Target
-
-""-"z:\sys\bin\phoneanimdll.dll"
--- a/phoneapp/Blacklist/inc/CPhoneAnimDll.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2002-2003 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: It defines factory class for blacklist clearing plug-in.
-*
-*/
-
-
-
-#ifndef CPHONEANIMDLL_H
-#define CPHONEANIMDLL_H
-
-// INCLUDES
-#include <e32std.h>
-#include <w32adll.h>
-
-// CLASS DECLARATION
-
-/**
-* Animation plug-in.
-*
-* @since 2.0
-*/
-class CPhoneAnimDll
- : public CAnimDll
- {
- public: // From base classes
-
- /**
- * From CAnimDll, creates an instance of requested plugin.
- *
- * @return instance of animation service.
- */
- virtual CAnim* CreateInstanceL( TInt aType );
-
- };
-
-/**
-* Creates an instance of CPhoneAnimDll.
-* Factory function.
-*
-* @since 1.0
-* @return instance of anim dll.
-*/
-IMPORT_C CAnimDll* CreateCAnimDllL();
-
-#endif // CPHONEANIMDLL_H
-
-// End of File
--- a/phoneapp/Blacklist/inc/CPhoneBlacklistAnim.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2002-2003 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: It defines window animation service, which provides service
-* to clear blacklist upon next key event.
-*
-*/
-
-
-
-#ifndef CPHONEBLACKLISTANIM_H
-#define CPHONEBLACKLISTANIM_H
-
-// INCLUDES
-#include <w32adll.h>
-#include <etel.h>
-#include <etelmm.h>
-#include <rmmcustomapi.h>
-
-// CLASS DECLARATION
-
-/**
-* It is blacklist window animation class.
-*
-* @since 2.0
-*/
-class CPhoneBlacklistAnim
- : public CWindowAnim
- {
- public: // Constructors and destructors
-
- /**
- * Constructor.
- */
- CPhoneBlacklistAnim();
-
- /**
- * Destructor.
- */
- ~CPhoneBlacklistAnim();
-
- public: // From base classes
-
- /**
- * From CWindowAnim, handles commands.
- * @param aOpcode command.
- * @param aArgs parameters.
- * @return error code.
- */
- virtual TInt CommandReplyL(
- TInt aOpcode,
- TAny* aArgs );
-
- /**
- * From CWindowAnim, handles commands.
- * @param aOpcode command.
- * @param aArgs parameters.
- */
- virtual void Command(
- TInt aOpcode,
- TAny* aArgs );
-
- /**
- * From CWindowAnim, animate.
- * @param aDateTime NULL or current time.
- */
- virtual void Animate(
- TDateTime* aDateTime );
-
- /**
- * From CWindowAnim, second phase constructor.
- * @param aArgs parameters.
- * @param aHasFocus focus information.
- */
- virtual void ConstructL(
- TAny* aArgs,
- TBool aHasFocus );
-
- /**
- * From CWindowAnim, handles redraw request.
- */
- virtual void Redraw();
-
- /**
- * From CWindowAnim, handles focus changes.
- *
- * @param new focus state.
- */
- virtual void FocusChanged(
- TBool aState );
-
- /**
- * From CWindowAnim, handles keyevents.
- *
- * @param aRawEvent event.
- * @return ETrue if event is consumed.
- */
- virtual TBool OfferRawEvent(
- const TRawEvent& aRawEvent );
-
- private:
-
- // inner class to clear blacklist.
- class CClearBlacklist;
-
- // ETel session.
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- RTelServer iServer;
-
- // Mobile phone session.
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- RMobilePhone iPhone;
-
- // Custom API session.
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- RMmCustomAPI iCustom;
-
- // If set true then next key event should cause black
- // list to be cleared.
- TBool iClearBlacklistOnNextEvent;
-
- // Owned blacklist clearer.
- CClearBlacklist* iActive;
-
- };
-
-#endif // CPHONEBLACKLISTANIM_H
-
-// End Of File
--- a/phoneapp/Blacklist/inc/phoneanimdllstd.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002-2003 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: It defines constants shared between this subsystem and
-* clients of the subsystem.
-*
-*/
-
-
-
-#ifndef PHONEANIMDLLSTD_H
-#define PHONEANIMDLLSTD_H
-
-// DATA TYPES
-
-/**
-* Animation services.
-*
-* EAnimClearBlackList - blacklist clearing.
-*/
-enum TPhoneAnimType
- {
- EAnimClearBlackList
- };
-
-/**
-* Operations for blacklist clearing.
-*
-* ECancelBlackList - clear blacklist upon next keypress.
-*/
-enum TPhoneAnimOpcode
- {
- ECancelBlackList,
- EClearBlackListNow
- };
-
-#endif // PHONEANIMDLLSTD_H
-
-// End Of File
--- a/phoneapp/Blacklist/rom/PhoneAnimDll.iby Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2005 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: IBY file for phoneanimdll component.
-*
-*/
-
-
-#ifndef __PHONEANIMDLL_IBY__
-#define __PHONEANIMDLL_IBY__
-
-file=ABI_DIR\BUILD_DIR\phoneanimdll.dll SHARED_LIB_DIR\phoneanimdll.dll
-
-data=ZSYSTEM\install\phoneanimdll_stub.sis System\Install\phoneanimdll_stub.sis
-
-#endif
--- a/phoneapp/Blacklist/src/CPhoneAnimDll.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2002-2003 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: It provides implementation for the CPhoneAnimDll class. Only
-* one animation service is provided, CPhoneBlacklistAnim, to
-* clear blacklist upon next keypress.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "phoneanimdllstd.h"
-#include "cphoneanimdll.h"
-#include "cphoneblacklistanim.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CPhoneAnimDll::CreateInstanceL
-//
-// Create blacklist clearing plug-in. Only one type provided.
-// ---------------------------------------------------------
-//
-CAnim* CPhoneAnimDll::CreateInstanceL( TInt aType )
- {
- switch ( aType )
- {
- case EAnimClearBlackList:
- return new ( ELeave ) CPhoneBlacklistAnim();
- default:
- return NULL;
- }
- }
-
-// ---------------------------------------------------------
-// CAnimDll::CreateCAnimDllL
-//
-// Create plug-in. Factory function.
-// ---------------------------------------------------------
-//
-EXPORT_C CAnimDll* CreateCAnimDllL()
- {
- return new ( ELeave ) CPhoneAnimDll();
- }
-
-// End of File
--- a/phoneapp/Blacklist/src/CPhoneBlacklistAnim.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,329 +0,0 @@
-/*
-* Copyright (c) 2002-2004,2008 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: It provides implementation for the CPhoneBlacklistAnim class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32base.h>
-#include <mmtsy_names.h>
-#include "phoneanimdllstd.h"
-#include "cphoneblacklistanim.h"
-
-// CONSTANTS
-// Amount of retries to be performed.
-const TInt KPhoneRetryCount = 7;
-
-// Timeout in microseconds
-const TInt KPhoneRetryTimeout = 100000;
-
-// MODULE DATA STRUCTURES
-/**
-* Active object for clearing nlacklist.
-*
-* @since 2.0
-*/
-class CPhoneBlacklistAnim::CClearBlacklist
- : public CActive
- {
- public: // Constructors and destructors.
-
- /**
- * Constructor.
- */
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- CClearBlacklist( RMmCustomAPI& aCustom );
-
- /**
- * Destructor.
- */
- ~CClearBlacklist();
-
- public: // New functions
-
- /**
- * Clear blacklist.
- */
- void Clear();
-
- protected:
-
- /**
- * From CActive, handles completion of request.
- */
- void RunL();
-
- /**
- * From CActive, cancels pending request.
- */
- void DoCancel();
-
- private:
-
- // Ref to custom API.
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- RMmCustomAPI& iCustom;
-
- };
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CPhoneBlacklistAnim
-// ---------------------------------------------------------
-//
-CPhoneBlacklistAnim::CPhoneBlacklistAnim()
- {
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::~CPhoneBlacklistAnim
-// ---------------------------------------------------------
-//
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-CPhoneBlacklistAnim::~CPhoneBlacklistAnim()
- {
- if ( iFunctions )
- {
- iFunctions->GetRawEvents( EFalse );
- }
-
- delete iActive;
-
- iCustom.Close();
- iPhone.Close();
- iServer.Close();
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CommandReplyL
-//
-// Reply to command. Always returns KErrNone.
-// Defined as pure virtual in baseclass, not actually needed
-// here.
-// ---------------------------------------------------------
-//
-TInt CPhoneBlacklistAnim::CommandReplyL( TInt /*aOpcode*/, TAny* /*aArgs*/ )
- {
- return KErrNone;
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::Command
-//
-// Command handling, only one command supported.
-// ---------------------------------------------------------
-//
-void CPhoneBlacklistAnim::Command( TInt aOpcode, TAny* /*aArgs*/ )
- {
- switch ( aOpcode )
- {
- case ECancelBlackList:
- iClearBlacklistOnNextEvent = ETrue;
- break;
- case EClearBlackListNow:
- iActive->Clear();
- break;
- default:
- break;
- }
- };
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::Animate
-//
-// Defined as pure virtual in base class, so empty
-// implementation.
-// ---------------------------------------------------------
-//
-void CPhoneBlacklistAnim::Animate( TDateTime* /*aDateTime*/ )
- {
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::ConstructL
-//
-// Construction.
-// Activates also request to get all key events.
-// ---------------------------------------------------------
-//
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-/*****************************************************
-* Series 60 Customer / TSY
-* Needs customer TSY implementation
-*****************************************************/
-void CPhoneBlacklistAnim::ConstructL( TAny* /*aArgs*/, TBool /*aHasFocus*/ )
- {
- // Connect to ETel.
- TInt err = KErrNone;
- {
- for ( TInt a = 0 ; a < KPhoneRetryCount ; a++ )
- {
- err = iServer.Connect();
-
- if ( err == KErrNone )
- {
- break;
- }
-
- User::After( KPhoneRetryTimeout );
- }
-
- User::LeaveIfError( err );
- }
-
- // Load TSY module.
- err = iServer.LoadPhoneModule( KMmTsyModuleName );
- if ( err != KErrAlreadyExists )
- {
- // LoadPhoneModule may return also KErrAlreadyExists
- // if some other is already loaded the tsy module.
- // And that is not an error.
- User::LeaveIfError( err );
- }
-
- // Open phone and custom API.
- User::LeaveIfError( iPhone.Open( iServer, KMmTsyPhoneName ) );
- User::LeaveIfError( iCustom.Open( iPhone ) );
-
- iActive = new ( ELeave ) CClearBlacklist( iCustom );
-
- iFunctions->GetRawEvents( ETrue );
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::Redraw
-//
-// Not needed. No UI.
-// Defined as pure virtual in baseclass, not actually needed
-// here.
-// ---------------------------------------------------------
-//
-void CPhoneBlacklistAnim::Redraw()
- {
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::FocusChanged
-//
-// Not needed. No UI.
-// Defined as pure virtual in baseclass, not actually needed
-// here.
-// ---------------------------------------------------------
-//
-void CPhoneBlacklistAnim::FocusChanged( TBool /*aState*/ )
- {
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::OfferRawEvent
-//
-// Handle key event.
-// ---------------------------------------------------------
-//
-TBool CPhoneBlacklistAnim::OfferRawEvent( const TRawEvent& aRawEvent )
- {
- if ( aRawEvent.Type() == TRawEvent::EKeyDown ||
- aRawEvent.Type() == TRawEvent::EButton1Down )
- {
- if ( iClearBlacklistOnNextEvent )
- {
- iClearBlacklistOnNextEvent = EFalse;
- iActive->Clear();
- }
- }
- return EFalse;
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CClearBlacklist::CClearBlacklist
-// ---------------------------------------------------------
-//
-CPhoneBlacklistAnim::CClearBlacklist::CClearBlacklist(
- RMmCustomAPI& aCustom )
- : CActive( CActive::EPriorityStandard ),
- iCustom( aCustom )
- {
- CActiveScheduler::Add( this );
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CClearBlacklist::~CClearBlacklist
-// ---------------------------------------------------------
-//
-CPhoneBlacklistAnim::CClearBlacklist::~CClearBlacklist()
- {
- Cancel();
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CClearBlacklist::Clear
-//
-// Clear blacklist asynchronously.
-// ---------------------------------------------------------
-//
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-void CPhoneBlacklistAnim::CClearBlacklist::Clear()
- {
- Cancel();
-
- iCustom.ClearCallBlackList( iStatus );
- SetActive();
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CClearBlacklist::RunL
-//
-// This is called when blacklist clearing completes.
-// Empty implementation, as nothing needs to be done.
-// ---------------------------------------------------------
-//
-void CPhoneBlacklistAnim::CClearBlacklist::RunL()
- {
- }
-
-// ---------------------------------------------------------
-// CPhoneBlacklistAnim::CClearBlacklist::DoCancel
-//
-// Cancels pending request.
-// ---------------------------------------------------------
-//
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-void CPhoneBlacklistAnim::CClearBlacklist::DoCancel()
- {
- iCustom.CancelAsyncRequest(
- ECustomClearCallBlackListIPC );
- }
-
-// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/group/bld.inf Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* Copyright (c) 2002-2005 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: Blacklist build definition.
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../inc/phoneanimdllstd.h |../../../inc/phoneanimdllstd.h
+../group/phoneanimdll_stub.sis /epoc32/data/z/system/install/phoneanimdll_stub.sis
+
+// IBY files
+../rom/phoneanimdll.iby CORE_APP_LAYER_IBY_EXPORT_PATH(phoneanimdll.iby)
+
+PRJ_MMPFILES
+../group/phoneanimdll.mmp
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/group/phoneanimdll.mmp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2002-2004 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 project specification for blacklist window server plug-
+* in. The plug-in provides service for phone application to clear
+* blacklist upon next keypress.
+*
+*/
+
+#include <platform_paths.hrh>
+
+// Capability assignment.
+CAPABILITY CAP_GENERAL_DLL
+
+TARGET phoneanimdll.dll
+TARGETTYPE ANI
+UID 0x10003B22 0x100059FE
+
+SOURCEPATH ../src
+
+USERINCLUDE ../inc
+APP_LAYER_SYSTEMINCLUDE
+
+SOURCE cphoneanimdll.cpp
+SOURCE cphoneblacklistanim.cpp
+
+LIBRARY euser.lib
+LIBRARY etel.lib
+LIBRARY etelmm.lib
+LIBRARY customapi.lib
+
+
+// End of File
Binary file phoneapp/blacklist/group/phoneanimdll_stub.SIS has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/group/phoneanimdll_stub.pkg Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2009 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: For packing phoneanimdll stub.
+;
+; phoneanimdll_stub.pkg
+
+; Languages
+&EN
+
+; Header
+#{"phoneanimdll"},(0x100059FE),1,0,0,TYPE=SA
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+; Target
+
+""-"z:\sys\bin\phoneanimdll.dll"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/inc/CPhoneAnimDll.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,59 @@
+/*
+* Copyright (c) 2002-2003 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: It defines factory class for blacklist clearing plug-in.
+*
+*/
+
+
+
+#ifndef CPHONEANIMDLL_H
+#define CPHONEANIMDLL_H
+
+// INCLUDES
+#include <e32std.h>
+#include <w32adll.h>
+
+// CLASS DECLARATION
+
+/**
+* Animation plug-in.
+*
+* @since 2.0
+*/
+class CPhoneAnimDll
+ : public CAnimDll
+ {
+ public: // From base classes
+
+ /**
+ * From CAnimDll, creates an instance of requested plugin.
+ *
+ * @return instance of animation service.
+ */
+ virtual CAnim* CreateInstanceL( TInt aType );
+
+ };
+
+/**
+* Creates an instance of CPhoneAnimDll.
+* Factory function.
+*
+* @since 1.0
+* @return instance of anim dll.
+*/
+IMPORT_C CAnimDll* CreateCAnimDllL();
+
+#endif // CPHONEANIMDLL_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/inc/CPhoneBlacklistAnim.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,148 @@
+/*
+* Copyright (c) 2002-2003 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: It defines window animation service, which provides service
+* to clear blacklist upon next key event.
+*
+*/
+
+
+
+#ifndef CPHONEBLACKLISTANIM_H
+#define CPHONEBLACKLISTANIM_H
+
+// INCLUDES
+#include <w32adll.h>
+#include <etel.h>
+#include <etelmm.h>
+#include <rmmcustomapi.h>
+
+// CLASS DECLARATION
+
+/**
+* It is blacklist window animation class.
+*
+* @since 2.0
+*/
+class CPhoneBlacklistAnim
+ : public CWindowAnim
+ {
+ public: // Constructors and destructors
+
+ /**
+ * Constructor.
+ */
+ CPhoneBlacklistAnim();
+
+ /**
+ * Destructor.
+ */
+ ~CPhoneBlacklistAnim();
+
+ public: // From base classes
+
+ /**
+ * From CWindowAnim, handles commands.
+ * @param aOpcode command.
+ * @param aArgs parameters.
+ * @return error code.
+ */
+ virtual TInt CommandReplyL(
+ TInt aOpcode,
+ TAny* aArgs );
+
+ /**
+ * From CWindowAnim, handles commands.
+ * @param aOpcode command.
+ * @param aArgs parameters.
+ */
+ virtual void Command(
+ TInt aOpcode,
+ TAny* aArgs );
+
+ /**
+ * From CWindowAnim, animate.
+ * @param aDateTime NULL or current time.
+ */
+ virtual void Animate(
+ TDateTime* aDateTime );
+
+ /**
+ * From CWindowAnim, second phase constructor.
+ * @param aArgs parameters.
+ * @param aHasFocus focus information.
+ */
+ virtual void ConstructL(
+ TAny* aArgs,
+ TBool aHasFocus );
+
+ /**
+ * From CWindowAnim, handles redraw request.
+ */
+ virtual void Redraw();
+
+ /**
+ * From CWindowAnim, handles focus changes.
+ *
+ * @param new focus state.
+ */
+ virtual void FocusChanged(
+ TBool aState );
+
+ /**
+ * From CWindowAnim, handles keyevents.
+ *
+ * @param aRawEvent event.
+ * @return ETrue if event is consumed.
+ */
+ virtual TBool OfferRawEvent(
+ const TRawEvent& aRawEvent );
+
+ private:
+
+ // inner class to clear blacklist.
+ class CClearBlacklist;
+
+ // ETel session.
+ /*****************************************************
+ * Series 60 Customer / ETel
+ * Series 60 ETel API
+ *****************************************************/
+ RTelServer iServer;
+
+ // Mobile phone session.
+ /*****************************************************
+ * Series 60 Customer / ETel
+ * Series 60 ETel API
+ *****************************************************/
+ RMobilePhone iPhone;
+
+ // Custom API session.
+ /*****************************************************
+ * Series 60 Customer / ETel
+ * Series 60 ETel API
+ *****************************************************/
+ RMmCustomAPI iCustom;
+
+ // If set true then next key event should cause black
+ // list to be cleared.
+ TBool iClearBlacklistOnNextEvent;
+
+ // Owned blacklist clearer.
+ CClearBlacklist* iActive;
+
+ };
+
+#endif // CPHONEBLACKLISTANIM_H
+
+// End Of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/inc/phoneanimdllstd.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2002-2003 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: It defines constants shared between this subsystem and
+* clients of the subsystem.
+*
+*/
+
+
+
+#ifndef PHONEANIMDLLSTD_H
+#define PHONEANIMDLLSTD_H
+
+// DATA TYPES
+
+/**
+* Animation services.
+*
+* EAnimClearBlackList - blacklist clearing.
+*/
+enum TPhoneAnimType
+ {
+ EAnimClearBlackList
+ };
+
+/**
+* Operations for blacklist clearing.
+*
+* ECancelBlackList - clear blacklist upon next keypress.
+*/
+enum TPhoneAnimOpcode
+ {
+ ECancelBlackList,
+ EClearBlackListNow
+ };
+
+#endif // PHONEANIMDLLSTD_H
+
+// End Of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/rom/phoneanimdll.iby Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2005 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: IBY file for phoneanimdll component.
+*
+*/
+
+
+#ifndef __PHONEANIMDLL_IBY__
+#define __PHONEANIMDLL_IBY__
+
+file=ABI_DIR\BUILD_DIR\phoneanimdll.dll SHARED_LIB_DIR\phoneanimdll.dll
+
+data=ZSYSTEM\install\phoneanimdll_stub.sis System\Install\phoneanimdll_stub.sis
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/src/cphoneanimdll.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2002-2003 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: It provides implementation for the CPhoneAnimDll class. Only
+* one animation service is provided, CPhoneBlacklistAnim, to
+* clear blacklist upon next keypress.
+*
+*/
+
+
+
+// INCLUDE FILES
+#include "phoneanimdllstd.h"
+#include "cphoneanimdll.h"
+#include "cphoneblacklistanim.h"
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------
+// CPhoneAnimDll::CreateInstanceL
+//
+// Create blacklist clearing plug-in. Only one type provided.
+// ---------------------------------------------------------
+//
+CAnim* CPhoneAnimDll::CreateInstanceL( TInt aType )
+ {
+ switch ( aType )
+ {
+ case EAnimClearBlackList:
+ return new ( ELeave ) CPhoneBlacklistAnim();
+ default:
+ return NULL;
+ }
+ }
+
+// ---------------------------------------------------------
+// CAnimDll::CreateCAnimDllL
+//
+// Create plug-in. Factory function.
+// ---------------------------------------------------------
+//
+EXPORT_C CAnimDll* CreateCAnimDllL()
+ {
+ return new ( ELeave ) CPhoneAnimDll();
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/blacklist/src/cphoneblacklistanim.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,329 @@
+/*
+* Copyright (c) 2002-2004,2008 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: It provides implementation for the CPhoneBlacklistAnim class.
+*
+*/
+
+
+
+// INCLUDE FILES
+#include <e32base.h>
+#include <mmtsy_names.h>
+#include "phoneanimdllstd.h"
+#include "cphoneblacklistanim.h"
+
+// CONSTANTS
+// Amount of retries to be performed.
+const TInt KPhoneRetryCount = 7;
+
+// Timeout in microseconds
+const TInt KPhoneRetryTimeout = 100000;
+
+// MODULE DATA STRUCTURES
+/**
+* Active object for clearing nlacklist.
+*
+* @since 2.0
+*/
+class CPhoneBlacklistAnim::CClearBlacklist
+ : public CActive
+ {
+ public: // Constructors and destructors.
+
+ /**
+ * Constructor.
+ */
+ /*****************************************************
+ * Series 60 Customer / ETel
+ * Series 60 ETel API
+ *****************************************************/
+ CClearBlacklist( RMmCustomAPI& aCustom );
+
+ /**
+ * Destructor.
+ */
+ ~CClearBlacklist();
+
+ public: // New functions
+
+ /**
+ * Clear blacklist.
+ */
+ void Clear();
+
+ protected:
+
+ /**
+ * From CActive, handles completion of request.
+ */
+ void RunL();
+
+ /**
+ * From CActive, cancels pending request.
+ */
+ void DoCancel();
+
+ private:
+
+ // Ref to custom API.
+ /*****************************************************
+ * Series 60 Customer / ETel
+ * Series 60 ETel API
+ *****************************************************/
+ RMmCustomAPI& iCustom;
+
+ };
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CPhoneBlacklistAnim
+// ---------------------------------------------------------
+//
+CPhoneBlacklistAnim::CPhoneBlacklistAnim()
+ {
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::~CPhoneBlacklistAnim
+// ---------------------------------------------------------
+//
+/*****************************************************
+* Series 60 Customer / ETel
+* Series 60 ETel API
+*****************************************************/
+CPhoneBlacklistAnim::~CPhoneBlacklistAnim()
+ {
+ if ( iFunctions )
+ {
+ iFunctions->GetRawEvents( EFalse );
+ }
+
+ delete iActive;
+
+ iCustom.Close();
+ iPhone.Close();
+ iServer.Close();
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CommandReplyL
+//
+// Reply to command. Always returns KErrNone.
+// Defined as pure virtual in baseclass, not actually needed
+// here.
+// ---------------------------------------------------------
+//
+TInt CPhoneBlacklistAnim::CommandReplyL( TInt /*aOpcode*/, TAny* /*aArgs*/ )
+ {
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::Command
+//
+// Command handling, only one command supported.
+// ---------------------------------------------------------
+//
+void CPhoneBlacklistAnim::Command( TInt aOpcode, TAny* /*aArgs*/ )
+ {
+ switch ( aOpcode )
+ {
+ case ECancelBlackList:
+ iClearBlacklistOnNextEvent = ETrue;
+ break;
+ case EClearBlackListNow:
+ iActive->Clear();
+ break;
+ default:
+ break;
+ }
+ };
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::Animate
+//
+// Defined as pure virtual in base class, so empty
+// implementation.
+// ---------------------------------------------------------
+//
+void CPhoneBlacklistAnim::Animate( TDateTime* /*aDateTime*/ )
+ {
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::ConstructL
+//
+// Construction.
+// Activates also request to get all key events.
+// ---------------------------------------------------------
+//
+/*****************************************************
+* Series 60 Customer / ETel
+* Series 60 ETel API
+*****************************************************/
+/*****************************************************
+* Series 60 Customer / TSY
+* Needs customer TSY implementation
+*****************************************************/
+void CPhoneBlacklistAnim::ConstructL( TAny* /*aArgs*/, TBool /*aHasFocus*/ )
+ {
+ // Connect to ETel.
+ TInt err = KErrNone;
+ {
+ for ( TInt a = 0 ; a < KPhoneRetryCount ; a++ )
+ {
+ err = iServer.Connect();
+
+ if ( err == KErrNone )
+ {
+ break;
+ }
+
+ User::After( KPhoneRetryTimeout );
+ }
+
+ User::LeaveIfError( err );
+ }
+
+ // Load TSY module.
+ err = iServer.LoadPhoneModule( KMmTsyModuleName );
+ if ( err != KErrAlreadyExists )
+ {
+ // LoadPhoneModule may return also KErrAlreadyExists
+ // if some other is already loaded the tsy module.
+ // And that is not an error.
+ User::LeaveIfError( err );
+ }
+
+ // Open phone and custom API.
+ User::LeaveIfError( iPhone.Open( iServer, KMmTsyPhoneName ) );
+ User::LeaveIfError( iCustom.Open( iPhone ) );
+
+ iActive = new ( ELeave ) CClearBlacklist( iCustom );
+
+ iFunctions->GetRawEvents( ETrue );
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::Redraw
+//
+// Not needed. No UI.
+// Defined as pure virtual in baseclass, not actually needed
+// here.
+// ---------------------------------------------------------
+//
+void CPhoneBlacklistAnim::Redraw()
+ {
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::FocusChanged
+//
+// Not needed. No UI.
+// Defined as pure virtual in baseclass, not actually needed
+// here.
+// ---------------------------------------------------------
+//
+void CPhoneBlacklistAnim::FocusChanged( TBool /*aState*/ )
+ {
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::OfferRawEvent
+//
+// Handle key event.
+// ---------------------------------------------------------
+//
+TBool CPhoneBlacklistAnim::OfferRawEvent( const TRawEvent& aRawEvent )
+ {
+ if ( aRawEvent.Type() == TRawEvent::EKeyDown ||
+ aRawEvent.Type() == TRawEvent::EButton1Down )
+ {
+ if ( iClearBlacklistOnNextEvent )
+ {
+ iClearBlacklistOnNextEvent = EFalse;
+ iActive->Clear();
+ }
+ }
+ return EFalse;
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CClearBlacklist::CClearBlacklist
+// ---------------------------------------------------------
+//
+CPhoneBlacklistAnim::CClearBlacklist::CClearBlacklist(
+ RMmCustomAPI& aCustom )
+ : CActive( CActive::EPriorityStandard ),
+ iCustom( aCustom )
+ {
+ CActiveScheduler::Add( this );
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CClearBlacklist::~CClearBlacklist
+// ---------------------------------------------------------
+//
+CPhoneBlacklistAnim::CClearBlacklist::~CClearBlacklist()
+ {
+ Cancel();
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CClearBlacklist::Clear
+//
+// Clear blacklist asynchronously.
+// ---------------------------------------------------------
+//
+/*****************************************************
+* Series 60 Customer / ETel
+* Series 60 ETel API
+*****************************************************/
+void CPhoneBlacklistAnim::CClearBlacklist::Clear()
+ {
+ Cancel();
+
+ iCustom.ClearCallBlackList( iStatus );
+ SetActive();
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CClearBlacklist::RunL
+//
+// This is called when blacklist clearing completes.
+// Empty implementation, as nothing needs to be done.
+// ---------------------------------------------------------
+//
+void CPhoneBlacklistAnim::CClearBlacklist::RunL()
+ {
+ }
+
+// ---------------------------------------------------------
+// CPhoneBlacklistAnim::CClearBlacklist::DoCancel
+//
+// Cancels pending request.
+// ---------------------------------------------------------
+//
+/*****************************************************
+* Series 60 Customer / ETel
+* Series 60 ETel API
+*****************************************************/
+void CPhoneBlacklistAnim::CClearBlacklist::DoCancel()
+ {
+ iCustom.CancelAsyncRequest(
+ ECustomClearCallBlackListIPC );
+ }
+
+// End of File
--- a/phoneapp/phoneui2/src/phoneuihousehold_p.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneui2/src/phoneuihousehold_p.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -189,9 +189,6 @@
HbTranslator *translator2 = new HbTranslator(QString("telephone_cp"));
if (translator2) {
m_translators.append(translator2);
- } else {
- delete translator2;
- translator2 = 0;
}
PhoneUIQtView *view = new PhoneUIQtView(m_window);
--- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Fri Jul 09 15:40:55 2010 +0300
@@ -4,231 +4,199 @@
?EnableCallUIL@CPhoneState@@QAEXXZ @ 3 NONAME ; void CPhoneState::EnableCallUIL(void)
?TopAppIsDisplayedL@CPhoneState@@IBEHXZ @ 4 NONAME ; int CPhoneState::TopAppIsDisplayedL(void) const
?HandleKeyMessageL@CPhoneStateCallSetup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneStateCallSetup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?SetContextMenuL@CPhoneState@@MAEXH@Z @ 6 NONAME ; void CPhoneState::SetContextMenuL(int)
- ?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 7 NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &)
- ?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 *)
- ?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 17 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
- ?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 18 NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void)
- ??1CPhoneStateCallSetup@@UAE@XZ @ 19 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
- ?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 20 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
- ?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 21 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
- ?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 22 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
- ?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 23 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
- ?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 24 NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *)
- ?HandleCommandL@CPhoneState@@UAEHH@Z @ 25 NONAME ; int CPhoneState::HandleCommandL(int)
- ?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 26 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
- ?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 27 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
- ?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@1@W4TDialInitiationMethod@1@@Z @ 28 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum CPhoneStateIdle::TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
- ?RetainPreviousKeylockStateL@CPhoneState@@QAEXXZ @ 29 NONAME ; void CPhoneState::RetainPreviousKeylockStateL(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)
- ?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 35 NONAME ; void CPhoneStateMachine::ChangeState(int)
- ?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 36 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
- ?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 37 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
- ?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 38 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
- ?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 39 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 40 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
- ?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 41 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
- ?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 42 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
- ?HandleLongHashL@CPhoneState@@UAEXXZ @ 43 NONAME ; void CPhoneState::HandleLongHashL(void)
- ?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 44 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
- ?DisconnectCallL@CPhoneState@@IAEHXZ @ 45 NONAME ; int CPhoneState::DisconnectCallL(void)
- ?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 46 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
- ?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 47 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
- ?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 48 NONAME ; void CPhoneState::HandleDisconnectingL(int)
- ?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 49 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
- ?HandleKeyLockEnabled@CPhoneState@@UAEXH@Z @ 50 NONAME ; void CPhoneState::HandleKeyLockEnabled(int)
- ?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 51 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
- ?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 52 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
- ?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 53 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
- ?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 54 NONAME ; enum TPESimState CPhoneState::SimState(void) const
- ?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 55 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 56 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
- ?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 57 NONAME ; void CPhoneState::CompleteSatRequestL(int)
- ?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 58 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 59 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
- ?NeedToSendToBackgroundL@CPhoneState@@IBEHXZ @ 60 NONAME ; int CPhoneState::NeedToSendToBackgroundL(void) const
- ?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 61 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
- ?IsSimOk@CPhoneState@@QAEHXZ @ 62 NONAME ; int CPhoneState::IsSimOk(void)
- ?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 63 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
- ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 64 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
- ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 65 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
- ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 66 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
- ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 67 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
- ?IsKeyLockOn@CPhoneState@@MBEHXZ @ 68 NONAME ; int CPhoneState::IsKeyLockOn(void) const
- ??1CPhoneStateInCall@@UAE@XZ @ 69 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
- ?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 70 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
- ?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 71 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
- ?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 72 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
- ?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 73 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
- ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 74 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
- ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 75 NONAME ; void CPhoneStateInCall::ConstructL(void)
- ?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 76 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
- ?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 77 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
- ?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 78 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
- ?HandleHoldSwitchL@CPhoneState@@QAEXXZ @ 79 NONAME ; void CPhoneState::HandleHoldSwitchL(void)
- ?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 80 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
- ?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 81 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
- ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 82 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
- ?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 83 NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
- ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 84 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
- ?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 85 NONAME ; void CPhoneState::DialMultimediaCallL(void)
- ?NewL@CPhoneUIController@@SAPAV1@PAVMPhoneViewCommandHandle@@@Z @ 86 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class MPhoneViewCommandHandle *)
- ?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 87 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
- ?CheckDisableHWKeysAndCallUIL@CPhoneState@@QAEXXZ @ 88 NONAME ; void CPhoneState::CheckDisableHWKeysAndCallUIL(void)
- ?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 89 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
- ?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 90 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
- ?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 91 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
- ?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 92 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
- ??1CPhoneUIController@@UAE@XZ @ 93 NONAME ; CPhoneUIController::~CPhoneUIController(void)
- ?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 94 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 95 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
- ?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 96 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
- ?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 97 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
- ?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 98 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
- ?SendGlobalErrorNoteL@CPhoneState@@QAEXHH@Z @ 99 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int, int)
- ?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 100 NONAME ; void CPhoneStateIncoming::ConstructL(void)
- ?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 101 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
- ?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 102 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
- ?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 103 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
- ?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 104 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
- ?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 105 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
- ?IsVideoCall@CPhoneState@@IAEHH@Z @ 106 NONAME ; int CPhoneState::IsVideoCall(int)
- ?IsSwivelClosed@CPhoneState@@QBEHXZ @ 107 NONAME ; int CPhoneState::IsSwivelClosed(void) const
- ?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 108 NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
- ?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 109 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
- ?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 110 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
- ?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 111 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
- ?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 112 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 113 NONAME ; void CPhoneState::SetToolbarDimming(int)
- ?IsAutoLockOn@CPhoneState@@UBEHXZ @ 114 NONAME ; int CPhoneState::IsAutoLockOn(void) const
- ?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 115 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
- ?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 116 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
- ?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 117 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?SendGlobalWarningNoteL@CPhoneState@@IAEXHH@Z @ 118 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int, int)
- ?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 119 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
- ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 120 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
- ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 121 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
- ?DialVoiceCallL@CPhoneState@@IAEXXZ @ 122 NONAME ; void CPhoneState::DialVoiceCallL(void)
- ?StateMachine@CPhoneStateHandle@@QAEPAVMPhoneStateMachine@@XZ @ 123 NONAME ; class MPhoneStateMachine * CPhoneStateHandle::StateMachine(void)
- ?EndUiUpdate@CPhoneState@@IAEXXZ @ 124 NONAME ; void CPhoneState::EndUiUpdate(void)
- ?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 125 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
- ?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 126 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
- ?EndTransEffect@CPhoneState@@QAEXXZ @ 127 NONAME ; void CPhoneState::EndTransEffect(void)
- ?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 128 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
- ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 129 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 130 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
- ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 131 NONAME ; int CPhoneState::ProcessCommandL(int)
- ?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 132 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
- ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 133 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
- ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 134 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
- ?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 135 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
- ?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 136 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
- ?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 137 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
- ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 138 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 139 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
- ?SetDivertIndication@CPhoneState@@UAEXH@Z @ 140 NONAME ; void CPhoneState::SetDivertIndication(int)
- ?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 141 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
- ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 142 NONAME ; void CPhoneStateMachine::SetCallId(int)
- ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 143 NONAME ; int CPhoneUIController::ProcessCommandL(int)
- ?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 144 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
- ??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 145 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 146 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
- ??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 147 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 148 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 149 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
- ?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 150 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 151 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
- ?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 152 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
- ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 153 NONAME ; int CPhoneUIController::HandleCommandL(int)
- ?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 154 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
- ?DisableHWKeysL@CPhoneState@@QAEXXZ @ 155 NONAME ; void CPhoneState::DisableHWKeysL(void)
- ?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 156 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
- ?GetBlockedKeyList@CPhoneState@@UBEABV?$RArray@H@@XZ @ 157 NONAME ; class RArray<int> const & CPhoneState::GetBlockedKeyList(void) const
- ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 158 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
- ?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 159 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
- ?PhoneStorage@CPhoneStateMachine@@UAEPAVMPhoneStorage@@XZ @ 160 NONAME ; class MPhoneStorage * CPhoneStateMachine::PhoneStorage(void)
- ??1CPhoneState@@UAE@XZ @ 161 NONAME ; CPhoneState::~CPhoneState(void)
- ?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 162 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
- ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 163 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
- ?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 164 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
- ??1CPhoneStateMachine@@UAE@XZ @ 165 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
- ?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 166 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
- ?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 167 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
- ?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 168 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
- ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 169 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
- ?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 170 NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType)
- ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 171 NONAME ; void CPhoneUIController::HandleMessage(int, int)
- ?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 172 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
- ?DisplayCallSetupL@CPhoneStateIdle@@IAEXH@Z @ 173 NONAME ; void CPhoneStateIdle::DisplayCallSetupL(int)
- ?ConstructL@CPhoneStateStartup@@MAEXXZ @ 174 NONAME ; void CPhoneStateStartup::ConstructL(void)
- ?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 175 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?ShowNoteL@CPhoneState@@IAEXH@Z @ 176 NONAME ; void CPhoneState::ShowNoteL(int)
- ?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 177 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
- ?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 178 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
- ?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 179 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
- ?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 180 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
- ?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 181 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
- ?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 182 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
- ?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 183 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
- ??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 184 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?SendGlobalInfoNoteL@CPhoneState@@QAEXHH@Z @ 185 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int, int)
- ??1CPhoneStateIncoming@@UAE@XZ @ 186 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
- ?HandleKeyLockEnabled@CPhoneUIController@@UAEXH@Z @ 187 NONAME ; void CPhoneUIController::HandleKeyLockEnabled(int)
- ?DisableCallUIL@CPhoneState@@QAEXXZ @ 188 NONAME ; void CPhoneState::DisableCallUIL(void)
- ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 189 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
- ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 190 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
- ?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 191 NONAME ; int CPhoneState::IsNoteVisibleL(void)
- ?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 192 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
- ?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 193 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
- ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 194 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
- ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 195 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 196 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 197 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
- ?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 198 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
- ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 199 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
- ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 200 NONAME ; void CPhoneStateIdle::ConstructL(void)
- ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 201 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
- ?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 202 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
- ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 203 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
- ?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 204 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
- ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 205 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
- ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 206 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
- ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 207 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
- ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 208 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
- ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 209 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
- ?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 210 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
- ?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 211 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
- ?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 212 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
- ?SetBackButtonActive@CPhoneState@@IAEXH@Z @ 213 NONAME ; void CPhoneState::SetBackButtonActive(int)
- ?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 214 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
- ?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 215 NONAME ; void CPhoneState::HandleForegroundEventL(int)
- ?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 216 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
- ?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 217 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
- ??1CPhoneStateIdle@@UAE@XZ @ 218 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
- ?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 219 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
- ?BaseConstructL@CPhoneState@@QAEXXZ @ 220 NONAME ; void CPhoneState::BaseConstructL(void)
- ?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 221 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
- ?SetCallHeaderType@CPhoneState@@IAEXH@Z @ 222 NONAME ; void CPhoneState::SetCallHeaderType(int)
- ?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 223 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
- ?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 224 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
- ?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 225 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
- ?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 226 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
- ?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 227 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
- ?HandleKeyLockEnabled@CPhoneStateIncoming@@UAEXH@Z @ 228 NONAME ; void CPhoneStateIncoming::HandleKeyLockEnabled(int)
- ??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 229 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
- ??1CPhoneStateStartup@@UAE@XZ @ 230 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
- ?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 231 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?OpenSoftRejectMessageEditorL@CPhoneState@@MAEXXZ @ 232 NONAME ; void CPhoneState::OpenSoftRejectMessageEditorL(void)
+ ?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 6 NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &)
+ ?SetCbaL@CPhoneCbaManager@@QAEXH@Z @ 7 NONAME ; void CPhoneCbaManager::SetCbaL(int)
+ ?InstanceL@CPhoneReconnectQuery@@SAPAV1@XZ @ 8 NONAME ; class CPhoneReconnectQuery * CPhoneReconnectQuery::InstanceL(void)
+ ?HandlePhoneStartupL@CPhoneState@@UAEXXZ @ 9 NONAME ; void CPhoneState::HandlePhoneStartupL(void)
+ ?HandlePhoneFocusLostEventL@CPhoneStateIdle@@UAEXXZ @ 10 NONAME ; void CPhoneStateIdle::HandlePhoneFocusLostEventL(void)
+ ?HandleIdleL@CPhoneStateInCall@@IAEXH@Z @ 11 NONAME ; void CPhoneStateInCall::HandleIdleL(int)
+ ?ShowQueryL@CPhoneState@@IAEXH@Z @ 12 NONAME ; void CPhoneState::ShowQueryL(int)
+ ?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 13 NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void)
+ ??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 14 NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 15 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
+ ??1CPhoneStateCallSetup@@UAE@XZ @ 16 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
+ ?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 17 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
+ ?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 18 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
+ ?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 19 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
+ ?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 20 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
+ ?HandleCommandL@CPhoneState@@UAEHH@Z @ 21 NONAME ; int CPhoneState::HandleCommandL(int)
+ ?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 22 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
+ ?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 23 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
+ ?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@1@W4TDialInitiationMethod@1@@Z @ 24 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum CPhoneStateIdle::TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
+ ?RetainPreviousKeylockStateL@CPhoneState@@QAEXXZ @ 25 NONAME ; void CPhoneState::RetainPreviousKeylockStateL(void)
+ ?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 26 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
+ ?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 27 NONAME ; void CPhoneStateIdle::HandleDialingL(int)
+ ?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 28 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
+ ?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 29 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+ ?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 30 NONAME ; void CPhoneStateMachine::ChangeState(int)
+ ?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 31 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
+ ?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 32 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
+ ?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 33 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
+ ?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 34 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 35 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+ ?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 36 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
+ ?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 37 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
+ ?HandleLongHashL@CPhoneState@@UAEXXZ @ 38 NONAME ; void CPhoneState::HandleLongHashL(void)
+ ?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 39 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
+ ?DisconnectCallL@CPhoneState@@IAEHXZ @ 40 NONAME ; int CPhoneState::DisconnectCallL(void)
+ ?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 41 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
+ ?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 42 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
+ ?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 43 NONAME ; void CPhoneState::HandleDisconnectingL(int)
+ ?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 44 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
+ ?HandleKeyLockEnabled@CPhoneState@@UAEXH@Z @ 45 NONAME ; void CPhoneState::HandleKeyLockEnabled(int)
+ ?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 46 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
+ ?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 47 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
+ ?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 48 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
+ ?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 49 NONAME ; enum TPESimState CPhoneState::SimState(void) const
+ ?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 50 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 51 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
+ ?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 52 NONAME ; void CPhoneState::CompleteSatRequestL(int)
+ ?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 53 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?NeedToSendToBackgroundL@CPhoneState@@IBEHXZ @ 54 NONAME ; int CPhoneState::NeedToSendToBackgroundL(void) const
+ ?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 55 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
+ ?IsSimOk@CPhoneState@@QAEHXZ @ 56 NONAME ; int CPhoneState::IsSimOk(void)
+ ?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 57 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
+ ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 58 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
+ ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 59 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
+ ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 60 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
+ ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 61 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
+ ?IsKeyLockOn@CPhoneState@@MBEHXZ @ 62 NONAME ; int CPhoneState::IsKeyLockOn(void) const
+ ??1CPhoneStateInCall@@UAE@XZ @ 63 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
+ ?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 64 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
+ ?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 65 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
+ ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 66 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
+ ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 67 NONAME ; void CPhoneStateInCall::ConstructL(void)
+ ?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 68 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
+ ?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 69 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
+ ?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 70 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
+ ?HandleHoldSwitchL@CPhoneState@@QAEXXZ @ 71 NONAME ; void CPhoneState::HandleHoldSwitchL(void)
+ ?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 72 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
+ ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 73 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+ ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 74 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
+ ?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 75 NONAME ; void CPhoneState::DialMultimediaCallL(void)
+ ?NewL@CPhoneUIController@@SAPAV1@PAVMPhoneViewCommandHandle@@@Z @ 76 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class MPhoneViewCommandHandle *)
+ ?CheckDisableHWKeysAndCallUIL@CPhoneState@@QAEXXZ @ 77 NONAME ; void CPhoneState::CheckDisableHWKeysAndCallUIL(void)
+ ?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 78 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
+ ?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 79 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
+ ??1CPhoneUIController@@UAE@XZ @ 80 NONAME ; CPhoneUIController::~CPhoneUIController(void)
+ ?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 81 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
+ ?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 82 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 83 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
+ ?SendGlobalErrorNoteL@CPhoneState@@QAEXHH@Z @ 84 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int, int)
+ ?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 85 NONAME ; void CPhoneStateIncoming::ConstructL(void)
+ ?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 86 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
+ ?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 87 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
+ ?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 88 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
+ ?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 89 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
+ ?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 90 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
+ ?IsVideoCall@CPhoneState@@IAEHH@Z @ 91 NONAME ; int CPhoneState::IsVideoCall(int)
+ ?IsSwivelClosed@CPhoneState@@QBEHXZ @ 92 NONAME ; int CPhoneState::IsSwivelClosed(void) const
+ ?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 93 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
+ ?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 94 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
+ ?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 95 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?IsAutoLockOn@CPhoneState@@UBEHXZ @ 96 NONAME ; int CPhoneState::IsAutoLockOn(void) const
+ ?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 97 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
+ ?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 98 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?SendGlobalWarningNoteL@CPhoneState@@IAEXHH@Z @ 99 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int, int)
+ ?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 100 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
+ ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 101 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
+ ?DialVoiceCallL@CPhoneState@@IAEXXZ @ 102 NONAME ; void CPhoneState::DialVoiceCallL(void)
+ ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 103 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
+ ?StateMachine@CPhoneStateHandle@@QAEPAVMPhoneStateMachine@@XZ @ 104 NONAME ; class MPhoneStateMachine * CPhoneStateHandle::StateMachine(void)
+ ?EndUiUpdate@CPhoneState@@IAEXXZ @ 105 NONAME ; void CPhoneState::EndUiUpdate(void)
+ ?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 106 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+ ?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 107 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
+ ?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 108 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
+ ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 109 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 110 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
+ ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 111 NONAME ; int CPhoneState::ProcessCommandL(int)
+ ?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 112 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
+ ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 113 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
+ ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 114 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
+ ?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 115 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
+ ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 116 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 117 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
+ ?SetDivertIndication@CPhoneState@@UAEXH@Z @ 118 NONAME ; void CPhoneState::SetDivertIndication(int)
+ ?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 119 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
+ ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 120 NONAME ; void CPhoneStateMachine::SetCallId(int)
+ ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 121 NONAME ; int CPhoneUIController::ProcessCommandL(int)
+ ?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 122 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
+ ??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 123 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 124 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
+ ??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 125 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 126 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 127 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+ ?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 128 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 129 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
+ ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 130 NONAME ; int CPhoneUIController::HandleCommandL(int)
+ ?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 131 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
+ ?DisableHWKeysL@CPhoneState@@QAEXXZ @ 132 NONAME ; void CPhoneState::DisableHWKeysL(void)
+ ?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 133 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
+ ?GetBlockedKeyList@CPhoneState@@UBEABV?$RArray@H@@XZ @ 134 NONAME ; class RArray<int> const & CPhoneState::GetBlockedKeyList(void) const
+ ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 135 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
+ ?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 136 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
+ ?PhoneStorage@CPhoneStateMachine@@UAEPAVMPhoneStorage@@XZ @ 137 NONAME ; class MPhoneStorage * CPhoneStateMachine::PhoneStorage(void)
+ ??1CPhoneState@@UAE@XZ @ 138 NONAME ; CPhoneState::~CPhoneState(void)
+ ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 139 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
+ ?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 140 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
+ ??1CPhoneStateMachine@@UAE@XZ @ 141 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
+ ?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 142 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
+ ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 143 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
+ ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 144 NONAME ; void CPhoneUIController::HandleMessage(int, int)
+ ?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 145 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
+ ?DisplayCallSetupL@CPhoneStateIdle@@IAEXH@Z @ 146 NONAME ; void CPhoneStateIdle::DisplayCallSetupL(int)
+ ?ConstructL@CPhoneStateStartup@@MAEXXZ @ 147 NONAME ; void CPhoneStateStartup::ConstructL(void)
+ ?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 148 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?ShowNoteL@CPhoneState@@IAEXH@Z @ 149 NONAME ; void CPhoneState::ShowNoteL(int)
+ ?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 150 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+ ?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 151 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
+ ?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 152 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
+ ?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 153 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
+ ?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 154 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
+ ?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 155 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
+ ?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 156 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
+ ??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 157 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?SendGlobalInfoNoteL@CPhoneState@@QAEXHH@Z @ 158 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int, int)
+ ??1CPhoneStateIncoming@@UAE@XZ @ 159 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
+ ?HandleKeyLockEnabled@CPhoneUIController@@UAEXH@Z @ 160 NONAME ; void CPhoneUIController::HandleKeyLockEnabled(int)
+ ?DisableCallUIL@CPhoneState@@QAEXXZ @ 161 NONAME ; void CPhoneState::DisableCallUIL(void)
+ ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 162 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
+ ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 163 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
+ ?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 164 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
+ ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 165 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
+ ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 166 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 167 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 168 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
+ ?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 169 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
+ ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 170 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
+ ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 171 NONAME ; void CPhoneStateIdle::ConstructL(void)
+ ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 172 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
+ ?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 173 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
+ ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 174 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
+ ?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 175 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
+ ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 176 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
+ ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 177 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
+ ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 178 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
+ ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 179 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
+ ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 180 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
+ ?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 181 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
+ ?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 182 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
+ ?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 183 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
+ ?SetBackButtonActive@CPhoneState@@IAEXH@Z @ 184 NONAME ; void CPhoneState::SetBackButtonActive(int)
+ ?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 185 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
+ ?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 186 NONAME ; void CPhoneState::HandleForegroundEventL(int)
+ ?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 187 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
+ ??1CPhoneStateIdle@@UAE@XZ @ 188 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
+ ?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 189 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+ ?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 190 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
+ ?BaseConstructL@CPhoneState@@QAEXXZ @ 191 NONAME ; void CPhoneState::BaseConstructL(void)
+ ?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 192 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
+ ?SetCallHeaderType@CPhoneState@@IAEXH@Z @ 193 NONAME ; void CPhoneState::SetCallHeaderType(int)
+ ?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 194 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
+ ?HandleKeyLockEnabled@CPhoneStateIncoming@@UAEXH@Z @ 195 NONAME ; void CPhoneStateIncoming::HandleKeyLockEnabled(int)
+ ?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 196 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
+ ??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 197 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
+ ??1CPhoneStateStartup@@UAE@XZ @ 198 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
+ ?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 199 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?OpenSoftRejectMessageEditorL@CPhoneState@@MAEXXZ @ 200 NONAME ; void CPhoneState::OpenSoftRejectMessageEditorL(void)
--- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Fri Jul 09 15:40:55 2010 +0300
@@ -8,461 +8,406 @@
_ZN11CPhoneState14DialVoiceCallLEv @ 7 NONAME
_ZN11CPhoneState14DisableCallUILEv @ 8 NONAME
_ZN11CPhoneState14DisableHWKeysLEv @ 9 NONAME
- _ZN11CPhoneState14EndTransEffectEv @ 10 NONAME
- _ZN11CPhoneState14HandleCommandLEi @ 11 NONAME
- _ZN11CPhoneState14IsNoteVisibleLEv @ 12 NONAME
- _ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 13 NONAME
- _ZN11CPhoneState15BeginUiUpdateLCEv @ 14 NONAME
- _ZN11CPhoneState15DisconnectCallLEv @ 15 NONAME
- _ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 16 NONAME
- _ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 17 NONAME
- _ZN11CPhoneState15HandleLongHashLEv @ 18 NONAME
- _ZN11CPhoneState15ProcessCommandLEi @ 19 NONAME
- _ZN11CPhoneState15SetContextMenuLEi @ 20 NONAME
- _ZN11CPhoneState16CallWaitingNoteLEi @ 21 NONAME
- _ZN11CPhoneState16CloseDTMFEditorLEv @ 22 NONAME
- _ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 23 NONAME
- _ZN11CPhoneState16SetDefaultFlagsLEv @ 24 NONAME
- _ZN11CPhoneState17HandleHoldSwitchLEv @ 25 NONAME
- _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 26 NONAME
- _ZN11CPhoneState17IsAnyQueryActiveLEv @ 27 NONAME
- _ZN11CPhoneState17SetCallHeaderTypeEi @ 28 NONAME
- _ZN11CPhoneState17SetHandsfreeModeLEi @ 29 NONAME
- _ZN11CPhoneState17SetToolbarDimmingEi @ 30 NONAME
- _ZN11CPhoneState18BeginTransEffectLCE21TStateTransEffectType @ 31 NONAME
- _ZN11CPhoneState18DisplayIdleScreenLEv @ 32 NONAME
- _ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 33 NONAME
- _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 34 NONAME
- _ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 35 NONAME
- _ZN11CPhoneState18IsNumberEntryUsedLEv @ 36 NONAME
- _ZN11CPhoneState19CompleteSatRequestLEi @ 37 NONAME
- _ZN11CPhoneState19DialMultimediaCallLEv @ 38 NONAME
- _ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 39 NONAME
- _ZN11CPhoneState19HandlePhoneStartupLEv @ 40 NONAME
- _ZN11CPhoneState19SendGlobalInfoNoteLEii @ 41 NONAME
- _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 42 NONAME
- _ZN11CPhoneState19SetBackButtonActiveEi @ 43 NONAME
- _ZN11CPhoneState19SetDivertIndicationEi @ 44 NONAME
- _ZN11CPhoneState19SetTouchPaneButtonsEi @ 45 NONAME
- _ZN11CPhoneState19SetTouchPaneVisibleEi @ 46 NONAME
- _ZN11CPhoneState19ShowNumberBusyNoteLEv @ 47 NONAME
- _ZN11CPhoneState20CallFromNumberEntryLEv @ 48 NONAME
- _ZN11CPhoneState20DecreaseAudioVolumeLEv @ 49 NONAME
- _ZN11CPhoneState20HandleDisconnectingLEi @ 50 NONAME
- _ZN11CPhoneState20HandleKeyLockEnabledEi @ 51 NONAME
- _ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 52 NONAME
- _ZN11CPhoneState20IncreaseAudioVolumeLEv @ 53 NONAME
- _ZN11CPhoneState20SendGlobalErrorNoteLEii @ 54 NONAME
- _ZN11CPhoneState21IsNumberEntryVisibleLEv @ 55 NONAME
- _ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 56 NONAME
- _ZN11CPhoneState22CloseCustomizedDialerLEv @ 57 NONAME
- _ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 58 NONAME
- _ZN11CPhoneState22HandleForegroundEventLEi @ 59 NONAME
- _ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 60 NONAME
- _ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 61 NONAME
- _ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 62 NONAME
- _ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 63 NONAME
- _ZN11CPhoneState22SendGlobalWarningNoteLEii @ 64 NONAME
- _ZN11CPhoneState22StartShowSecurityNoteLEv @ 65 NONAME
- _ZN11CPhoneState23HandleAudioMuteChangedLEv @ 66 NONAME
- _ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 67 NONAME
- _ZN11CPhoneState23HandleNumberEntryEditedEv @ 68 NONAME
- _ZN11CPhoneState23SetRingingTonePlaybackLEi @ 69 NONAME
- _ZN11CPhoneState23UpdateSingleActiveCallLEi @ 70 NONAME
- _ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 71 NONAME
- _ZN11CPhoneState24HandleEnvironmentChangeLEi @ 72 NONAME
- _ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 73 NONAME
- _ZN11CPhoneState24StoreNumberEntryContentLEv @ 74 NONAME
- _ZN11CPhoneState24UpdateInCallContextMenuLEv @ 75 NONAME
- _ZN11CPhoneState25HandleAudioOutputChangedLEv @ 76 NONAME
- _ZN11CPhoneState25HandleNumberEntryClearedLEv @ 77 NONAME
- _ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 78 NONAME
- _ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 79 NONAME
- _ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 80 NONAME
- _ZN11CPhoneState26HandleIdleForegroundEventLEv @ 81 NONAME
- _ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 82 NONAME
- _ZN11CPhoneState26IsNumberEntryContentStoredEv @ 83 NONAME
- _ZN11CPhoneState26RestoreNumberEntryContentLEv @ 84 NONAME
- _ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 85 NONAME
- _ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 86 NONAME
- _ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 87 NONAME
- _ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 88 NONAME
- _ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 89 NONAME
- _ZN11CPhoneState27RetainPreviousKeylockStateLEv @ 90 NONAME
- _ZN11CPhoneState28CheckDisableHWKeysAndCallUILEv @ 91 NONAME
- _ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 92 NONAME
- _ZN11CPhoneState28OpenSoftRejectMessageEditorLEv @ 93 NONAME
- _ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 94 NONAME
- _ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 95 NONAME
- _ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 96 NONAME
- _ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 97 NONAME
- _ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 98 NONAME
- _ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 99 NONAME
- _ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 100 NONAME
- _ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 101 NONAME
- _ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 102 NONAME
- _ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 103 NONAME
- _ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 104 NONAME
- _ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 105 NONAME
- _ZN11CPhoneState7IsSimOkEv @ 106 NONAME
- _ZN11CPhoneState9ShowNoteLEi @ 107 NONAME
- _ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 108 NONAME
- _ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 109 NONAME
- _ZN11CPhoneStateD0Ev @ 110 NONAME
- _ZN11CPhoneStateD1Ev @ 111 NONAME
- _ZN11CPhoneStateD2Ev @ 112 NONAME
- _ZN15CPhoneStateIdle10ConstructLEv @ 113 NONAME
- _ZN15CPhoneStateIdle14DialVoiceCallLEv @ 114 NONAME
- _ZN15CPhoneStateIdle14HandleCommandLEi @ 115 NONAME
- _ZN15CPhoneStateIdle14HandleDialingLEi @ 116 NONAME
- _ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 117 NONAME
- _ZN15CPhoneStateIdle15ProcessCommandLEi @ 118 NONAME
- _ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 119 NONAME
- _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 120 NONAME
- _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 121 NONAME
- _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 122 NONAME
- _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 123 NONAME
- _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 124 NONAME
- _ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 125 NONAME
- _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 126 NONAME
- _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 127 NONAME
- _ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 128 NONAME
- _ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 129 NONAME
- _ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 130 NONAME
- _ZN15CPhoneStateIdle5DialLERK7TDesC16NS_16TPhoneNumberTypeENS_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
- _ZN17CPhoneStateHandle12StateMachineEv @ 140 NONAME
- _ZN17CPhoneStateHandle17ViewCommandHandleEv @ 141 NONAME
- _ZN17CPhoneStateHandle8InstanceEv @ 142 NONAME
- _ZN17CPhoneStateInCall10ConstructLEv @ 143 NONAME
- _ZN17CPhoneStateInCall10UpdateCbaLEi @ 144 NONAME
- _ZN17CPhoneStateInCall11HandleIdleLEi @ 145 NONAME
- _ZN17CPhoneStateInCall12OpenMenuBarLEv @ 146 NONAME
- _ZN17CPhoneStateInCall14HandleCommandLEi @ 147 NONAME
- _ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 148 NONAME
- _ZN17CPhoneStateInCall15GetRingingCallLEv @ 149 NONAME
- _ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 150 NONAME
- _ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 151 NONAME
- _ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 152 NONAME
- _ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 153 NONAME
- _ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 154 NONAME
- _ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 155 NONAME
- _ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 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
- _ZN18CPhoneStateMachine12PhoneStorageEv @ 168 NONAME
- _ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 169 NONAME
- _ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 170 NONAME
- _ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 171 NONAME
- _ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 172 NONAME
- _ZN18CPhoneStateMachine5StateEv @ 173 NONAME
- _ZN18CPhoneStateMachine9SetCallIdEi @ 174 NONAME
- _ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 175 NONAME
- _ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 176 NONAME
- _ZN18CPhoneStateMachineD0Ev @ 177 NONAME
- _ZN18CPhoneStateMachineD1Ev @ 178 NONAME
- _ZN18CPhoneStateMachineD2Ev @ 179 NONAME
- _ZN18CPhoneStateStartup10ConstructLEv @ 180 NONAME
- _ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 181 NONAME
- _ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 182 NONAME
- _ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 183 NONAME
- _ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 184 NONAME
- _ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 185 NONAME
- _ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 186 NONAME
- _ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 187 NONAME
- _ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 188 NONAME
- _ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 189 NONAME
- _ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 190 NONAME
- _ZN18CPhoneStateStartupD0Ev @ 191 NONAME
- _ZN18CPhoneStateStartupD1Ev @ 192 NONAME
- _ZN18CPhoneStateStartupD2Ev @ 193 NONAME
- _ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 194 NONAME
- _ZN18CPhoneUIController13HandleMessageEii @ 195 NONAME
- _ZN18CPhoneUIController14HandleCommandLEi @ 196 NONAME
- _ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 197 NONAME
- _ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 198 NONAME
- _ZN18CPhoneUIController15ProcessCommandLEi @ 199 NONAME
- _ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 200 NONAME
- _ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 201 NONAME
- _ZN18CPhoneUIController19HandlePhoneStartupLEv @ 202 NONAME
- _ZN18CPhoneUIController20HandleKeyLockEnabledEi @ 203 NONAME
- _ZN18CPhoneUIController22HandleForegroundEventLEi @ 204 NONAME
- _ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 205 NONAME
- _ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 206 NONAME
- _ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 207 NONAME
- _ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 208 NONAME
- _ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 209 NONAME
- _ZN18CPhoneUIControllerD0Ev @ 210 NONAME
- _ZN18CPhoneUIControllerD1Ev @ 211 NONAME
- _ZN18CPhoneUIControllerD2Ev @ 212 NONAME
- _ZN19CPhoneStateIncoming10ConstructLEv @ 213 NONAME
- _ZN19CPhoneStateIncoming14HandleCommandLEi @ 214 NONAME
- _ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 215 NONAME
- _ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 216 NONAME
- _ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 217 NONAME
- _ZN19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 218 NONAME
- _ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 219 NONAME
- _ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 220 NONAME
- _ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 221 NONAME
- _ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 222 NONAME
- _ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 223 NONAME
- _ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 224 NONAME
- _ZN19CPhoneStateIncomingD0Ev @ 225 NONAME
- _ZN19CPhoneStateIncomingD1Ev @ 226 NONAME
- _ZN19CPhoneStateIncomingD2Ev @ 227 NONAME
- _ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 228 NONAME
- _ZN20CPhoneReconnectQuery9InstanceLEv @ 229 NONAME
- _ZN20CPhoneStateCallSetup10ConstructLEv @ 230 NONAME
- _ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 231 NONAME
- _ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 232 NONAME
- _ZN20CPhoneStateCallSetup14HandleCommandLEi @ 233 NONAME
- _ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 234 NONAME
- _ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 235 NONAME
- _ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 236 NONAME
- _ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 237 NONAME
- _ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 238 NONAME
- _ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 239 NONAME
- _ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 240 NONAME
- _ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 241 NONAME
- _ZN20CPhoneStateCallSetupD0Ev @ 242 NONAME
- _ZN20CPhoneStateCallSetupD1Ev @ 243 NONAME
- _ZN20CPhoneStateCallSetupD2Ev @ 244 NONAME
- _ZNK11CPhoneState11IsKeyLockOnEv @ 245 NONAME
- _ZNK11CPhoneState12IsAutoLockOnEv @ 246 NONAME
- _ZNK11CPhoneState14IsSwivelClosedEv @ 247 NONAME
- _ZNK11CPhoneState17GetBlockedKeyListEv @ 248 NONAME
- _ZNK11CPhoneState17IsMenuBarVisibleLEv @ 249 NONAME
- _ZNK11CPhoneState18TopAppIsDisplayedLEv @ 250 NONAME
- _ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 251 NONAME
- _ZNK11CPhoneState23NeedToSendToBackgroundLEv @ 252 NONAME
- _ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 253 NONAME
- _ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 254 NONAME
- _ZNK11CPhoneState8SimStateEv @ 255 NONAME
- _ZTI11CPhoneState @ 256 NONAME
- _ZTI15CPhoneStateIdle @ 257 NONAME
- _ZTI17CPhoneStateHandle @ 258 NONAME
- _ZTI17CPhoneStateInCall @ 259 NONAME
- _ZTI18CPhoneStateMachine @ 260 NONAME
- _ZTI18CPhoneStateStartup @ 261 NONAME
- _ZTI18CPhoneUIController @ 262 NONAME
- _ZTI19CPhoneStateIncoming @ 263 NONAME
- _ZTI20CPhoneReconnectQuery @ 264 NONAME
- _ZTI20CPhoneStateCallSetup @ 265 NONAME
- _ZTI23CPhoneDtmfWaitCharTimer @ 266 NONAME
- _ZTI24CPhoneSystemEventHandler @ 267 NONAME
- _ZTI26CPhoneRemoteControlHandler @ 268 NONAME
- _ZTI27CPhoneBtaaDisconnectHandler @ 269 NONAME
- _ZTV11CPhoneState @ 270 NONAME
- _ZTV15CPhoneStateIdle @ 271 NONAME
- _ZTV17CPhoneStateHandle @ 272 NONAME
- _ZTV17CPhoneStateInCall @ 273 NONAME
- _ZTV18CPhoneStateMachine @ 274 NONAME
- _ZTV18CPhoneStateStartup @ 275 NONAME
- _ZTV18CPhoneUIController @ 276 NONAME
- _ZTV19CPhoneStateIncoming @ 277 NONAME
- _ZTV20CPhoneReconnectQuery @ 278 NONAME
- _ZTV20CPhoneStateCallSetup @ 279 NONAME
- _ZTV23CPhoneDtmfWaitCharTimer @ 280 NONAME
- _ZTV24CPhoneSystemEventHandler @ 281 NONAME
- _ZTV26CPhoneRemoteControlHandler @ 282 NONAME
- _ZTV27CPhoneBtaaDisconnectHandler @ 283 NONAME
- _ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 284 NONAME
- _ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 285 NONAME
- _ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 286 NONAME
- _ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 287 NONAME
- _ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 288 NONAME
- _ZThn12_N11CPhoneState20HandleKeyLockEnabledEi @ 289 NONAME
- _ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 290 NONAME
- _ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 291 NONAME
- _ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 292 NONAME
- _ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 293 NONAME
- _ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 294 NONAME
- _ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 295 NONAME
- _ZThn12_N11CPhoneStateD0Ev @ 296 NONAME
- _ZThn12_N11CPhoneStateD1Ev @ 297 NONAME
- _ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 298 NONAME
- _ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 299 NONAME
- _ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 300 NONAME
- _ZThn12_N15CPhoneStateIdleD0Ev @ 301 NONAME
- _ZThn12_N15CPhoneStateIdleD1Ev @ 302 NONAME
- _ZThn12_N17CPhoneStateInCallD0Ev @ 303 NONAME
- _ZThn12_N17CPhoneStateInCallD1Ev @ 304 NONAME
- _ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 305 NONAME
- _ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 306 NONAME
- _ZThn12_N18CPhoneStateStartupD0Ev @ 307 NONAME
- _ZThn12_N18CPhoneStateStartupD1Ev @ 308 NONAME
- _ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 309 NONAME
- _ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 310 NONAME
- _ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 311 NONAME
- _ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 312 NONAME
- _ZThn12_N18CPhoneUIController20HandleKeyLockEnabledEi @ 313 NONAME
- _ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 314 NONAME
- _ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 315 NONAME
- _ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 316 NONAME
- _ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 317 NONAME
- _ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 318 NONAME
- _ZThn12_N18CPhoneUIControllerD0Ev @ 319 NONAME
- _ZThn12_N18CPhoneUIControllerD1Ev @ 320 NONAME
- _ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 321 NONAME
- _ZThn12_N19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 322 NONAME
- _ZThn12_N19CPhoneStateIncomingD0Ev @ 323 NONAME
- _ZThn12_N19CPhoneStateIncomingD1Ev @ 324 NONAME
- _ZThn12_N20CPhoneStateCallSetupD0Ev @ 325 NONAME
- _ZThn12_N20CPhoneStateCallSetupD1Ev @ 326 NONAME
- _ZThn16_N11CPhoneState14HandleCommandLEi @ 327 NONAME
- _ZThn16_N11CPhoneState15ProcessCommandLEi @ 328 NONAME
- _ZThn16_N11CPhoneStateD0Ev @ 329 NONAME
- _ZThn16_N11CPhoneStateD1Ev @ 330 NONAME
- _ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 331 NONAME
- _ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 332 NONAME
- _ZThn16_N15CPhoneStateIdleD0Ev @ 333 NONAME
- _ZThn16_N15CPhoneStateIdleD1Ev @ 334 NONAME
- _ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 335 NONAME
- _ZThn16_N17CPhoneStateInCallD0Ev @ 336 NONAME
- _ZThn16_N17CPhoneStateInCallD1Ev @ 337 NONAME
- _ZThn16_N18CPhoneStateStartupD0Ev @ 338 NONAME
- _ZThn16_N18CPhoneStateStartupD1Ev @ 339 NONAME
- _ZThn16_N18CPhoneUIController14HandleCommandLEi @ 340 NONAME
- _ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 341 NONAME
- _ZThn16_N18CPhoneUIControllerD0Ev @ 342 NONAME
- _ZThn16_N18CPhoneUIControllerD1Ev @ 343 NONAME
- _ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 344 NONAME
- _ZThn16_N19CPhoneStateIncomingD0Ev @ 345 NONAME
- _ZThn16_N19CPhoneStateIncomingD1Ev @ 346 NONAME
- _ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 347 NONAME
- _ZThn16_N20CPhoneStateCallSetupD0Ev @ 348 NONAME
- _ZThn16_N20CPhoneStateCallSetupD1Ev @ 349 NONAME
- _ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 350 NONAME
- _ZThn20_N11CPhoneStateD0Ev @ 351 NONAME
- _ZThn20_N11CPhoneStateD1Ev @ 352 NONAME
- _ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 353 NONAME
- _ZThn20_N15CPhoneStateIdleD0Ev @ 354 NONAME
- _ZThn20_N15CPhoneStateIdleD1Ev @ 355 NONAME
- _ZThn20_N17CPhoneStateInCallD0Ev @ 356 NONAME
- _ZThn20_N17CPhoneStateInCallD1Ev @ 357 NONAME
- _ZThn20_N18CPhoneStateStartupD0Ev @ 358 NONAME
- _ZThn20_N18CPhoneStateStartupD1Ev @ 359 NONAME
- _ZThn20_N19CPhoneStateIncomingD0Ev @ 360 NONAME
- _ZThn20_N19CPhoneStateIncomingD1Ev @ 361 NONAME
- _ZThn20_N20CPhoneStateCallSetupD0Ev @ 362 NONAME
- _ZThn20_N20CPhoneStateCallSetupD1Ev @ 363 NONAME
- _ZThn24_N11CPhoneState19SetDivertIndicationEi @ 364 NONAME
- _ZThn24_N11CPhoneStateD0Ev @ 365 NONAME
- _ZThn24_N11CPhoneStateD1Ev @ 366 NONAME
- _ZThn24_N15CPhoneStateIdleD0Ev @ 367 NONAME
- _ZThn24_N15CPhoneStateIdleD1Ev @ 368 NONAME
- _ZThn24_N17CPhoneStateInCallD0Ev @ 369 NONAME
- _ZThn24_N17CPhoneStateInCallD1Ev @ 370 NONAME
- _ZThn24_N18CPhoneStateStartupD0Ev @ 371 NONAME
- _ZThn24_N18CPhoneStateStartupD1Ev @ 372 NONAME
- _ZThn24_N19CPhoneStateIncomingD0Ev @ 373 NONAME
- _ZThn24_N19CPhoneStateIncomingD1Ev @ 374 NONAME
- _ZThn24_N20CPhoneStateCallSetupD0Ev @ 375 NONAME
- _ZThn24_N20CPhoneStateCallSetupD1Ev @ 376 NONAME
- _ZThn28_NK11CPhoneState17GetBlockedKeyListEv @ 377 NONAME
- _ZThn32_N11CPhoneState25HandleNumberEntryClearedLEv @ 378 NONAME
- _ZThn32_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 379 NONAME
- _ZThn32_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 380 NONAME
- _ZThn32_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 381 NONAME
- _ZThn32_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 382 NONAME
- _ZThn36_N11CPhoneState23HandleNumberEntryEditedEv @ 383 NONAME
- _ZThn36_N11CPhoneStateD0Ev @ 384 NONAME
- _ZThn36_N11CPhoneStateD1Ev @ 385 NONAME
- _ZThn36_N15CPhoneStateIdleD0Ev @ 386 NONAME
- _ZThn36_N15CPhoneStateIdleD1Ev @ 387 NONAME
- _ZThn36_N17CPhoneStateInCallD0Ev @ 388 NONAME
- _ZThn36_N17CPhoneStateInCallD1Ev @ 389 NONAME
- _ZThn36_N18CPhoneStateStartupD0Ev @ 390 NONAME
- _ZThn36_N18CPhoneStateStartupD1Ev @ 391 NONAME
- _ZThn36_N19CPhoneStateIncomingD0Ev @ 392 NONAME
- _ZThn36_N19CPhoneStateIncomingD1Ev @ 393 NONAME
- _ZThn36_N20CPhoneStateCallSetupD0Ev @ 394 NONAME
- _ZThn36_N20CPhoneStateCallSetupD1Ev @ 395 NONAME
- _ZThn40_NK11CPhoneState11IsKeyLockOnEv @ 396 NONAME
- _ZThn40_NK11CPhoneState12IsAutoLockOnEv @ 397 NONAME
- _ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 398 NONAME
- _ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 399 NONAME
- _ZThn4_N11CPhoneStateD0Ev @ 400 NONAME
- _ZThn4_N11CPhoneStateD1Ev @ 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_N18CPhoneStateMachine12PhoneStorageEv @ 410 NONAME
- _ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 411 NONAME
- _ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 412 NONAME
- _ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 413 NONAME
- _ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 414 NONAME
- _ZThn4_N18CPhoneStateMachine5StateEv @ 415 NONAME
- _ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 416 NONAME
- _ZThn4_N18CPhoneStateMachineD0Ev @ 417 NONAME
- _ZThn4_N18CPhoneStateMachineD1Ev @ 418 NONAME
- _ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 419 NONAME
- _ZThn4_N18CPhoneStateStartupD0Ev @ 420 NONAME
- _ZThn4_N18CPhoneStateStartupD1Ev @ 421 NONAME
- _ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 422 NONAME
- _ZThn4_N18CPhoneUIController13HandleMessageEii @ 423 NONAME
- _ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 424 NONAME
- _ZThn4_N19CPhoneStateIncomingD0Ev @ 425 NONAME
- _ZThn4_N19CPhoneStateIncomingD1Ev @ 426 NONAME
- _ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 427 NONAME
- _ZThn4_N20CPhoneStateCallSetupD0Ev @ 428 NONAME
- _ZThn4_N20CPhoneStateCallSetupD1Ev @ 429 NONAME
- _ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 430 NONAME
- _ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 431 NONAME
- _ZThn8_N11CPhoneState15HandleLongHashLEv @ 432 NONAME
- _ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 433 NONAME
- _ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 434 NONAME
- _ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 435 NONAME
- _ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 436 NONAME
- _ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 437 NONAME
- _ZThn8_N11CPhoneStateD0Ev @ 438 NONAME
- _ZThn8_N11CPhoneStateD1Ev @ 439 NONAME
- _ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 440 NONAME
- _ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 441 NONAME
- _ZThn8_N15CPhoneStateIdleD0Ev @ 442 NONAME
- _ZThn8_N15CPhoneStateIdleD1Ev @ 443 NONAME
- _ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 444 NONAME
- _ZThn8_N17CPhoneStateInCallD0Ev @ 445 NONAME
- _ZThn8_N17CPhoneStateInCallD1Ev @ 446 NONAME
- _ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 447 NONAME
- _ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 448 NONAME
- _ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 449 NONAME
- _ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 450 NONAME
- _ZThn8_N18CPhoneStateStartupD0Ev @ 451 NONAME
- _ZThn8_N18CPhoneStateStartupD1Ev @ 452 NONAME
- _ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 453 NONAME
- _ZThn8_N18CPhoneUIControllerD0Ev @ 454 NONAME
- _ZThn8_N18CPhoneUIControllerD1Ev @ 455 NONAME
- _ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 456 NONAME
- _ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 457 NONAME
- _ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 458 NONAME
- _ZThn8_N19CPhoneStateIncomingD0Ev @ 459 NONAME
- _ZThn8_N19CPhoneStateIncomingD1Ev @ 460 NONAME
- _ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 461 NONAME
- _ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 462 NONAME
- _ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 463 NONAME
- _ZThn8_N20CPhoneStateCallSetupD0Ev @ 464 NONAME
- _ZThn8_N20CPhoneStateCallSetupD1Ev @ 465 NONAME
- _ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 466 NONAME
+ _ZN11CPhoneState14HandleCommandLEi @ 10 NONAME
+ _ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 11 NONAME
+ _ZN11CPhoneState15BeginUiUpdateLCEv @ 12 NONAME
+ _ZN11CPhoneState15DisconnectCallLEv @ 13 NONAME
+ _ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 14 NONAME
+ _ZN11CPhoneState15HandleLongHashLEv @ 15 NONAME
+ _ZN11CPhoneState15ProcessCommandLEi @ 16 NONAME
+ _ZN11CPhoneState16CallWaitingNoteLEi @ 17 NONAME
+ _ZN11CPhoneState16SetDefaultFlagsLEv @ 18 NONAME
+ _ZN11CPhoneState17HandleHoldSwitchLEv @ 19 NONAME
+ _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 20 NONAME
+ _ZN11CPhoneState17IsAnyQueryActiveLEv @ 21 NONAME
+ _ZN11CPhoneState17SetCallHeaderTypeEi @ 22 NONAME
+ _ZN11CPhoneState17SetHandsfreeModeLEi @ 23 NONAME
+ _ZN11CPhoneState18DisplayIdleScreenLEv @ 24 NONAME
+ _ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 25 NONAME
+ _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 26 NONAME
+ _ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 27 NONAME
+ _ZN11CPhoneState18IsNumberEntryUsedLEv @ 28 NONAME
+ _ZN11CPhoneState19CompleteSatRequestLEi @ 29 NONAME
+ _ZN11CPhoneState19DialMultimediaCallLEv @ 30 NONAME
+ _ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 31 NONAME
+ _ZN11CPhoneState19HandlePhoneStartupLEv @ 32 NONAME
+ _ZN11CPhoneState19SendGlobalInfoNoteLEii @ 33 NONAME
+ _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 34 NONAME
+ _ZN11CPhoneState19SetBackButtonActiveEi @ 35 NONAME
+ _ZN11CPhoneState19SetDivertIndicationEi @ 36 NONAME
+ _ZN11CPhoneState19SetTouchPaneButtonsEi @ 37 NONAME
+ _ZN11CPhoneState19ShowNumberBusyNoteLEv @ 38 NONAME
+ _ZN11CPhoneState20CallFromNumberEntryLEv @ 39 NONAME
+ _ZN11CPhoneState20DecreaseAudioVolumeLEv @ 40 NONAME
+ _ZN11CPhoneState20HandleDisconnectingLEi @ 41 NONAME
+ _ZN11CPhoneState20HandleKeyLockEnabledEi @ 42 NONAME
+ _ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 43 NONAME
+ _ZN11CPhoneState20IncreaseAudioVolumeLEv @ 44 NONAME
+ _ZN11CPhoneState20SendGlobalErrorNoteLEii @ 45 NONAME
+ _ZN11CPhoneState21IsNumberEntryVisibleLEv @ 46 NONAME
+ _ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 47 NONAME
+ _ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 48 NONAME
+ _ZN11CPhoneState22HandleForegroundEventLEi @ 49 NONAME
+ _ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 50 NONAME
+ _ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 51 NONAME
+ _ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 52 NONAME
+ _ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 53 NONAME
+ _ZN11CPhoneState22SendGlobalWarningNoteLEii @ 54 NONAME
+ _ZN11CPhoneState22StartShowSecurityNoteLEv @ 55 NONAME
+ _ZN11CPhoneState23HandleAudioMuteChangedLEv @ 56 NONAME
+ _ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 57 NONAME
+ _ZN11CPhoneState23SetRingingTonePlaybackLEi @ 58 NONAME
+ _ZN11CPhoneState23UpdateSingleActiveCallLEi @ 59 NONAME
+ _ZN11CPhoneState24HandleEnvironmentChangeLEi @ 60 NONAME
+ _ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 61 NONAME
+ _ZN11CPhoneState24StoreNumberEntryContentLEv @ 62 NONAME
+ _ZN11CPhoneState25HandleAudioOutputChangedLEv @ 63 NONAME
+ _ZN11CPhoneState25HandleNumberEntryClearedLEv @ 64 NONAME
+ _ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 65 NONAME
+ _ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 66 NONAME
+ _ZN11CPhoneState26HandleIdleForegroundEventLEv @ 67 NONAME
+ _ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 68 NONAME
+ _ZN11CPhoneState26IsNumberEntryContentStoredEv @ 69 NONAME
+ _ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 70 NONAME
+ _ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 71 NONAME
+ _ZN11CPhoneState27RetainPreviousKeylockStateLEv @ 72 NONAME
+ _ZN11CPhoneState28CheckDisableHWKeysAndCallUILEv @ 73 NONAME
+ _ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 74 NONAME
+ _ZN11CPhoneState28OpenSoftRejectMessageEditorLEv @ 75 NONAME
+ _ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 76 NONAME
+ _ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 77 NONAME
+ _ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 78 NONAME
+ _ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 79 NONAME
+ _ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 80 NONAME
+ _ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 81 NONAME
+ _ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 82 NONAME
+ _ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 83 NONAME
+ _ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 84 NONAME
+ _ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 85 NONAME
+ _ZN11CPhoneState7IsSimOkEv @ 86 NONAME
+ _ZN11CPhoneState9ShowNoteLEi @ 87 NONAME
+ _ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 88 NONAME
+ _ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 89 NONAME
+ _ZN11CPhoneStateD0Ev @ 90 NONAME
+ _ZN11CPhoneStateD1Ev @ 91 NONAME
+ _ZN11CPhoneStateD2Ev @ 92 NONAME
+ _ZN15CPhoneStateIdle10ConstructLEv @ 93 NONAME
+ _ZN15CPhoneStateIdle14DialVoiceCallLEv @ 94 NONAME
+ _ZN15CPhoneStateIdle14HandleCommandLEi @ 95 NONAME
+ _ZN15CPhoneStateIdle14HandleDialingLEi @ 96 NONAME
+ _ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 97 NONAME
+ _ZN15CPhoneStateIdle15ProcessCommandLEi @ 98 NONAME
+ _ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 99 NONAME
+ _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 100 NONAME
+ _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 101 NONAME
+ _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 102 NONAME
+ _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 103 NONAME
+ _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 104 NONAME
+ _ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 105 NONAME
+ _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 106 NONAME
+ _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 107 NONAME
+ _ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 108 NONAME
+ _ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 109 NONAME
+ _ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 110 NONAME
+ _ZN15CPhoneStateIdle5DialLERK7TDesC16NS_16TPhoneNumberTypeENS_21TDialInitiationMethodE @ 111 NONAME
+ _ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 112 NONAME
+ _ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 113 NONAME
+ _ZN15CPhoneStateIdleD0Ev @ 114 NONAME
+ _ZN15CPhoneStateIdleD1Ev @ 115 NONAME
+ _ZN15CPhoneStateIdleD2Ev @ 116 NONAME
+ _ZN16CPhoneCbaManager10UpdateCbaLEi @ 117 NONAME
+ _ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 118 NONAME
+ _ZN16CPhoneCbaManager7SetCbaLEi @ 119 NONAME
+ _ZN17CPhoneStateHandle12StateMachineEv @ 120 NONAME
+ _ZN17CPhoneStateHandle17ViewCommandHandleEv @ 121 NONAME
+ _ZN17CPhoneStateHandle8InstanceEv @ 122 NONAME
+ _ZN17CPhoneStateInCall10ConstructLEv @ 123 NONAME
+ _ZN17CPhoneStateInCall10UpdateCbaLEi @ 124 NONAME
+ _ZN17CPhoneStateInCall11HandleIdleLEi @ 125 NONAME
+ _ZN17CPhoneStateInCall14HandleCommandLEi @ 126 NONAME
+ _ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 127 NONAME
+ _ZN17CPhoneStateInCall15GetRingingCallLEv @ 128 NONAME
+ _ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 129 NONAME
+ _ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 130 NONAME
+ _ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 131 NONAME
+ _ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 132 NONAME
+ _ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 133 NONAME
+ _ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 134 NONAME
+ _ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 135 NONAME
+ _ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 136 NONAME
+ _ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 137 NONAME
+ _ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 138 NONAME
+ _ZN17CPhoneStateInCallD0Ev @ 139 NONAME
+ _ZN17CPhoneStateInCallD1Ev @ 140 NONAME
+ _ZN17CPhoneStateInCallD2Ev @ 141 NONAME
+ _ZN18CPhoneStateMachine11ChangeStateEi @ 142 NONAME
+ _ZN18CPhoneStateMachine11PhoneEngineEv @ 143 NONAME
+ _ZN18CPhoneStateMachine12PhoneStorageEv @ 144 NONAME
+ _ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 145 NONAME
+ _ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 146 NONAME
+ _ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 147 NONAME
+ _ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 148 NONAME
+ _ZN18CPhoneStateMachine5StateEv @ 149 NONAME
+ _ZN18CPhoneStateMachine9SetCallIdEi @ 150 NONAME
+ _ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 151 NONAME
+ _ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 152 NONAME
+ _ZN18CPhoneStateMachineD0Ev @ 153 NONAME
+ _ZN18CPhoneStateMachineD1Ev @ 154 NONAME
+ _ZN18CPhoneStateMachineD2Ev @ 155 NONAME
+ _ZN18CPhoneStateStartup10ConstructLEv @ 156 NONAME
+ _ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 157 NONAME
+ _ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 158 NONAME
+ _ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 159 NONAME
+ _ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 160 NONAME
+ _ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 161 NONAME
+ _ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 162 NONAME
+ _ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 163 NONAME
+ _ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 164 NONAME
+ _ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 165 NONAME
+ _ZN18CPhoneStateStartupD0Ev @ 166 NONAME
+ _ZN18CPhoneStateStartupD1Ev @ 167 NONAME
+ _ZN18CPhoneStateStartupD2Ev @ 168 NONAME
+ _ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 169 NONAME
+ _ZN18CPhoneUIController13HandleMessageEii @ 170 NONAME
+ _ZN18CPhoneUIController14HandleCommandLEi @ 171 NONAME
+ _ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 172 NONAME
+ _ZN18CPhoneUIController15ProcessCommandLEi @ 173 NONAME
+ _ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 174 NONAME
+ _ZN18CPhoneUIController19HandlePhoneStartupLEv @ 175 NONAME
+ _ZN18CPhoneUIController20HandleKeyLockEnabledEi @ 176 NONAME
+ _ZN18CPhoneUIController22HandleForegroundEventLEi @ 177 NONAME
+ _ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 178 NONAME
+ _ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 179 NONAME
+ _ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 180 NONAME
+ _ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 181 NONAME
+ _ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 182 NONAME
+ _ZN18CPhoneUIControllerD0Ev @ 183 NONAME
+ _ZN18CPhoneUIControllerD1Ev @ 184 NONAME
+ _ZN18CPhoneUIControllerD2Ev @ 185 NONAME
+ _ZN19CPhoneStateIncoming10ConstructLEv @ 186 NONAME
+ _ZN19CPhoneStateIncoming14HandleCommandLEi @ 187 NONAME
+ _ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 188 NONAME
+ _ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 189 NONAME
+ _ZN19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 190 NONAME
+ _ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 191 NONAME
+ _ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 192 NONAME
+ _ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 193 NONAME
+ _ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 194 NONAME
+ _ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 195 NONAME
+ _ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 196 NONAME
+ _ZN19CPhoneStateIncomingD0Ev @ 197 NONAME
+ _ZN19CPhoneStateIncomingD1Ev @ 198 NONAME
+ _ZN19CPhoneStateIncomingD2Ev @ 199 NONAME
+ _ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 200 NONAME
+ _ZN20CPhoneReconnectQuery9InstanceLEv @ 201 NONAME
+ _ZN20CPhoneStateCallSetup10ConstructLEv @ 202 NONAME
+ _ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 203 NONAME
+ _ZN20CPhoneStateCallSetup14HandleCommandLEi @ 204 NONAME
+ _ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 205 NONAME
+ _ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 206 NONAME
+ _ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 207 NONAME
+ _ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 208 NONAME
+ _ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 209 NONAME
+ _ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 210 NONAME
+ _ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 211 NONAME
+ _ZN20CPhoneStateCallSetupD0Ev @ 212 NONAME
+ _ZN20CPhoneStateCallSetupD1Ev @ 213 NONAME
+ _ZN20CPhoneStateCallSetupD2Ev @ 214 NONAME
+ _ZNK11CPhoneState11IsKeyLockOnEv @ 215 NONAME
+ _ZNK11CPhoneState12IsAutoLockOnEv @ 216 NONAME
+ _ZNK11CPhoneState14IsSwivelClosedEv @ 217 NONAME
+ _ZNK11CPhoneState17GetBlockedKeyListEv @ 218 NONAME
+ _ZNK11CPhoneState18TopAppIsDisplayedLEv @ 219 NONAME
+ _ZNK11CPhoneState23NeedToSendToBackgroundLEv @ 220 NONAME
+ _ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 221 NONAME
+ _ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 222 NONAME
+ _ZNK11CPhoneState8SimStateEv @ 223 NONAME
+ _ZTI11CPhoneState @ 224 NONAME
+ _ZTI15CPhoneStateIdle @ 225 NONAME
+ _ZTI17CPhoneStateHandle @ 226 NONAME
+ _ZTI17CPhoneStateInCall @ 227 NONAME
+ _ZTI18CPhoneStateMachine @ 228 NONAME
+ _ZTI18CPhoneStateStartup @ 229 NONAME
+ _ZTI18CPhoneUIController @ 230 NONAME
+ _ZTI19CPhoneStateIncoming @ 231 NONAME
+ _ZTI20CPhoneReconnectQuery @ 232 NONAME
+ _ZTI20CPhoneStateCallSetup @ 233 NONAME
+ _ZTI23CPhoneDtmfWaitCharTimer @ 234 NONAME
+ _ZTI24CPhoneSystemEventHandler @ 235 NONAME
+ _ZTI26CPhoneRemoteControlHandler @ 236 NONAME
+ _ZTI27CPhoneBtaaDisconnectHandler @ 237 NONAME
+ _ZTV11CPhoneState @ 238 NONAME
+ _ZTV15CPhoneStateIdle @ 239 NONAME
+ _ZTV17CPhoneStateHandle @ 240 NONAME
+ _ZTV17CPhoneStateInCall @ 241 NONAME
+ _ZTV18CPhoneStateMachine @ 242 NONAME
+ _ZTV18CPhoneStateStartup @ 243 NONAME
+ _ZTV18CPhoneUIController @ 244 NONAME
+ _ZTV19CPhoneStateIncoming @ 245 NONAME
+ _ZTV20CPhoneReconnectQuery @ 246 NONAME
+ _ZTV20CPhoneStateCallSetup @ 247 NONAME
+ _ZTV23CPhoneDtmfWaitCharTimer @ 248 NONAME
+ _ZTV24CPhoneSystemEventHandler @ 249 NONAME
+ _ZTV26CPhoneRemoteControlHandler @ 250 NONAME
+ _ZTV27CPhoneBtaaDisconnectHandler @ 251 NONAME
+ _ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 252 NONAME
+ _ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 253 NONAME
+ _ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 254 NONAME
+ _ZThn12_N11CPhoneState20HandleKeyLockEnabledEi @ 255 NONAME
+ _ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 256 NONAME
+ _ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 257 NONAME
+ _ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 258 NONAME
+ _ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 259 NONAME
+ _ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 260 NONAME
+ _ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 261 NONAME
+ _ZThn12_N11CPhoneStateD0Ev @ 262 NONAME
+ _ZThn12_N11CPhoneStateD1Ev @ 263 NONAME
+ _ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 264 NONAME
+ _ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 265 NONAME
+ _ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 266 NONAME
+ _ZThn12_N15CPhoneStateIdleD0Ev @ 267 NONAME
+ _ZThn12_N15CPhoneStateIdleD1Ev @ 268 NONAME
+ _ZThn12_N17CPhoneStateInCallD0Ev @ 269 NONAME
+ _ZThn12_N17CPhoneStateInCallD1Ev @ 270 NONAME
+ _ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 271 NONAME
+ _ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 272 NONAME
+ _ZThn12_N18CPhoneStateStartupD0Ev @ 273 NONAME
+ _ZThn12_N18CPhoneStateStartupD1Ev @ 274 NONAME
+ _ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 275 NONAME
+ _ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 276 NONAME
+ _ZThn12_N18CPhoneUIController20HandleKeyLockEnabledEi @ 277 NONAME
+ _ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 278 NONAME
+ _ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 279 NONAME
+ _ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 280 NONAME
+ _ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 281 NONAME
+ _ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 282 NONAME
+ _ZThn12_N18CPhoneUIControllerD0Ev @ 283 NONAME
+ _ZThn12_N18CPhoneUIControllerD1Ev @ 284 NONAME
+ _ZThn12_N19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 285 NONAME
+ _ZThn12_N19CPhoneStateIncomingD0Ev @ 286 NONAME
+ _ZThn12_N19CPhoneStateIncomingD1Ev @ 287 NONAME
+ _ZThn12_N20CPhoneStateCallSetupD0Ev @ 288 NONAME
+ _ZThn12_N20CPhoneStateCallSetupD1Ev @ 289 NONAME
+ _ZThn16_N11CPhoneState14HandleCommandLEi @ 290 NONAME
+ _ZThn16_N11CPhoneState15ProcessCommandLEi @ 291 NONAME
+ _ZThn16_N11CPhoneStateD0Ev @ 292 NONAME
+ _ZThn16_N11CPhoneStateD1Ev @ 293 NONAME
+ _ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 294 NONAME
+ _ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 295 NONAME
+ _ZThn16_N15CPhoneStateIdleD0Ev @ 296 NONAME
+ _ZThn16_N15CPhoneStateIdleD1Ev @ 297 NONAME
+ _ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 298 NONAME
+ _ZThn16_N17CPhoneStateInCallD0Ev @ 299 NONAME
+ _ZThn16_N17CPhoneStateInCallD1Ev @ 300 NONAME
+ _ZThn16_N18CPhoneStateStartupD0Ev @ 301 NONAME
+ _ZThn16_N18CPhoneStateStartupD1Ev @ 302 NONAME
+ _ZThn16_N18CPhoneUIController14HandleCommandLEi @ 303 NONAME
+ _ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 304 NONAME
+ _ZThn16_N18CPhoneUIControllerD0Ev @ 305 NONAME
+ _ZThn16_N18CPhoneUIControllerD1Ev @ 306 NONAME
+ _ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 307 NONAME
+ _ZThn16_N19CPhoneStateIncomingD0Ev @ 308 NONAME
+ _ZThn16_N19CPhoneStateIncomingD1Ev @ 309 NONAME
+ _ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 310 NONAME
+ _ZThn16_N20CPhoneStateCallSetupD0Ev @ 311 NONAME
+ _ZThn16_N20CPhoneStateCallSetupD1Ev @ 312 NONAME
+ _ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 313 NONAME
+ _ZThn20_N11CPhoneStateD0Ev @ 314 NONAME
+ _ZThn20_N11CPhoneStateD1Ev @ 315 NONAME
+ _ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 316 NONAME
+ _ZThn20_N15CPhoneStateIdleD0Ev @ 317 NONAME
+ _ZThn20_N15CPhoneStateIdleD1Ev @ 318 NONAME
+ _ZThn20_N17CPhoneStateInCallD0Ev @ 319 NONAME
+ _ZThn20_N17CPhoneStateInCallD1Ev @ 320 NONAME
+ _ZThn20_N18CPhoneStateStartupD0Ev @ 321 NONAME
+ _ZThn20_N18CPhoneStateStartupD1Ev @ 322 NONAME
+ _ZThn20_N19CPhoneStateIncomingD0Ev @ 323 NONAME
+ _ZThn20_N19CPhoneStateIncomingD1Ev @ 324 NONAME
+ _ZThn20_N20CPhoneStateCallSetupD0Ev @ 325 NONAME
+ _ZThn20_N20CPhoneStateCallSetupD1Ev @ 326 NONAME
+ _ZThn24_N11CPhoneState19SetDivertIndicationEi @ 327 NONAME
+ _ZThn24_N11CPhoneStateD0Ev @ 328 NONAME
+ _ZThn24_N11CPhoneStateD1Ev @ 329 NONAME
+ _ZThn24_N15CPhoneStateIdleD0Ev @ 330 NONAME
+ _ZThn24_N15CPhoneStateIdleD1Ev @ 331 NONAME
+ _ZThn24_N17CPhoneStateInCallD0Ev @ 332 NONAME
+ _ZThn24_N17CPhoneStateInCallD1Ev @ 333 NONAME
+ _ZThn24_N18CPhoneStateStartupD0Ev @ 334 NONAME
+ _ZThn24_N18CPhoneStateStartupD1Ev @ 335 NONAME
+ _ZThn24_N19CPhoneStateIncomingD0Ev @ 336 NONAME
+ _ZThn24_N19CPhoneStateIncomingD1Ev @ 337 NONAME
+ _ZThn24_N20CPhoneStateCallSetupD0Ev @ 338 NONAME
+ _ZThn24_N20CPhoneStateCallSetupD1Ev @ 339 NONAME
+ _ZThn28_NK11CPhoneState17GetBlockedKeyListEv @ 340 NONAME
+ _ZThn32_N11CPhoneState25HandleNumberEntryClearedLEv @ 341 NONAME
+ _ZThn32_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 342 NONAME
+ _ZThn32_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 343 NONAME
+ _ZThn32_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 344 NONAME
+ _ZThn32_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 345 NONAME
+ _ZThn36_NK11CPhoneState11IsKeyLockOnEv @ 346 NONAME
+ _ZThn36_NK11CPhoneState12IsAutoLockOnEv @ 347 NONAME
+ _ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 348 NONAME
+ _ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 349 NONAME
+ _ZThn4_N11CPhoneStateD0Ev @ 350 NONAME
+ _ZThn4_N11CPhoneStateD1Ev @ 351 NONAME
+ _ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 352 NONAME
+ _ZThn4_N15CPhoneStateIdleD0Ev @ 353 NONAME
+ _ZThn4_N15CPhoneStateIdleD1Ev @ 354 NONAME
+ _ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 355 NONAME
+ _ZThn4_N17CPhoneStateInCallD0Ev @ 356 NONAME
+ _ZThn4_N17CPhoneStateInCallD1Ev @ 357 NONAME
+ _ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 358 NONAME
+ _ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 359 NONAME
+ _ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 360 NONAME
+ _ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 361 NONAME
+ _ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 362 NONAME
+ _ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 363 NONAME
+ _ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 364 NONAME
+ _ZThn4_N18CPhoneStateMachine5StateEv @ 365 NONAME
+ _ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 366 NONAME
+ _ZThn4_N18CPhoneStateMachineD0Ev @ 367 NONAME
+ _ZThn4_N18CPhoneStateMachineD1Ev @ 368 NONAME
+ _ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 369 NONAME
+ _ZThn4_N18CPhoneStateStartupD0Ev @ 370 NONAME
+ _ZThn4_N18CPhoneStateStartupD1Ev @ 371 NONAME
+ _ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 372 NONAME
+ _ZThn4_N18CPhoneUIController13HandleMessageEii @ 373 NONAME
+ _ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 374 NONAME
+ _ZThn4_N19CPhoneStateIncomingD0Ev @ 375 NONAME
+ _ZThn4_N19CPhoneStateIncomingD1Ev @ 376 NONAME
+ _ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 377 NONAME
+ _ZThn4_N20CPhoneStateCallSetupD0Ev @ 378 NONAME
+ _ZThn4_N20CPhoneStateCallSetupD1Ev @ 379 NONAME
+ _ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 380 NONAME
+ _ZThn8_N11CPhoneState15HandleLongHashLEv @ 381 NONAME
+ _ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 382 NONAME
+ _ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 383 NONAME
+ _ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 384 NONAME
+ _ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 385 NONAME
+ _ZThn8_N11CPhoneStateD0Ev @ 386 NONAME
+ _ZThn8_N11CPhoneStateD1Ev @ 387 NONAME
+ _ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 388 NONAME
+ _ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 389 NONAME
+ _ZThn8_N15CPhoneStateIdleD0Ev @ 390 NONAME
+ _ZThn8_N15CPhoneStateIdleD1Ev @ 391 NONAME
+ _ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 392 NONAME
+ _ZThn8_N17CPhoneStateInCallD0Ev @ 393 NONAME
+ _ZThn8_N17CPhoneStateInCallD1Ev @ 394 NONAME
+ _ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 395 NONAME
+ _ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 396 NONAME
+ _ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 397 NONAME
+ _ZThn8_N18CPhoneStateStartupD0Ev @ 398 NONAME
+ _ZThn8_N18CPhoneStateStartupD1Ev @ 399 NONAME
+ _ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 400 NONAME
+ _ZThn8_N18CPhoneUIControllerD0Ev @ 401 NONAME
+ _ZThn8_N18CPhoneUIControllerD1Ev @ 402 NONAME
+ _ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 403 NONAME
+ _ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 404 NONAME
+ _ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 405 NONAME
+ _ZThn8_N19CPhoneStateIncomingD0Ev @ 406 NONAME
+ _ZThn8_N19CPhoneStateIncomingD1Ev @ 407 NONAME
+ _ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 408 NONAME
+ _ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 409 NONAME
+ _ZThn8_N20CPhoneStateCallSetupD0Ev @ 410 NONAME
+ _ZThn8_N20CPhoneStateCallSetupD1Ev @ 411 NONAME
--- a/phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h Fri Jul 09 15:40:55 2010 +0300
@@ -71,10 +71,6 @@
*/
void StoreNumberEntryContentL();
- /**
- * Restores the number entry content from the cache
- */
- void RestoreNumberEntryContentL();
/**
* Check if number entry content is stored
@@ -89,11 +85,6 @@
void ClearNumberEntryContentCache();
/**
- * Creates number entry
- */
- void CreateNumberEntryL();
-
- /**
* Set Number Entry visibility.
* @param aVisible ETrue if numberentry is wanted to be shown
* (Note ETrue will set NE CBA's)
@@ -103,11 +94,6 @@
void SetNumberEntryVisibilityL( TPhoneCmdParamBoolean aVisible );
/**
- * Passes create number entry command forward if NE can be created.
- */
- void HandleCreateNumberEntryL();
-
- /**
* Check if number entry is used
* @return boolean value indicating that number entry is used
*/
@@ -125,20 +111,6 @@
*/
HBufC* PhoneNumberFromEntryLC() const;
- /**
- * Informs phoneengine that phone number has been edited i.e. phonenumber parser is run
- */
- void HandleNumberEntryEdited();
-
- /**
- * Handles key events in situations when there exists a number entry.
- * In this case number entry may be visible or hidden.
- * @param aKeyEvent - key event
- * @param aEventCode - event code
- */
- void KeyEventForExistingNumberEntryL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
/**
* Returns ETrue if alphanumeric characters are supported.
@@ -157,16 +129,6 @@
* Internal number entry handling methods.
*/
void NumberEntryClearL() const;
-
- /**
- * Returns ETrue if NumberEntry is in numeric mode.
- */
- TBool NumberEntryInNumericModeL();
-
- /**
- * Toggles alpha numeric mode.
- */
- TBool NumberEntryToggleAlphaNumericModeL();
private:
--- a/phoneapp/phoneuicontrol/inc/cphonestate.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestate.h Fri Jul 09 15:40:55 2010 +0300
@@ -121,26 +121,6 @@
TTimeIntervalMicroSeconds aKeyPressDuration );
/**
- * From CAknAppUi, initialise a menupane (dynamic).
- *
- * @param aResourceId It is the resource id for the pane.
- * @param aMenuPane It is the menu pane corresponding to the resource.
- */
- IMPORT_C virtual void DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane );
-
- /**
- * From CAknAppUi, initialise a menubar (dynamic).
- *
- * @param aResourceId It is the resource id for the bar.
- * @param aMenuBar It is the menu bar corresponding to the resource.
- */
- IMPORT_C virtual void DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar );
-
- /**
* From CEikAppUi. For Idle indicator
*/
IMPORT_C virtual void HandleSystemEventL(
@@ -245,29 +225,12 @@
IMPORT_C void HandleLongHashL();
/**
- * Informs view to start Transition effect
- * @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
*/
IMPORT_C TBool IsCustomizedDialerVisibleL() const;
/**
- * Closes customized dialer view
- */
- IMPORT_C void CloseCustomizedDialerL();
-
- /**
* Plays DTMF tone for key event
* */
IMPORT_C void HandleDtmfKeyToneL( const TKeyEvent& aKeyEvent,
@@ -352,18 +315,6 @@
*/
IMPORT_C TBool IsAnyQueryActiveL();
- /**
- * Check if menu bar is visible
- * @return boolean value indicating that menu bar is visible
- */
- IMPORT_C TBool IsMenuBarVisibleL() const;
-
- /**
- * Sets context menu to correspond the incall options menu
- *
- */
- IMPORT_C virtual void UpdateInCallContextMenuL();
-
/*
* If KFeatureIdFfSimlessOfflineSupport is undefined and
* UI shows note which will be closed by key event then
@@ -376,12 +327,6 @@
public: // NumberEntry functions.
/**
- * Passes create number entry command forward if NE can be created.
- */
- IMPORT_C virtual void HandleCreateNumberEntryL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
- /**
* Check if number entry is used
* @return boolean value indicating that number entry is used
*/
@@ -491,21 +436,6 @@
IMPORT_C void GetRemoteInfoDataL( TInt aCallId, TDes& aData );
/**
- * Sets context menu
- *
- * @param aResourceId resource
- */
- IMPORT_C virtual void SetContextMenuL( TInt aResourceId );
-
- /**
- * Sets context menu to correspond the incoming options menu
- *
- * @param aCallId incoming call id
- */
- IMPORT_C virtual void UpdateIncomingContextMenuL( TInt aCallId );
-
-
- /**
* Show note
* @param aResourceId resource id to be resolved
*/
@@ -533,12 +463,6 @@
TBool aSendKeyEnabled = EFalse );
/**
- * Check if note is visible
- * @return boolean value indicating that note is visible
- */
- IMPORT_C TBool IsNoteVisibleL();
-
- /**
* Handle numeric key event
*/
IMPORT_C virtual void HandleNumericKeyEventL(
@@ -686,42 +610,10 @@
IMPORT_C void SetTouchPaneButtons( TInt aResourceId );
/*
- * Sets touchpane visibility.
- *
- * @param ETrue if visible otherwise EFalse.
- */
- IMPORT_C void SetTouchPaneVisible( TBool aVisible );
-
- /*
* Destroys touchpane buttons.
*/
IMPORT_C void DeleteTouchPaneButtons();
- /*
- * Enables touchpane button that holds given command id.
- *
- * @param aCommandId Command id.
- */
- IMPORT_C void SetTouchPaneButtonEnabled( TInt aCommandId );
-
- /*
- * Disables touchpane button that holds given command id.
- *
- * @param aCommandId Command id.
- */
- IMPORT_C void SetTouchPaneButtonDisabled( TInt aCommandId );
-
- /*
- * Checks if DTMF editor is active,
- * @return true is DTMF is active
- */
- IMPORT_C TBool IsDTMFEditorVisibleL() const;
-
- /**
- * Closes dtmf editor.
- */
- IMPORT_C void CloseDTMFEditorL();
-
/**
* Set default flags values.
* No active call
@@ -745,16 +637,6 @@
* @param aCallId: the call id of the call
*/
IMPORT_C void HandleDisconnectingL( TInt aCallId );
-
- /**
- * Returns customized dialer menu resource id
- */
- IMPORT_C TInt CustomizedDialerMenuResourceIdL();
-
- /**
- * Returns customized dialer CBA resource id
- */
- IMPORT_C TInt CustomizedDialerCbaResourceIdL();
/**
* Opens soft reject message editor.
@@ -797,11 +679,6 @@
IMPORT_C void StoreNumberEntryContentL();
/**
- * Restores the number entry content from the cache
- */
- IMPORT_C void RestoreNumberEntryContentL();
-
- /**
* Clears the number entry content cache
*/
IMPORT_C void ClearNumberEntryContentCache();
@@ -817,11 +694,6 @@
IMPORT_C TBool IsOnScreenDialerSupported() const;
/**
- * Informs phoneengine that phone number has been edited i.e. phonenumber parser is run
- */
- IMPORT_C virtual void HandleNumberEntryEdited();
-
- /**
* Returns ETrue if alphanumeric characters are supported.
* @param aKeyEvent Key event.
* @return ETrue if alphanumeric chars are supported.
@@ -838,19 +710,6 @@
* 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 );
/**
* Sets toolbar loudspeaker button enabled.
@@ -880,11 +739,6 @@
TBool IsWaitingCallL( const TInt aCallId );
/**
- * Shows dtmf dialer
- */
- void ShowDtmfDialerL();
-
- /**
* Checks status of KFeatureIdSideVolumeKeys and KTelephonyLVFlagScrollVolumeKeys
* keys. If KTelephonyLVFlagScrollVolumeKeys is false and KFeatureIdSideVolumeKeys is true
* then side volume keys are only supported and method returns true, otherwise false.
@@ -902,12 +756,6 @@
private:
/**
- * Update incall indicator
- * @param aCallState a call state
- */
- void UpdateIncallIndicatorL( TInt aCallState );
-
- /**
* Handle EPEMessageChangedCallDuration
* @param aCallId call id of the message
*/
@@ -919,11 +767,6 @@
void UpdateProfileDisplayL();
/**
- * Update operator display
- */
- void UpdateOperatorDisplayL();
-
- /**
* Sends key down event to the phone engine
* @param aKeyEvent a key event
* @param aEventCode key event code
@@ -942,11 +785,6 @@
TEventCode aEventCode );
/**
- * ETrue if title pane is visible
- */
- TBool TitlePaneIsVisibleL() const;
-
- /**
* Change Audio volume level
* @param aLevel New volume level.
* @param aUpdateControl Set ETrue if volume ui control
@@ -1023,12 +861,6 @@
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();
@@ -1104,22 +936,6 @@
*/
void LoadResource( TDes& aData, const TInt aResource ) const;
- /**
- * Opens virtual keyboard.
- */
- void OpenVkbL();
-
- private: // NumberEntry functions.
-
- /**
- * Handles key events in situations when there exists a number entry.
- * In this case number entry may be visible or hidden.
- * @param aKeyEvent - key event
- * @param aEventCode - event code
- */
- void KeyEventForExistingNumberEntryL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
protected: // Data
--- a/phoneapp/phoneuicontrol/inc/cphonestatecallsetup.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestatecallsetup.h Fri Jul 09 15:40:55 2010 +0300
@@ -105,15 +105,6 @@
*/
IMPORT_C virtual void UpdateCbaL( TInt aResource );
- /**
- * Open menu bar
- */
- IMPORT_C virtual void OpenMenuBarL();
-
-
- // Prevents to open number entry dialog during call setup phase
- IMPORT_C virtual void HandleCreateNumberEntryL ( const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
private:
--- a/phoneapp/phoneuicontrol/inc/cphonestateidle.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestateidle.h Fri Jul 09 15:40:55 2010 +0300
@@ -212,11 +212,6 @@
void HandleIdleL( TInt aCallId );
/**
- * Launches application.
- */
- void LaunchApplicationL();
-
- /**
* Send Exit command
*/
void SendExitCommandL();
@@ -246,20 +241,8 @@
*/
TBool RestoreOngoing();
- /**
- * Handles back command.
- */
- void HandleBackCommandL();
- /**
- * Checks for application launching configurations from
- * central repository.
- * @param aCode key code.
- * @return ETrue if configuration found.
- */
- TBool CheckAppLaunchingL( const TKeyCode aCode );
-
- void HandleVoiceCallCommandL();
+ void HandleVoiceCallCommandL();
private:
--- a/phoneapp/phoneuicontrol/inc/cphonestateincall.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestateincall.h Fri Jul 09 15:40:55 2010 +0300
@@ -86,16 +86,6 @@
IMPORT_C virtual void ConstructL();
/**
- * Open menu bar
- */
- IMPORT_C virtual void OpenMenuBarL();
-
- /**
- * Launch the New call phone number query
- */
- IMPORT_C void LaunchNewCallQueryL();
-
- /**
* Call number fetched from New call dialog
* @param aFetchedNumber number fetched from the diaog
*/
@@ -144,19 +134,7 @@
* Close all dtmf dialogs
*/
IMPORT_C void CloseDtmfQueryL();
-
- /**
- * Creates number entry.
- */
- IMPORT_C void CreateNumberEntryL();
-
-
- /**
- * Concludes does the engine have information of the
- * phone number. This information is then send to the view.
- * @param aCallId - Call Id.
- */
- IMPORT_C void PhoneNumberAvailableInPhoneEngineL( TInt aCallId );
+
private: // New functions
@@ -195,31 +173,11 @@
* Sends DTMF sequence to Phone Engine
*/
void SendDtmfL();
-
- /**
- * Sends command to view for launching manual DTMF entry
- */
- void LaunchDtmfManualQueryL();
/**
* Sends command to view for launching DTMF list query
*/
void LaunchDtmfListQueryL();
-
- /**
- * Launch DTMF Single Item fetch dialog
- */
- void LaunchDtmfSearchDialogL();
-
- /**
- * Launch DTMF Single Item fetch for DTMF List query usage
- */
- void LaunchDtmfListViewSearchDialogL();
-
- /**
- * Launch New call fetch dialog
- */
- void LaunchNewCallSearchDialogL();
/**
* Sends command to view for 'Lock keypad'
@@ -227,16 +185,6 @@
void LockKeypadL();
/**
- * Handle successful single item fetch.
- */
- void HandleSuccessFetchedNumberL();
-
- /**
- * Handle failed single item fetch.
- */
- void HandleFailedFetchedNumberL();
-
- /**
* Update remote data and label to the call header.
* @param aCallId - Call Id.
* @param aCallHeaderData - Call header parameters where modifications
--- a/phoneapp/phoneuicontrol/inc/cphonestateincoming.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestateincoming.h Fri Jul 09 15:40:55 2010 +0300
@@ -98,15 +98,6 @@
*/
IMPORT_C virtual void ConstructL();
- /**
- * From CAknAppUi, initialise a menupane (dynamic).
- *
- * @param aResourceId It is the resource id for the pane.
- * @param aMenuPane It is the menu pane corresponding to the resource.
- */
- IMPORT_C virtual void DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane );
/**
* Audio play stopped handling
@@ -138,16 +129,6 @@
void OpenSoftRejectMessageL();
/**
- * Indicator if soft reject message editor is displayed
- */
- TBool SoftRejectMessageEditorIsDisplayedL() const;
-
- /**
- * Open menu bar
- */
- void OpenMenuBarL();
-
- /**
* Answer the MT call
*/
void AnswerCallL();
--- a/phoneapp/phoneuicontrol/inc/cphonestatestartup.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestatestartup.h Fri Jul 09 15:40:55 2010 +0300
@@ -95,12 +95,6 @@
private:
/**
- * Passes create number entry command forward if NE can be created.
- */
- IMPORT_C void HandleCreateNumberEntryL( const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
-
- /**
* Plays DTMF tone for key event
* */
IMPORT_C void HandleDtmfKeyToneL( const TKeyEvent& aKeyEvent,
--- a/phoneapp/phoneuicontrol/inc/cphonesystemeventhandler.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonesystemeventhandler.h Fri Jul 09 15:40:55 2010 +0300
@@ -53,14 +53,6 @@
public: // From MPhoneSystemEvents
- void DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane );
-
- void DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar );
-
void HandleSystemEventL( const TWsEvent& aEvent );
void HandleForegroundEventL( TBool aForeground );
--- a/phoneapp/phoneuicontrol/inc/cphoneuicontroller.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphoneuicontroller.h Fri Jul 09 15:40:55 2010 +0300
@@ -84,26 +84,6 @@
TEventCode aEventCode );
/**
- * From CAknAppUi, initialise a menupane (dynamic).
- *
- * @param aResourceId It is the resource id for the pane.
- * @param aMenuPane It is the menu pane corresponding to the resource.
- */
- IMPORT_C void DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane );
-
- /**
- * From CAknAppUi, initialise a menubar (dynamic).
- *
- * @param aResourceId It is the resource id for the bar.
- * @param aMenuBar It is the menu bar corresponding to the resource.
- */
- IMPORT_C void DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar );
-
- /**
* From CEikAppUi. For Idle indicator
*/
IMPORT_C void HandleSystemEventL(
--- a/phoneapp/phoneuicontrol/inc/mphonekeyevents.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/mphonekeyevents.h Fri Jul 09 15:40:55 2010 +0300
@@ -68,13 +68,6 @@
TTimeIntervalMicroSeconds aKeyPressDuration ) = 0;
virtual void HandleLongHashL() = 0;
-
- virtual TBool IsNoteVisibleL() = 0;
-
- virtual TBool IsMenuBarVisibleL() const = 0;
-
- virtual void HandleCreateNumberEntryL( const TKeyEvent& aKeyEvent,
- TEventCode aEventCode ) = 0;
virtual void HandleDtmfKeyToneL( const TKeyEvent& aKeyEvent,
TEventCode aEventCode ) = 0;
--- a/phoneapp/phoneuicontrol/inc/mphonestate.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/mphonestate.h Fri Jul 09 15:40:55 2010 +0300
@@ -49,7 +49,6 @@
public MPhoneDivertIF,
public MPhoneBlockedKeys,
public MPhoneNEClearedHandler,
- public MPhoneNumberEntryEvents,
public MPhoneLockInfo
{
public:
--- a/phoneapp/phoneuicontrol/inc/mphonesystemeventhandler.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/mphonesystemeventhandler.h Fri Jul 09 15:40:55 2010 +0300
@@ -38,26 +38,6 @@
virtual ~MPhoneSystemEventHandler(){};
/**
- * From CAknAppUi, initialise a menupane (dynamic).
- *
- * @param aResourceId It is the resource id for the pane.
- * @param aMenuPane It is the menu pane corresponding to the resource.
- */
- virtual void DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane ) = 0;
-
- /**
- * From CAknAppUi, initialise a menubar (dynamic).
- *
- * @param aResourceId It is the resource id for the bar.
- * @param aMenuBar It is the menu bar corresponding to the resource.
- */
- virtual void DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar ) = 0;
-
- /**
* From CEikAppUi. For Idle indicator
*/
virtual void HandleSystemEventL( const TWsEvent& aEvent ) = 0;
--- a/phoneapp/phoneuicontrol/inc/mphonesystemevents.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/mphonesystemevents.h Fri Jul 09 15:40:55 2010 +0300
@@ -39,26 +39,6 @@
virtual ~MPhoneSystemEvents(){};
/**
- * From CAknAppUi, initialise a menupane (dynamic).
- *
- * @param aResourceId It is the resource id for the pane.
- * @param aMenuPane It is the menu pane corresponding to the resource.
- */
- virtual void DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane ) = 0;
-
- /**
- * From CAknAppUi, initialise a menubar (dynamic).
- *
- * @param aResourceId It is the resource id for the bar.
- * @param aMenuBar It is the menu bar corresponding to the resource.
- */
- virtual void DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar ) = 0;
-
- /**
* From CEikAppUi. For Idle indicator
*/
virtual void HandleSystemEventL( const TWsEvent& aEvent ) = 0;
--- a/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -300,32 +300,13 @@
// ---------------------------------------------------------------------------
//
void CPhoneCallHeaderManager::SetPhoneNumberAvailabilityL(
- const TInt aNumberLength,
- const TBool aContactInfoAvailable )
+ const TInt /*aNumberLength*/,
+ const TBool /*aContactInfoAvailable*/ )
{
__LOGMETHODSTARTEND(
EPhoneControl,
"CPhoneCallHeaderManager::SetPhoneNumberAvailabilityL() ");
- TPhoneCmdParamBoolean phoneNumberAvailable;
- if( aNumberLength || aContactInfoAvailable )
- {
- // Phone number is available straight or via contact info
- // so switch to video/voice call is possible
- __PHONELOG( EBasic,
- EPhoneControl,
- "CPhoneCallHeaderManager::SetPhoneNumberAvailabilityL - Phonenumber is available" );
- phoneNumberAvailable.SetBoolean( ETrue );
- }
- else
- {
- __PHONELOG( EBasic,
- EPhoneControl,
- "CPhoneCallHeaderManager::SetPhoneNumberAvailabilityL - Phonenumber is not available" );
- phoneNumberAvailable.SetBoolean( EFalse );
- }
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewSetPhoneNumberAvailableInPhoneEngine,
- &phoneNumberAvailable );
+
}
// -----------------------------------------------------------
--- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -148,9 +148,6 @@
}
else
{
- TBool dtmfEditorVisible = iViewCommandHandle.HandleCommandL(
- EPhoneViewIsDTMFEditorVisible ) ==
- EPhoneViewResponseSuccess;
TPhoneCmdParamInteger activeCallCount;
iViewCommandHandle.ExecuteCommandL(
EPhoneViewGetCountOfActiveCalls, &activeCallCount );
@@ -162,11 +159,7 @@
TInt incomingCall = callStateData.CallId();
- if( dtmfEditorVisible )
- {
- resourceId = EPhoneDtmfDialerCBA;
- }
- else if( activeCallCount.Integer() == ENoActiveCalls )
+ if( activeCallCount.Integer() == ENoActiveCalls )
{
resourceId = EPhoneNumberAcqCBA;
}
@@ -281,10 +274,6 @@
{
softRejectActivated = EFalse;
}
- TPhoneCmdParamBoolean softRejectParam;
- softRejectParam.SetBoolean( softRejectActivated );
- iViewCommandHandle.ExecuteCommandL( EPhoneViewSetSoftRejectFlag,
- &softRejectParam );
TInt incomingCbaResourceId;
--- a/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -144,23 +144,6 @@
}
// -----------------------------------------------------------
-// CPhoneNumberEntryManager::RestoreNumberEntryContentL
-// -----------------------------------------------------------
-//
-void CPhoneNumberEntryManager::RestoreNumberEntryContentL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::RestoreNumberEntryContentL( ) ");
- if ( iNumberEntryContent )
- {
- // Restore the number entry content from cache
- TPtr ptr( iNumberEntryContent->Des() );
- iViewCommandHandle.ExecuteCommandL( EPhoneViewSetNumberEntryContent, 0, ptr );
- delete iNumberEntryContent;
- iNumberEntryContent = NULL;
- }
- }
-
-// -----------------------------------------------------------
// CPhoneNumberEntryManager::IsNumberEntryContentStored
// -----------------------------------------------------------
//
@@ -181,14 +164,6 @@
iNumberEntryContent = NULL;
}
-// -----------------------------------------------------------
-// CPhoneNumberEntryManager::CreateNumberEntryL
-// -----------------------------------------------------------
-void CPhoneNumberEntryManager::CreateNumberEntryL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::CreateNumberEntryL( ) ");
- iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry );
- }
// -----------------------------------------------------------
// CPhoneNumberEntryManager::SetNumberEntryVisibilityL
@@ -201,100 +176,6 @@
"CPhoneNumberEntryManager::SetNumberEntryVisibilityL : aVisible =%d",
aVisible.Boolean() );
iViewCommandHandle.ExecuteCommandL( EPhoneViewSetNumberEntryVisible, &aVisible );
- if ( aVisible.Boolean() )
- {
- // Set Number Entry CBA
- iCbaManager.UpdateCbaL( EPhoneNumberAcqCBA );
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneNumberEntryManager::HandleCreateNumberEntryL
-// add conditions here regarding when NE can be opened:
-// - activeidle is not the top most application
-// - any query is not visible
-// - dialog is not visible ("new call")
-// - information note is not visible ("life timer")
-// - options menu bar is not visible
-// - "switch to ..." -operation is not ongoing
-// -----------------------------------------------------------
-//
-void CPhoneNumberEntryManager::HandleCreateNumberEntryL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::HandleCreateNumberEntryL() ");
-
- const TBool autoLcokOn = iState->IsAutoLockOn();
- const TBool idleVal = false;
- const TBool queryActive = iState->IsAnyQueryActiveL();
- const TBool menuBarVisible = iState->IsMenuBarVisibleL();
-
- if( autoLcokOn ||
- ( idleVal /*== EPSAiForeground*/ ) ||
- ( menuBarVisible || queryActive ) )
- {
- __PHONELOG( EBasic, EPhoneControl,
- "CPhoneNumberEntryManager::HandleCreateNumberEntryL() NE NOT CREATED" );
- __PHONELOG2( EBasic, EPhoneControl,
- "CPhoneNumberEntryManager::HandleCreateNumberEntryL() autoLcokOn(%d) idleVal(%d)",
- autoLcokOn, idleVal );
- __PHONELOG2( EBasic, EPhoneControl,
- "CPhoneNumberEntryManager::HandleCreateNumberEntryL() queryActive(%d) menuBarVisible(%d)",
- queryActive, menuBarVisible );
- }
- else
- {
- //creates NE
- if( ( !iStateMachine.PhoneEngineInfo()->IsSwitchToOperationOngoing () ) &&
- ( !IsNumberEntryUsedL() ) &&
- ( !queryActive || FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) ) )
- {
- __PHONELOG( EBasic, EPhoneControl,
- "CPhoneNumberEntryManager::HandleCreateNumberEntryL() --create NE" );
-
- if ( iState->IsNoteDismissableL() )
- {
- iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveNote );
- }
-
- TPhoneCmdParamBoolean isSecurityMode;
- iViewCommandHandle.ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
- if( isSecurityMode.Boolean() )
- {
- iState->HandleCommandL( EPhoneNumberAcqSecurityDialer );
- }
- else
- {
- // Effect is shown when dialer is created.
- iState->BeginTransEffectLC( ENumberEntryCreate );
- iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry );
- iState->EndTransEffect();
- // Go to current state implementation
- iCbaManager.UpdateInCallCbaL();
- iState->UpdateInCallContextMenuL();
- iEnv.SyncNotifyFocusObserversOfChangeInFocus();
- }
- }
-
- //shows existing NE
- if ( ( !iStateMachine.PhoneEngineInfo()->IsSwitchToOperationOngoing () ) &&
- ( !IsNumberEntryVisibleL() ) &&
- ( !queryActive || FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) ) )
- {
- __PHONELOG( EBasic, EPhoneControl,
- "CPhoneNumberEntryManager::HandleCreateNumberEntryL() -- show NE" );
-
- if ( iState->IsNoteDismissableL() )
- {
- iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveNote );
- }
-
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- // Show the number entry
- SetNumberEntryVisibilityL(booleanParam);
- }
- }
-
}
// -----------------------------------------------------------
@@ -338,99 +219,6 @@
return phoneNumber;
}
-// -----------------------------------------------------------
-// CPhoneNumberEntryManager::HandleNumberEntryEdited
-// -----------------------------------------------------------
-//
-void CPhoneNumberEntryManager::HandleNumberEntryEdited()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneNumberEntryManager::HandleNumberEntryEdited( ) ");
- TBool isNumberEntryVisible( EFalse );
- TRAP_IGNORE( isNumberEntryVisible = IsNumberEntryVisibleL() );
-
- if( isNumberEntryVisible )
- {
- HBufC* phoneNumber( NULL );
- TRAP_IGNORE( phoneNumber = HBufC::NewL( KPhoneNumberEntryBufferSize ) );
- if( phoneNumber )
- {
- phoneNumber->Des().Zero();
- TPtr ptr( phoneNumber->Des() );
- TPhoneCmdParamString stringParam;
- stringParam.SetString( &ptr );
- TRAP_IGNORE( iViewCommandHandle.ExecuteCommandL(
- EPhoneViewGetNumberFromEntry,
- &stringParam ) );
- // Save the phone number
- iStateMachine.PhoneEngineInfo()->SetPhoneNumber( ptr );
-
- iStateMachine.SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessagePhoneNumberEdited );
-
- // remove the phone number
- delete phoneNumber;
-
- // Set service code flag to view
- TPhoneCmdParamBoolean serviceCodeParam;
- serviceCodeParam.SetBoolean(
- iStateMachine.PhoneEngineInfo()->PhoneNumberIsServiceCode() );
- TRAP_IGNORE( iViewCommandHandle.ExecuteCommandL(
- EPhoneViewSetServiceCodeFlag,
- &serviceCodeParam ) );
- }
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneNumberEntryManager::KeyEventForExistingNumberEntryL
-// -----------------------------------------------------------
-//
-void CPhoneNumberEntryManager::KeyEventForExistingNumberEntryL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneNumberEntryManager::KeyEventForExistingNumberEntryL( ) ");
-
- TPhoneCmdParamKeyEvent keyEventParam;
- keyEventParam.SetKeyEvent( aKeyEvent );
- keyEventParam.SetEventCode( aEventCode );
-
- if ( IsValidAlphaNumericKey( aKeyEvent, aEventCode ) )
- {
- iViewCommandHandle.HandleCommandL(
- EPhoneViewSendKeyEventToNumberEntry, &keyEventParam );
- }
- else if ( aKeyEvent.iCode == EKeyBackspace )
- {
- TPhoneViewResponseId resp = iViewCommandHandle.HandleCommandL(
- EPhoneViewSendKeyEventToNumberEntry, &keyEventParam );
-
- if ( resp == EPhoneViewResponseNumberEntryCleared )
- {
- // Remove number entry from screen
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewRemoveNumberEntry );
-
- // Stop DTMF tone playing just in case (user might be holding down a number
- // key when pressed 'clear' key).
- iStateMachine.SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
-
- // Handle state-specific behaviour when number entry is
- // cleared
- HandleNumberEntryClearedL();
- }
-
- }
- else if( aKeyEvent.iCode == EKeyLeftArrow ||
- aKeyEvent.iCode == EKeyRightArrow ||
- aKeyEvent.iCode == EKeyUpArrow ||
- aKeyEvent.iCode == EKeyDownArrow )
- {
- iViewCommandHandle.HandleCommandL(
- EPhoneViewSendKeyEventToNumberEntry, &keyEventParam );
- }
- }
-
// -----------------------------------------------------------------------------
// CPhoneNumberEntryManager::IsValidAlphaNumericKey
// Checks is the key event a number, a special character
@@ -496,29 +284,6 @@
iViewCommandHandle.ExecuteCommandL( EPhoneViewClearNumberEntryContent );
}
-// -----------------------------------------------------------
-// CPhoneNumberEntryManager::NumberEntryInNumericModeL
-// -----------------------------------------------------------
-//
-TBool CPhoneNumberEntryManager::NumberEntryInNumericModeL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::NumberEntryInNumericModeL( ) ");
- return iViewCommandHandle.HandleCommandL(
- EPhoneViewIsNumberEntryNumericMode ) == EPhoneViewResponseSuccess;
- }
-
-// -----------------------------------------------------------
-// CPhoneNumberEntryManager::NumberEntryToggleAlphaNumericModeL
-// -----------------------------------------------------------
-//
-TBool CPhoneNumberEntryManager::NumberEntryToggleAlphaNumericModeL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::NumberEntryToggleAlphaNumericModeL( ) ");
- TPhoneCmdParamBoolean newModeAlpha;
- // Toggle number entry alpha/numeric mode
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewToggleNumberEntryAlphaNumericMode, &newModeAlpha );
- return newModeAlpha.Boolean();
- }
+
--- a/phoneapp/phoneuicontrol/src/cphonestate.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -217,22 +217,10 @@
case MEngineMonitor::EPEMessageProfileChanged:
{
- TPhoneCmdParamBoolean keypadVolumeParam;
- if ( iStateMachine->PhoneEngineInfo()->KeypadVolume() == 0 )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewKeypadAudioDisabled );
- }
- else
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewKeypadAudioEnabled );
- }
- UpdateProfileDisplayL();
}
break;
case MEngineMonitor::EPEMessageRemoteTerminated:
- // Close menu bar, if it is displayed, for call ending note
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
/* Flow through */
case MEngineMonitor::EPEMessageDisconnecting:
HandleDisconnectingL( aCallId );
@@ -607,16 +595,6 @@
TBool CPhoneState::IsTouchDTmfDialerOn() const
{
TBool status( EFalse );
- if ( IsOnScreenDialerSupported() )
- {
- TBool isDialerVisible( EFalse );
- TRAP_IGNORE( isDialerVisible = IsDTMFEditorVisibleL() );
-
- if ( isDialerVisible )
- {
- status = ETrue;
- }
- }
return status;
}
// -----------------------------------------------------------------------------
@@ -632,8 +610,7 @@
{
if ( !IsTouchDTmfDialerOn()
- && !IsAnyQueryActiveL()
- && !IsMenuBarVisibleL() )
+ && !IsAnyQueryActiveL() )
{
// Send the key event to the phone engine.
SendKeyEventL( aKeyEvent, aEventCode );
@@ -644,20 +621,8 @@
// CPhoneState::IsKeyEventFurtherProcessed
// -----------------------------------------------------------------------------
//
-TBool CPhoneState::IsKeyEventFurtherProcessedL( const TKeyEvent& aKeyEvent ) const
+TBool CPhoneState::IsKeyEventFurtherProcessedL( const TKeyEvent& /*aKeyEvent*/ ) const
{
- // While being in some special keyboard mode (Full Screen&mini QWERTY,
- // handwriting mode) FEP sends only EEventKey -event and thus manual
- // DTMFs can not be played with the user specified tone lengths. Also,
- // in general, DTMFs are tried to play only in numeric mode.
- TBool numericMode = iViewCommandHandle->HandleCommandL(
- EPhoneViewIsNumberEntryNumericMode ) == EPhoneViewResponseSuccess;
-
- if ( ( aKeyEvent.iModifiers & EModifierSpecial ) != 0 || !numericMode )
- {
- return EFalse;
- }
-
return ETrue;
}
@@ -680,12 +645,6 @@
aErrorInfo.iCallId );
- // Sets touch buttons to correct status if error has occured.
- if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
- {
- iViewCommandHandle->ExecuteCommand( EPhoneResetTouchButtons );
- }
-
// Do the common error handling (display proper notes etc)
CPhoneMainErrorMessagesHandler::Instance()->ShowErrorSpecificNoteL( aErrorInfo );
@@ -865,15 +824,6 @@
EXPORT_C void CPhoneState::HandleDisconnectingL( TInt aCallId )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleDisconnectingL( ) ");
- // If there is no call in connected state then EPhoneDtmfTextQuery and EPhoneDtmfListQueryDialog
- // must be dismmissed from UI, therefore we must set EPhoneViewSetNoConnectedCalls to ETrue this
- // way we can ensure that CPhoneQueryController doesnt relaunch EPhoneDtmfListQueryDialog.
- if ( !IsAnyConnectedCalls() )
- {
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean(ETrue);
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetNoConnectedCalls, &booleanParam );
- }
TPhoneCmdParamCallHeaderData callHeaderParam;
callHeaderParam.SetCallState( EPEStateDisconnecting );
@@ -991,51 +941,15 @@
}
// -----------------------------------------------------------
-// CPhoneState::IsNoteVisibleL
-// -----------------------------------------------------------
-//
-EXPORT_C TBool CPhoneState::IsNoteVisibleL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IsNoteVisibleL( ) ");
- TPhoneCmdParamBoolean booleanParam;
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewGetIsNoteVisible, &booleanParam );
- return booleanParam.Boolean();
- }
-
-// -----------------------------------------------------------
-// CPhoneState::IsMenuBarVisibleL
-// -----------------------------------------------------------
-//
-EXPORT_C TBool CPhoneState::IsMenuBarVisibleL() const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IsMenuBarVisibleL( ) ");
- return iViewCommandHandle->HandleCommandL(
- EPhoneViewIsMenuBarVisible ) ==
- EPhoneViewResponseSuccess;
- }
-
-// -----------------------------------------------------------
// CPhoneState::HandleNumericKeyEventL
// -----------------------------------------------------------
//
EXPORT_C void CPhoneState::HandleNumericKeyEventL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode )
+ const TKeyEvent& /*aKeyEvent*/,
+ TEventCode /*aEventCode*/ )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleNumericKeyEventL( ) ");
- TBool numberEntryUsed = IsNumberEntryUsedL();
-
- if ( numberEntryUsed && ( aKeyEvent.iRepeats == 0 ||
- aKeyEvent.iScanCode == EStdKeyBackspace ||
- aKeyEvent.iScanCode ==EStdKeyLeftArrow ||
- aKeyEvent.iScanCode ==EStdKeyRightArrow ))
- {
- // Number entry exists but may be hidden
- KeyEventForExistingNumberEntryL( aKeyEvent, aEventCode );
- }
-
}
// -----------------------------------------------------------------------------
@@ -1176,66 +1090,6 @@
// <------------------------------ SYSTEM EVENTS ----------------------------->
-// -----------------------------------------------------------
-// CPhoneState::DynInitMenuPaneL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DynInitMenuPaneL( ) ");
- __ASSERT_DEBUG( aMenuPane && aResourceId,
- Panic( EPhoneCtrlParameterNotInitialized ) );
-
- // Save the number of digits in the number entry before processing
- // the menu pane
- if ( IsNumberEntryUsedL() )
- {
- TPhoneCmdParamBoolean serviceCodeParam;
- serviceCodeParam.SetBoolean(
- iStateMachine->PhoneEngineInfo()->PhoneNumberIsServiceCode() );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetServiceCodeFlag,
- &serviceCodeParam );
- }
-
- // Process the menu pane
- TPhoneCmdParamDynMenu dynMenuPane;
- dynMenuPane.SetResourceId( aResourceId );
- dynMenuPane.SetDynMenu( aMenuPane );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuPane, &dynMenuPane );
-
- if ( iCustomization )
- {
- // Menu pane is customized after default items are decided
- iCustomization->CustomizeMenuPaneL(aResourceId, aMenuPane);
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneState::DynInitMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DynInitMenuBarL( ) ");
- __ASSERT_DEBUG( aMenuBar && aResourceId,
- Panic( EPhoneCtrlParameterNotInitialized ) );
-
- TPhoneCmdParamDynMenu dynMenuBar;
- dynMenuBar.SetResourceId( aResourceId );
- dynMenuBar.SetDynMenu( aMenuBar );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBar, &dynMenuBar );
-
- if ( iCustomization )
- {
- // Menu bar is customized after default items are decided
- iCustomization->CustomizeMenuBarL(aResourceId, aMenuBar);
- }
-
- }
// -----------------------------------------------------------
// CPhoneState::HandleSystemEventL
@@ -1279,15 +1133,6 @@
// See implementation in CPhoneAppUI::HandleWsEventL
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandlePhoneFocusLostEventL( ) ");
- // Phone app focus lost -> close Dtmf dialer when visible
- if ( IsOnScreenDialerSupported() && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
- else if ( IsOnScreenDialerSupported() && IsCustomizedDialerVisibleL() )
- {
- CloseCustomizedDialerL();
- }
}
// ---------------------------------------------------------
// CPhoneState::HandleIdleForegroundEventL
@@ -1343,18 +1188,7 @@
"CPhoneState::HandlePropertyChangedL - aKey= %d", aKey );
__PHONELOG1( EBasic, EPhoneControl,
"CPhoneState::HandlePropertyChangedL - aValue= %d", aValue );
- if ( aCategory == KPSUidCtsyCallInformation )
- {
- // Call state event
- if ( aKey == KCTsyCallState )
- {
- // Update the incall indicator
- UpdateIncallIndicatorL( aValue );
- }
- }
-
- // Telephony information category
- else if ( aCategory == KPSUidTelInformation
+ if ( aCategory == KPSUidTelInformation
&& SimState() == EPESimUsable )
{
// Telephony display event
@@ -1414,18 +1248,6 @@
EPhoneViewResponseSuccess;
}
-// -----------------------------------------------------------
-// CPhoneState::TitlePaneIsVisibleL
-// -----------------------------------------------------------
-//
-TBool CPhoneState::TitlePaneIsVisibleL() const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::TitlePaneIsVisibleL( ) ");
- return iViewCommandHandle->HandleCommandL(
- EPhoneViewGetTitlePaneIsVisibleStatus ) ==
- EPhoneViewResponseSuccess;
- }
-
// <---------------------------- MENU AND CBA EVENTS ------------------------->
EXPORT_C TBool CPhoneState::HandleCommandL( TInt aCommand )
@@ -1436,49 +1258,26 @@
{
case EPhoneEmergencyCmdExit:
{
- //cancel emergency mode.
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetRetrictedDialer,&booleanParam );
}
// this should be bypasses?
case EPhoneDialerCallHandling:
case EPhoneCmdBack:
- BeginTransEffectLC( ENumberEntryClose );
// Remove number entry from screen
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
// Do state-specific behaviour if number entry is cleared
HandleNumberEntryClearedL();
- EndTransEffect();
break;
case EPhoneDialerCmdTouchInput:
- OpenVkbL();
break;
case EPhoneNumberAcqCmdSendMessage:
- // Open the mms editor
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSendMessage );
- if ( !IsOnScreenDialerSupported() )
- {
- // Remove number entry from screen
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- // Do state-specific behaviour if number entry is cleared
- HandleNumberEntryClearedL();
- }
break;
case EPhoneNumberAcqCmdSave:
- // Open Create contact
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewAddContact );
break;
case EPhoneNumberAcqCmdAddToName:
- // Open the message editor
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateContact );
break;
case EPhoneNumberAcqCmdAddToContacts:
@@ -1551,71 +1350,24 @@
case EPhoneInCallCmdActivatEPhonebook:
{
- // Launch Phonebook application
- TPhoneCmdParamAppInfo appInfoParam;
- appInfoParam.SetAppUid( KPhoneUidAppPhonebook );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewActivateApp, &appInfoParam );
}
break;
case EPhoneNumberAcqSecurityDialer:
{
- if ( IsOnScreenDialerSupported() && !IsNumberEntryUsedL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
- TPhoneCmdParamBoolean visibleMode;
- visibleMode.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetStatusPaneVisible, &visibleMode );
-
-
- // Set emergency CBA, empty - exit
- iCbaManager->SetCbaL( EPhoneEmergencyModeNoteCBA );
-
- // Set dialer to restricted mode.
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetRetrictedDialer,&booleanParam );
-
- NumberEntryManagerL()->CreateNumberEntryL();
- }
+
}
break;
case EPhoneDialerCmdContacts:
{
- // Launch Phonebook application
- TPhoneCmdParamAppInfo appInfoParam;
- appInfoParam.SetAppUid( KPhoneUidAppPhonebook );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewActivateApp, &appInfoParam );
}
break;
- case EPhoneViewYesSingleItemFetch:
- {
- if ( IsOnScreenDialerSupported() )
- {
- TBuf<KPhoneNumberEntryBufferSize> fetchContent;
- fetchContent = iViewCommandHandle->FetchContent();
- if ( fetchContent.Length() )
- {
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetNumberEntryContent,
- 0,
- fetchContent );
-
- CallFromNumberEntryL();
- }
- }
- }
- break;
case EPhoneNumberAcqCmdToggleNeAlphaMode:
case EPhoneNumberAcqCmdToggleNeNumericMode:
{
- // Toggle mode
- NumberEntryManagerL()->NumberEntryToggleAlphaNumericModeL();
+
}
break;
@@ -1650,16 +1402,6 @@
}
break;
- case EPhoneDialerCmdHelp:
- if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- TPtrC contextName;
- contextName.Set( KDATA_DIALER_HLP_MAIN() );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication, 0, contextName );
- }
- break;
-
case EPhoneCmdVideoCallOutOfMemory:
ShowVideoCallOutOfMemoryNoteL();
DisconnectCallL();
@@ -1979,8 +1721,7 @@
if ( IsOnScreenDialerSupported() )
{
- if ( IsDTMFEditorVisibleL() ||
- IsCustomizedDialerVisibleL() )
+ if ( IsCustomizedDialerVisibleL() )
{
return;
}
@@ -1992,11 +1733,6 @@
{
return;
}
- else if ( IsMenuBarVisibleL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- return;
- }
// Open recent calls list when the number entry is empty
TPhoneCmdParamInteger numberEntryCountParam;
iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
@@ -2021,10 +1757,7 @@
if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
{
- // Closing effect is shown when dialer exist.
- BeginTransEffectLC( ENumberEntryClose );
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- EndTransEffect();
HandleNumberEntryClearedL();
}
@@ -2116,30 +1849,9 @@
// Go to current state implementation
iCbaManager->UpdateInCallCbaL();
- //Update state of switch to video or voice call touch button.
- TPECallType type = iStateMachine->PhoneEngineInfo()->CallType( aCallId );
-
- if( type == EPECallTypeVideo )
- {
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetVideoCallFlag, &booleanParam );
- }
- else
- {
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetVideoCallFlag, &booleanParam );
- }
-
// Go to background if necessary
if ( NeedToSendToBackgroundL() || IsAutoLockOn() )
{
- // If number entry is used set control and visibility.
- if ( IsNumberEntryUsedL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
- }
}
// If there is no need to send back ground and number entry is used then
// we must show number entry.
@@ -2274,7 +1986,6 @@
if( activeCallCount.Integer() == ENoActiveCalls )
{
iCbaManager->UpdateIncomingCbaL( incomingCall );
- UpdateSilenceButtonDimming();
}
else
{
@@ -2310,55 +2021,6 @@
// <-------------------------- CONTEXT MENU ------------------------->
-// -----------------------------------------------------------------------------
-// CPhoneState::SetContextMenu
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::SetContextMenuL( TInt aResourceId )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SetContextMenuL() ");
-
- TPhoneCmdParamInteger integerParam;
- TInt resId( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- integerParam.SetInteger( resId );
- __PHONELOG1( EBasic, EPhoneControl,
- "CPhoneState::SetContextMenuL : resId =%d",resId );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateContextMenu,
- &integerParam );
- }
-// -----------------------------------------------------------------------------
-// CPhoneState::UpdateInCallContextMenuL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::UpdateInCallContextMenuL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateInCallContextMenuL() ");
-
- SetContextMenuL( EPhoneNumberAcqMenubar );
-
- }
-
-// -----------------------------------------------------------------------------
-// CPhoneState::UpdateIncomingContextMenuL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::UpdateIncomingContextMenuL( TInt aCallId )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateIncomingContextMenuL() ");
-
- if( CPhoneState::IsVideoCall ( aCallId ) )
- {
- SetContextMenuL( EPhoneIncomingVideoCallMenubar );
- }
- else
- {
- SetContextMenuL( EPhoneIncomingCallMenubar );
- }
-
- }
-
// -----------------------------------------------------------
// CPhoneState::ShowNoteL
// -----------------------------------------------------------
@@ -2601,79 +2263,6 @@
// <-------------------------- INTERNAL FUNCTIONS ------------------------>
// -----------------------------------------------------------
-// CPhoneState::UpdateIncallIndicatorL
-// -----------------------------------------------------------
-//
-void CPhoneState::UpdateIncallIndicatorL( TInt aCallState )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateIncallIndicatorL( ) ");
- TPhoneCmdParamIncallIndicatorData incallIndicatorParam;
-
- // Set the state
- incallIndicatorParam.SetCallState( aCallState );
-
- // Set mode
- incallIndicatorParam.SetMode(
- CPhonePubSubProxy::Instance()->Value(
- KPSUidCtsyCallInformation,
- KCTsyCallType ) );
-
- TInt activeCallId = GetActiveCallIdL();
- if ( activeCallId > KErrNotFound )
- {
- if ( iStateMachine->PhoneEngineInfo()->CallALSLine( activeCallId )
- == CCCECallParameters::ECCELineTypeAux )
- {
- incallIndicatorParam.SetLine2( ETrue );
- }
- }
-
- // Set the mute status
- const TBool audioMute = iStateMachine->PhoneEngineInfo()->AudioMute();
- incallIndicatorParam.SetMute( audioMute );
-
- // Set the voice privacy status
- if ( activeCallId > KErrNotFound &&
- activeCallId != KConferenceCallId )
- {
- incallIndicatorParam.SetCiphering(
- iStateMachine->PhoneEngineInfo()->IsSecureCall( activeCallId ) );
- }
- else
- {
- incallIndicatorParam.SetCiphering( ETrue );
- }
-
- incallIndicatorParam.SetCipheringIndicatorAllowed(
- iStateMachine->PhoneEngineInfo()->SecureSpecified() );
-
- // Set the emergency status
- if( EPEStateIdle != iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) )
- {
- incallIndicatorParam.SetEmergency( ETrue );
- }
-
- if( aCallState == EPSCTsyCallStateDisconnecting )
- {
- if ( TopAppIsDisplayedL() )
- {
- if ( ( !IsOnScreenDialerSupported() ) ||
- ( IsOnScreenDialerSupported() && !IsNumberEntryVisibleL() ) )
- {
- // Phone application is in the foreground so we don't need to
- // display the little bubble. If we don't hide it here then
- // it will appear for a short time. We don't want that.
- incallIndicatorParam.SetLittleBubbleVisible( EFalse );
- }
- }
- }
-
- // Update the in-call indicator
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateIncallIndicator,
- &incallIndicatorParam );
- }
-
-// -----------------------------------------------------------
// CPhoneState::UpdateProfileDisplayL
// -----------------------------------------------------------
//
@@ -2681,131 +2270,6 @@
{
}
-// -----------------------------------------------------------
-// CPhoneState::UpdateOperatorDisplayL
-// -----------------------------------------------------------
-//
-void CPhoneState::UpdateOperatorDisplayL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateOperatorDisplayL( ) ");
- __PHONELOG( EBasic, EPhoneControl, "CPhoneState::UpdateOperatorDisplayL" );
- // Get current title pane content.
- TTelTitleDisplay titleContent;
- titleContent.iDisplayTag.Zero();
- titleContent.iLogoHandle = 0;
- TPckg<TTelTitleDisplay> titlePckg( titleContent );
-
- RProperty::Get(
- KPSUidTelInformation,
- KTelDisplayInfo,
- titlePckg );
-
- if ( TitlePaneIsVisibleL() )
- {
- // There is a title pane icon.
- if ( titleContent.iLogoHandle != 0 )
- {
- // Set new logo.
- __PHONELOG( EBasic, EPhoneControl,
- "CPhoneState::UpdateOperatorDisplayL - logo found" );
-
- if( iLogoHandle != titleContent.iLogoHandle )
- {
- __PHONELOG( EBasic, EPhoneControl,
- "CPhoneState::UpdateOperatorDisplayL - set new logo" );
-
- TPhoneCmdParamBitmap bitmapParam;
-
- // Duplicate bitmap from handle.
- CFbsBitmap* bitmap = new (ELeave) CFbsBitmap;
- CleanupStack::PushL( bitmap );
- User::LeaveIfError(
- bitmap->Duplicate( titleContent.iLogoHandle ) );
- bitmapParam.SetBitmap( bitmap );
-
- // Duplicate and set bitmap mask if needed
- CFbsBitmap* maskBitmap = NULL;
- if( titleContent.iLogoMaskHandle != 0 )
- {
- maskBitmap = new( ELeave )CFbsBitmap;
- CleanupStack::PushL( maskBitmap );
- User::LeaveIfError( maskBitmap->Duplicate(
- titleContent.iLogoMaskHandle ) );
- bitmapParam.SetMaskBitmap( maskBitmap );
- }
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetTitlePanePicture,
- &bitmapParam );
-
- // The title pane takes ownership of the bitmaps so no need
- // to destroy it here.
- if( maskBitmap )
- {
- // Pop maskBitmap only, if it has been created
- CleanupStack::Pop( maskBitmap );
- }
- CleanupStack::Pop( bitmap );
- }
- }
- else
- {
- __PHONELOG1( EBasic, EPhoneControl,
- "CPhoneState::UpdateOperatorDisplayL - set text=%S", &titleContent.iDisplayTag );
- iLogoHandle = titleContent.iLogoHandle;
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetTitlePaneContent,
- 0,
- titleContent.iDisplayTag );
- }
- }
-
- // Check background image.
- TPhoneCmdParamBitmap savedBitmapParam;
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewGetBackgroundImageBitmap,
- &savedBitmapParam );
-
- if ( titleContent.iBackgroundImageHandle !=
- savedBitmapParam.Bitmap()->Handle() )
- {
- __PHONELOG2( EBasic, EPhoneControl,
- "CPhoneState::UpdateOperatorDisplayL - update background image since different titleContent(%d), saved(%d)",
- titleContent.iBackgroundImageHandle, savedBitmapParam.Bitmap()->Handle() );
- // Background image has changed. Duplicate bitmap from handle if
- // available; otherwise reset the background image
- CFbsBitmap* bitmap = new (ELeave) CFbsBitmap;
- CleanupStack::PushL( bitmap );
- TInt err = KErrNone;
- if ( titleContent.iBackgroundImageHandle != 0 )
- {
- err = bitmap->Duplicate( titleContent.iBackgroundImageHandle );
- }
- else
- {
- bitmap->Reset();
- }
-
- if ( err == KErrNone )
- {
- iBitmapRedrawCounter = titleContent.iBackgroundImageRedrawCounter;
- TPhoneCmdParamBitmap bitmapParam;
- bitmapParam.SetBitmap( bitmap );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetBackgroundImageBitmap,
- &bitmapParam );
- }
-
- CleanupStack::PopAndDestroy( bitmap );
- }
- else if ( titleContent.iBackgroundImageRedrawCounter !=
- iBitmapRedrawCounter )
- {
- iBitmapRedrawCounter = titleContent.iBackgroundImageRedrawCounter;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateView );
- }
- }
// -----------------------------------------------------------
// CPhoneState::HandleInitiatedEmergencyCallL
@@ -2827,9 +2291,6 @@
holdFlag.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
- // Undim Answer button for sure.
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
-
// Go to emergency call state
// No need update cba
iStateMachine->ChangeState( EPhoneStateEmergency );
@@ -3112,10 +2573,6 @@
// Remove number entry from screen
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-
- TPhoneCmdParamBoolean visibleMode;
- visibleMode.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetStatusPaneVisible, &visibleMode );
iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
@@ -3461,7 +2918,6 @@
TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetTouchPaneButtons,
&booleanParam ) );
- SetTouchPaneVisible( ETrue );
}
}
@@ -3477,54 +2933,6 @@
TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetTouchPaneButtons,
&boolParam ) );
- SetTouchPaneVisible( EFalse );
- }
- }
-
-// ---------------------------------------------------------
-// CPhoneState::SetTouchPaneVisible
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneState::SetTouchPaneVisible( TBool aVisible )
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
- {
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( aVisible );
- TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetTouchPaneVisible,
- &booleanParam ) );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CPhoneState::SetTouchButtonEnabled
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::SetTouchPaneButtonEnabled( TInt aCommandId )
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
- {
- TPhoneCmdParamInteger commandParam;
- commandParam.SetInteger( aCommandId );
- iViewCommandHandle->ExecuteCommand( EPhoneViewEnableTouchButton,
- &commandParam );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CPhoneState::SetTouchButtonDisabled
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::SetTouchPaneButtonDisabled( TInt aCommandId )
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
- {
- TPhoneCmdParamInteger commandParam;
- commandParam.SetInteger( aCommandId );
-
- iViewCommandHandle->ExecuteCommand( EPhoneViewDisableTouchButton,
- &commandParam );
}
}
@@ -3536,50 +2944,6 @@
{
__LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::HandleLongHashL() ");
- TPhoneCmdParamInteger numberEntryCountParam;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
- &numberEntryCountParam );
- TInt neLength( numberEntryCountParam.Integer() );
-
- if( iCustomization && iCustomization->AllowAlphaNumericMode() )
- {
- if ( NumberEntryManagerL()->NumberEntryInNumericModeL() )
- {
- if ( neLength == 0 )
- {
- OnlyHashInNumberEntryL();
- }
-
- if ( neLength == 1 )
- {
- NumberEntryClearL();
- }
- }
- NumberEntryManagerL()->NumberEntryToggleAlphaNumericModeL();
- }
- else
- {
- if( neLength == 1 )
- {
- TPhoneCmdParamBoolean isSecurityMode;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
-
- if ( !isSecurityMode.Boolean() )
- {
- OnlyHashInNumberEntryL();
- }
- }
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneState::OpenVKBL
-// -----------------------------------------------------------
-//
-void CPhoneState::OpenVkbL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::OpenVKB() ");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenVirtualKeyBoard );
}
// -----------------------------------------------------------
@@ -3596,36 +2960,6 @@
}
// -----------------------------------------------------------
-// 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;
- default:
- effectParam.SetType( EPhoneTransEffectNone );
- }
-
- iViewCommandHandle->ExecuteCommand( EPhoneViewBeginTransEffect, &effectParam );
-
- TCleanupItem operation( EffectCleanup, this );
- CleanupStack::PushL( operation );
- }
-
-// -----------------------------------------------------------
// CPhoneState::EndUiUpdate
// -----------------------------------------------------------
//
@@ -3635,15 +2969,6 @@
}
// -----------------------------------------------------------
-// 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.
@@ -3690,63 +3015,6 @@
EPhoneViewEndUpdate );
}
-// -----------------------------------------------------------------------------
-// CPhoneState::EffectCleanup
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::EffectCleanup(TAny* aThis )
- {
- TPhoneCmdParamTransEffect effectParam;
- effectParam.SetType( EPhoneTransEffectStop );
-
- static_cast<CPhoneState*>( aThis )->iViewCommandHandle->ExecuteCommand(
- EPhoneViewEndTransEffect, &effectParam );
- }
-
-// -----------------------------------------------------------------------------
-// CPhoneState::IsDTMFEditorVisibleL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TBool CPhoneState::IsDTMFEditorVisibleL() const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IsDTMFEditorVisibleL( ) ");
- return iViewCommandHandle->HandleCommandL(
- EPhoneViewIsDTMFEditorVisible ) ==
- EPhoneViewResponseSuccess;
- }
-
-// -----------------------------------------------------------------------------
-// CPhoneState::CloseDTMFEditorL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::CloseDTMFEditorL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::CloseDTMFEditorL()");
- if ( iOnScreenDialer ) // Touch
- {
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- // Disable dialer DTMF mode
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible,
- &booleanParam );
-
- // Closing effect is shown when DTMF dialer exist.
- BeginTransEffectLC( ENumberEntryClose );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- EndTransEffect();
- }
- else // Non-Touch
- {
- // If dtmf query is visible then remove number entry
- // because it should not be shown if user has pressed end key.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery );
- }
-
- // Do state-specific behaviour if number entry is cleared
- HandleNumberEntryClearedL();
- }
-
// -----------------------------------------------------------
// CPhoneState::SetDefaultFlagsL()
// -----------------------------------------------------------
@@ -4061,130 +3329,13 @@
return iCallHeaderManager;
}
-// -----------------------------------------------------------------------------
-// CPhoneState::CloseCustomizedDialerL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CPhoneState::CloseCustomizedDialerL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::CloseCustomizedDialerL( ) ");
-
- // Set dialer back to default mode.
- iViewCommandHandle->HandleCommandL( EPhoneViewHideCustomizedDialer );
-
- // Closing effect is shown when customized dialer exist.
- BeginTransEffectLC( ENumberEntryClose );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-
- EndTransEffect();
- // Do state-specific behaviour if number entry is cleared
- HandleNumberEntryClearedL();
- }
-
-// -----------------------------------------------------------------------------
-// CPhoneState::CustomizedDialerMenuResourceId
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt CPhoneState::CustomizedDialerMenuResourceIdL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneState::CustomizedDialerMenuResourceId( ) ");
- // Get and return customized dialer menu resource id
- TPhoneCmdParamInteger integerParam;
- iViewCommandHandle->HandleCommandL(
- EPhoneViewGetCustomizedDialerMenuResourceId,
- &integerParam );
- return integerParam.Integer();
- }
-
-// -----------------------------------------------------------------------------
-// CPhoneState::CustomizedDialerCbaResourceId
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt CPhoneState::CustomizedDialerCbaResourceIdL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneState::CustomizedDialerCbaResourceId( ) ");
- // Get and return customized dialer CBA resource id
- TPhoneCmdParamInteger integerParam;
- iViewCommandHandle->HandleCommandL(
- EPhoneViewGetCustomizedDialerCbaResourceId,
- &integerParam );
- return integerParam.Integer();
- }
-
-// -----------------------------------------------------------
-// CPhoneState::ShowDtmfDialerL
-// -----------------------------------------------------------
-//
-void CPhoneState::ShowDtmfDialerL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneState::ShowDtmfDialerL()" );
-
- // Set dialer to DTMF mode.
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible,
- &booleanParam );
-
- BeginTransEffectLC( ENumberEntryCreate );
-
- if ( IsNumberEntryUsedL() )
- {
- // Store the number entry content to cache
- if ( !IsNumberEntryContentStored() )
- {
- StoreNumberEntryContentL();
- }
- // Clear and display DTMF dialer
- NumberEntryClearL();
- SetNumberEntryVisibilityL(ETrue);
- }
- else
- {
- // Create and display DTMF dialer
- NumberEntryManagerL()->CreateNumberEntryL();
- }
-
- EndTransEffect();
-
- // Update CBA
- iCbaManager->UpdateInCallCbaL();
- }
-
// -----------------------------------------------------------
// CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer
// -----------------------------------------------------------
//
EXPORT_C void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer()
{
- if ( IsOnScreenDialerSupported() )
- {
- TBool isDialerVisible( EFalse );
- TRAP_IGNORE( isDialerVisible = IsDTMFEditorVisibleL() );
-
- if ( isDialerVisible )
- {
- TRAP_IGNORE( CloseDTMFEditorL() );
- }
-
- // if the DTMF dialer is used before the idle message, we have to
- // restore the original content of the number entry
- if ( IsNumberEntryContentStored() )
- {
- TBool isNumberEntryUsed( EFalse );
- TRAP_IGNORE( isNumberEntryUsed = IsNumberEntryUsedL() );
-
- if ( !isNumberEntryUsed )
- {
- TRAP_IGNORE( NumberEntryManagerL()->CreateNumberEntryL() );
- }
- // Restore the number entry content from cache
- TRAP_IGNORE( RestoreNumberEntryContentL() );
- }
- }
+
}
// -----------------------------------------------------------
@@ -4276,17 +3427,6 @@
}
// -----------------------------------------------------------
-// CPhoneState::KeyEventForExistingNumberEntryL
-// -----------------------------------------------------------
-//
-void CPhoneState::KeyEventForExistingNumberEntryL( const TKeyEvent& aKeyEvent,
- TEventCode aEventCode )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::KeyEventForExistingNumberEntryL( ) ");
- NumberEntryManagerL()->KeyEventForExistingNumberEntryL( aKeyEvent, aEventCode );
- }
-
-// -----------------------------------------------------------
// CPhoneState::HandleNumberEntryClearedL
// -----------------------------------------------------------
//
@@ -4312,17 +3452,6 @@
NumberEntryManagerL()->SetNumberEntryVisibilityL( booleanParam );
}
-// ---------------------------------------------------------
-// CPhoneState::HandleCreateNumberEntryL
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneState::HandleCreateNumberEntryL(
- const TKeyEvent& /*aKeyEvent*/,
- TEventCode /*aEventCode*/ )
- {
- NumberEntryManagerL()->HandleCreateNumberEntryL();
- }
-
// -----------------------------------------------------------
// CPhoneState::IsNumberEntryContentStored
// -----------------------------------------------------------
@@ -4344,15 +3473,6 @@
}
// -----------------------------------------------------------
-// CPhoneState::RestoreNumberEntryContentL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::RestoreNumberEntryContentL()
- {
- NumberEntryManagerL()->RestoreNumberEntryContentL();
- }
-
-// -----------------------------------------------------------
// CPhoneState::ClearNumberEntryContentCache
// -----------------------------------------------------------
//
@@ -4361,16 +3481,6 @@
TRAP_IGNORE( NumberEntryManagerL()->ClearNumberEntryContentCache() );
}
-// -----------------------------------------------------------
-// CPhoneState::HandleNumberEntryEdited
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::HandleNumberEntryEdited()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::HandleNumberEntryEdited() ");
- TRAP_IGNORE( NumberEntryManagerL()->HandleNumberEntryEdited() );
- }
-
// -----------------------------------------------------------------------------
// CPhoneState::IsAlphanumericSupportedAndCharInput
// -----------------------------------------------------------------------------
@@ -4403,28 +3513,6 @@
{
NumberEntryManagerL()->NumberEntryClearL();
}
-
-// -----------------------------------------------------------
-// CPhoneState::UpdateSilenceButtonDimming
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::UpdateSilenceButtonDimming()
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
- {
- const TProfileRingingType ringingType =
- iStateMachine->PhoneEngineInfo()->RingingType();
-
- TBool callIsAlerting =
- !(( ringingType == EProfileRingingTypeSilent ) ||
- ( ringingType == EProfileRingingTypeBeepOnce ));
-
- if ( !callIsAlerting )
- {
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
- }
- }
- }
// -----------------------------------------------------------
// CPhoneState::GetBlockedKeyList
@@ -4626,21 +3714,6 @@
}
}
}
-
-// ---------------------------------------------------------
-// CPhoneState::SetToolbarDimming
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneState::SetToolbarDimming( TBool aDimmed )
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
- {
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( aDimmed );
- TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetToolbarDimming, &booleanParam ));
- }
- }
// ---------------------------------------------------------
// CPhoneState::SetToolbarButtonLoudspeakerEnabled
@@ -4658,7 +3731,7 @@
}
// ---------------------------------------------------------
-// CPhoneState::SetToolbarDimming
+// CPhoneState::SetBackButtonActive
// ---------------------------------------------------------
//
EXPORT_C void CPhoneState::SetBackButtonActive( TBool aActive )
--- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -82,9 +82,7 @@
Panic( EPhoneCtrlInvariant ) );
CPhoneState::BaseConstructL();
-
- // Enable the volume display
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
+
HandleAudioOutputChangedL();
}
@@ -157,34 +155,16 @@
}
iDtmfWaitCharTimer->ButtonPressedL();
break;
-
- case EPhoneDialerCmdHelpDtmf:
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- TPtrC contextName( KDATA_DIALER_HLP_SEND_DTMF );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication,
- 0,
- contextName );
- }
- }
- break;
+
case EPhoneCmdOptions:
- OpenMenuBarL();
break;
case EPhoneInCallCmdDtmfManualQuery:
- if ( iOnScreenDialer )
- {
- ShowDtmfDialerL();
- }
break;
case EPhoneDtmfDialerExit: // fall through
case EPhoneDtmfDialerCancel:
- CloseDTMFEditorL();
break;
case EPhoneInCallCmdMute: // fall through
@@ -203,30 +183,6 @@
return commandStatus;
}
-// -----------------------------------------------------------
-// CPhoneStateCallSetup::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateCallSetup::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateCallSetup::OpenMenuBarL()" );
-
- if ( iOnScreenDialer )
- {
- if ( IsDTMFEditorVisibleL() && IsNumberEntryVisibleL() )
- {
- TInt resourceId = EPhoneDtmfDialerMenubar;
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
- }
- }
// -----------------------------------------------------------
// CPhoneStateCallSetup::HandleNumberEntryClearedL()
@@ -242,20 +198,6 @@
}
// -----------------------------------------------------------
-// CPhoneStateCallSetup::HandleCreateNumberEntryL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateCallSetup::HandleCreateNumberEntryL(
- const TKeyEvent& /*aKeyEvent*/,
- TEventCode /*aEventCode*/)
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateCallSetup::HandleCreateNumberEntryL()" );
-
- }
-
-
-// -----------------------------------------------------------
// CPhoneStateCallSetup::UpdateInCallCbaL
// -----------------------------------------------------------
//
@@ -272,14 +214,7 @@
EXPORT_C void CPhoneStateCallSetup::UpdateCbaL( TInt aResource )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::UpdateCbaL() ");
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- iCbaManager->SetCbaL( EPhoneDtmfDialerCBA );
- }
- else
- {
- iCbaManager->UpdateCbaL( aResource );
- }
+ iCbaManager->UpdateCbaL( aResource );
}
// -----------------------------------------------------------
@@ -375,15 +310,8 @@
// Remove number entry if long press
if ( IsNumberEntryUsedL() )
{
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
- else
- {
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewRemoveNumberEntry );
- }
+ iViewCommandHandle->ExecuteCommandL(
+ EPhoneViewRemoveNumberEntry );
}
}
else
@@ -578,26 +506,15 @@
booleanParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
BeginUiUpdateLC();
-
- // Remove the number entry if it isn't DTMF dialer
- /*if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- }*/
-
+
// Update the single call
CPhoneState::UpdateSingleActiveCallL( aCallId );
// Update touch buttons
SetTouchPaneButtons( EPhoneIncallButtons );
- SetToolbarDimming( EFalse );
-
EndUiUpdate();
// Go to single state
@@ -614,7 +531,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleIdleL()");
- BeginTransEffectLC ( ENumberEntryOpen );
BeginUiUpdateLC ();
// Disable the volume display
@@ -646,7 +562,6 @@
}
EndUiUpdate();
- EndTransEffect();
// Go to idle state
// No need update cba
iStateMachine->ChangeState( EPhoneStateIdle );
@@ -656,7 +571,7 @@
// CPhoneStateCallSetup::HandleRemoteTerminatedL
// -----------------------------------------------------------------------------
//
-void CPhoneStateCallSetup::HandleRemoteTerminatedL( TInt aCallId )
+void CPhoneStateCallSetup::HandleRemoteTerminatedL( TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleRemoteTerminatedL( ) ");
@@ -704,19 +619,12 @@
TPtr ptr( content->Des() );
dtmfSequence.SetString( &ptr );
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
+ if ( iOnScreenDialer )
{
iViewCommandHandle->ExecuteCommand(
EPhoneViewGetNumberFromEntry,
&dtmfSequence );
-
- CloseDTMFEditorL();
- }
- else
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
- &dtmfSequence );
- }
+ }
// Send the DTMF
if ( ptr.Length() )
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -56,8 +56,6 @@
#include "phoneui.pan"
#include "mphonecustomization.h"
-//CONSTANTS
-const TInt KMaxParamLength = 1024;
// ================= MEMBER FUNCTIONS =======================
@@ -85,14 +83,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::ConstructL() ");
CPhoneState::BaseConstructL();
-
- // Set send key activation on.
- TPhoneCmdParamBoolean boolean;
- boolean.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSendKeyDialerActivationFlag,
- &boolean );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewCreatePhoneBookServices );
}
// -----------------------------------------------------------
@@ -182,11 +172,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleKeyMessageL( ) ");
- if( aMessage == EPhoneKeyLongPress && CheckAppLaunchingL( aCode ) )
- {
- return;
- }
-
switch ( aCode )
{
case EKeyEnd:
@@ -221,11 +206,6 @@
{
return;
}
- else if ( IsMenuBarVisibleL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- return;
- }
else if ( neLength == 0 && !isSecurityMode.Boolean())
{
@@ -270,14 +250,6 @@
}
break;
- // "O" key
- case KPhoneDtmf0Character:
- if ( aMessage == EPhoneKeyLongPress && IsSimOk() )
- {
- LaunchApplicationL();
- }
- break;
-
#ifdef RD_INTELLIGENT_TEXT_INPUT
case EKeyEnter:
if ( IsNumberEntryVisibleL() )
@@ -368,12 +340,9 @@
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIncomingL( ) ");
HandleAudioAvailableOutputChangedL();
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
SetRingingTonePlaybackL( aCallId );
- BeginTransEffectLC( ENumberEntryClose );
BeginUiUpdateLC();
// Hide the number entry if it exists
@@ -395,14 +364,9 @@
EndUiUpdate();
- EndTransEffect();
-
// Go to incoming state
iCbaManager->UpdateIncomingCbaL( aCallId );
- UpdateSilenceButtonDimming();
- UpdateIncomingContextMenuL( aCallId );
- //Dim toolbar items
- SetToolbarDimming( ETrue );
+
//request that dimmed toolbar is visible.
iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
iStateMachine->ChangeState( EPhoneStateIncoming );
@@ -420,8 +384,6 @@
EXPORT_C void CPhoneStateIdle::HandleDialingL( TInt aCallId )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleDialingL( ) ");
-
- BeginTransEffectLC( ENumberEntryClose );
BeginUiUpdateLC();
// Display call setup
@@ -437,10 +399,6 @@
// Go to call setup state
iCbaManager->UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
-
- SetToolbarDimming( ETrue );
-
- EndTransEffect();
iStateMachine->ChangeState( EPhoneStateCallSetup );
}
@@ -466,8 +424,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
&uidParam );
}
-
- BeginTransEffectLC( ENumberEntryClose );
BeginUiUpdateLC();
// Remove the number entry
@@ -481,10 +437,8 @@
// Update touch buttons
SetTouchPaneButtons( EPhoneIncallButtons );
- SetToolbarDimming( EFalse );
EndUiUpdate();
- EndTransEffect();
// Go to single state
iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -504,15 +458,6 @@
{
case EPhoneCmdOptions:
{
- // Open number entry menubar
- TPhoneCmdParamInteger integerParam;
-
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneNumberAcqMenubar ) );
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewMenuBarOpen, &integerParam );
break;
}
@@ -528,7 +473,6 @@
break;
case EPhoneCmdBack:
- HandleBackCommandL();
break;
default:
@@ -552,14 +496,6 @@
{
case EAknSoftkeyContextOptions:
{
- // Open number entry OK menubar
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneNumberAcqOkMenubar ) );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewMenuBarOpen, &integerParam );
- commandStatus = ETrue;
}
break;
@@ -607,47 +543,6 @@
DialVoiceCallL();
}
}
-
-// -----------------------------------------------------------
-// CPhoneStateIdle::HandleBackCommandL
-// -----------------------------------------------------------
-//
-void CPhoneStateIdle::HandleBackCommandL()
- {
- TBool previousApp(EFalse);
- // If previous app activation is true then open
- // previous application.
- if ( iOnScreenDialer &&
- IsSimOk() )
- {
- TPhoneCmdParamBoolean booleanParam;
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewGetActivatePreviousApp, &booleanParam );
-
- if ( booleanParam.Boolean() )
- {
- // Open previous app.
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewActivatePreviousApp );
-
- // Remove number entry from screen
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewRemoveNumberEntry );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
- previousApp = ETrue;
- }
- }
-
- if ( !previousApp )
- {
- // Remove number entry from screen
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewRemoveNumberEntry );
- // Do state-specific operation when number entry is cleared
- HandleNumberEntryClearedL();
- }
- }
// -----------------------------------------------------------
// CPhoneStateIdle::DialVideoCallL
@@ -687,8 +582,6 @@
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DisplayIncomingCallL( ) ");
__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo() && aCallId >= 0,
Panic( EPhoneCtrlInvariant ) );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Remove any phone dialogs if they are displayed
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
@@ -737,9 +630,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::DisplayCallSetupL( ) ");
__ASSERT_DEBUG( aCallId > KErrNotFound, Panic( EPhoneCtrlParameterNotInitialized ) );
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
TPhoneCmdParamKeyCapture captureParam;
captureParam.SetKeyCode( EKeyNo );
@@ -780,13 +670,8 @@
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleForegroundEventL( ) ");
if ( IsNumberEntryUsedL() )
- {
- // If numberentry is used then we need to call EPhoneViewSetDialerControlVisible
- // to ensure that numberentry/dialler is drawn to UI.
- TPhoneViewResponseId respond =
- iViewCommandHandle->HandleCommandL( EPhoneViewSetDialerControlVisible );
-
- if ( respond && IsNumberEntryVisibleL() )
+ {
+ if ( IsNumberEntryVisibleL() )
{
// Set Number Entry CBA
iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
@@ -853,37 +738,6 @@
}
// -----------------------------------------------------------
-// CPhoneStateIdle::LaunchApplicationL()
-// -----------------------------------------------------------
-//
-void CPhoneStateIdle::LaunchApplicationL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::LaunchApplicationL( ) ");
- // Check if only one number exists in the number
- // entry
- TPhoneCmdParamInteger numberEntryCountParam;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
- &numberEntryCountParam );
-
- if ( numberEntryCountParam.Integer() == 1 )
- {
- // Remove the number entry window
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-
- iStateMachine->SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessageEndDTMF );
-
- // Launch application.
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchApplication );
-
- // Continue displaying current app but set up the
- // idle screen in the background
- SetupIdleScreenInBackgroundL();
- }
- }
-
-// -----------------------------------------------------------
// CPhoneStateIdle:SendExitCommandL
// -----------------------------------------------------------
//
@@ -925,7 +779,6 @@
{
//Cancels e.g. USB notifier and Audio notifier.
iViewCommandHandle->ExecuteCommandL( EPhoneViewCancelAllNotications );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewExitApplications );
// If KFeatureIdFfSimlessOfflineSupport is undef and security note is shown then do not
// remove security note from screen.
if ( !( IsSimStateNotPresentWithSecurityModeEnabled() &&
@@ -1006,20 +859,6 @@
{
__LOGMETHODSTARTEND( EPhoneControl, "CPhoneStateIdle::OnlyHashInNumberEntryL( ) ");
- if ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported(
- KTelephonyLVFlagMannerMode ) )
- {
- ChangeMannerModeL();
- }
- else
- {
- StartAlsLineChangeTimerL();
- }
-
- // Check if any application launch functionality
- // is configured for pressing hash for a long time
- // the return value of CheckAppLaunchingL ignored.
- CheckAppLaunchingL( TKeyCode( KPhoneDtmfHashCharacter ) );
}
// ---------------------------------------------------------
@@ -1086,69 +925,6 @@
return ( restoreValue & ( conn::EBURRestoreFull | conn::EBURRestorePartial ));
}
-// -----------------------------------------------------------------------------
-// CPhoneStateIdle::CheckAppLaunchingL
-// -----------------------------------------------------------------------------
-//
-TBool CPhoneStateIdle::CheckAppLaunchingL( const TKeyCode aCode )
- {
- TBool valuesFetched( EFalse );
-
- if( !IsSimOk() )
- {
- return valuesFetched;
- }
-
- TPhoneCmdParamAppInfo appInfo;
- HBufC8* appParam = HBufC8::NewL( KMaxParamLength );
- CleanupStack::PushL( appParam );
-
- TPhoneCmdParamInteger numberEntryCount;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
- &numberEntryCount );
-
- TBool isValidAppLaunchingKeyEvent = EFalse;
- if ( iCustomization && iCustomization->AllowAlphaNumericMode() &&
- TKeyCode( KPhoneDtmfHashCharacter ) == aCode )
- {
- // If alphanumeric mode is supported FEP changes text input mode with
- // long hash and removes hash from number entry.
- isValidAppLaunchingKeyEvent = ( numberEntryCount.Integer() == 0 );
- }
- else
- {
- isValidAppLaunchingKeyEvent = ( numberEntryCount.Integer() == 1 );
- }
-
- if ( isValidAppLaunchingKeyEvent )
- {
- TRAPD( err,
- CPhoneCenRepProxy::Instance()->FetchValuesFromCenRepL(
- appInfo, aCode, appParam, valuesFetched ) );
-
- if ( KErrNone == err && valuesFetched )
- {
- // Remove the number entry window
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-
- // Stop playing DTMF tone
- iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
-
- TPhoneCommandParam* phoneCommandParam =
- static_cast<TPhoneCommandParam*>( &appInfo );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewActivateAppViewConventional,
- phoneCommandParam );
-
- // Continue displaying current app but set up the
- // idle screen in the background
- SetupIdleScreenInBackgroundL();
- }
- }
- CleanupStack::PopAndDestroy( appParam );
- return valuesFetched;
- }
-
// -----------------------------------------------------------
// CPhoneStateIdle::HandleVoiceCallCommandL()
// -----------------------------------------------------------
--- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -91,8 +91,6 @@
__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(),
Panic( EPhoneCtrlInvariant ) );
CPhoneState::BaseConstructL();
- // Enable the volume display
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
}
// -----------------------------------------------------------
@@ -140,11 +138,7 @@
#ifdef RD_INTELLIGENT_TEXT_INPUT
case EKeyEnter:
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- SendDtmfL();
- }
- else if ( IsNumberEntryVisibleL() )
+ if ( IsNumberEntryVisibleL() )
{
HandleCommandL( EPhoneCmdOptions );
}
@@ -285,28 +279,16 @@
//Make sure that toolbar is not shown
iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
SetDefaultFlagsL();
if ( IsNumberEntryUsedL() )
{
- if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
- {
- CloseCustomizedDialerL();
- }
- else
- {
- iViewCommandHandle->ExecuteCommand(
- EPhoneViewGetNumberFromEntry,
- &stringParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- showDialer = ETrue;
- }
+ iViewCommandHandle->ExecuteCommand(
+ EPhoneViewGetNumberFromEntry,
+ &stringParam );
+ iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
+ showDialer = ETrue;
}
-
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
if ( !TopAppIsDisplayedL() || IsAutoLockOn() )
{
@@ -327,7 +309,6 @@
DeleteTouchPaneButtons();
EndUiUpdate();
- EndTransEffect();
// Display call termination note, if necessary
DisplayCallTerminationNoteL();
@@ -357,18 +338,7 @@
EXPORT_C void CPhoneStateInCall::UpdateCbaL( TInt aResource )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::UpdateCbaL() ");
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- iCbaManager->SetCbaL( EPhoneDtmfDialerCBA );
- }
- else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
- {
- iCbaManager->SetCbaL( CustomizedDialerCbaResourceIdL() );
- }
- else
- {
- iCbaManager->UpdateCbaL( aResource );
- }
+ iCbaManager->UpdateCbaL( aResource );
}
// -----------------------------------------------------------
@@ -546,13 +516,10 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenDialer );
break;
case EPhoneCmdOptions:
- OpenMenuBarL();
break;
case EPhoneDtmfDialerCancel:
{
- CloseDTMFEditorL();
-
// Activate DTMF list query when cancel is pressed.
// Forwards command to the framework
HandleCommandL( EPhoneInCallCmdDtmfListQuery );
@@ -560,7 +527,6 @@
break;
case EPhoneDtmfDialerExit:
{
- CloseDTMFEditorL();
}
break;
@@ -588,24 +554,14 @@
//DTMF list query - Search
case EPhoneInCallCmdDtmfListViewSearch:
- LaunchDtmfListViewSearchDialogL();
break;
//DTMF manual entry
case EPhoneInCallCmdDtmfManualQuery:
- if ( iOnScreenDialer )
- {
- ShowDtmfDialerL();
- }
- else
- {
- LaunchDtmfManualQueryL();
- }
break;
// DTMF manual entry - Search
case EPhoneCmdDtmfSearch:
- LaunchDtmfSearchDialogL();
break;
// DTMF entry - Ok
@@ -633,39 +589,13 @@
}
iDtmfWaitCharTimer->ButtonPressedL();
break;
-
- case EPhoneDialerCmdHelpDtmf:
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- TPtrC contextName( KDATA_DIALER_HLP_SEND_DTMF );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication,
- 0,
- contextName );
- }
- }
- break;
// New Call - Search
case EPhoneInCallCmdNewCallFind:
- LaunchNewCallSearchDialogL();
break;
// New Call - Dialog
case EPhoneInCallCmdNewCall:
- LaunchNewCallQueryL();
- break;
-
- case EPhoneViewYesSingleItemFetch:
- HandleSuccessFetchedNumberL();
- break;
-
- case EPhoneViewNoSingleItemFetch:
- if ( !iOnScreenDialer )
- {
- HandleFailedFetchedNumberL();
- }
break;
case EPhoneNumberAcqCmdCall:
@@ -703,23 +633,6 @@
}
break;
- case EPhoneInCallCmdHelp:
- if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- TPtrC contextName;
- if ( IsVideoCallActiveL() )
- {
- contextName.Set( KINCAL_HLP_VIDEOCALL() );
- }
- else
- {
- contextName.Set( KINCAL_HLP_CALL_HANDLING() );
- }
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication, 0, contextName );
- }
- break;
-
case EPhoneCmdEnd:
CloseDtmfQueryL();
CPhoneState::DisconnectCallL();
@@ -774,110 +687,6 @@
return commandStatus;
}
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::CreateNumberEntryL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::CreateNumberEntryL()
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneStateInCall::CreateNumberEntryL( ) ");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateNumberEntry );
- }
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::OpenMenuBarL()" );
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
- {
- resourceId = CustomizedDialerMenuResourceIdL();
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneCallHandlingMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneCallHandlingMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::LaunchNewCallQueryL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::LaunchNewCallQueryL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::LaunchNewCallQueryL()" );
-
- if ( iOnScreenDialer )
- {
- //In touch, just activate dialer
- BeginTransEffectLC( ENumberEntryCreate );
- if ( IsNumberEntryUsedL() )
- {
- SetNumberEntryVisibilityL(ETrue);
- }
- else
- {
- CreateNumberEntryL();
- SetNumberEntryVisibilityL(ETrue);
- }
- EndTransEffect();
- }
- else
- {
- HBufC *text = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( text->Des() );
-
- // Pre-populate the query with the number entry contents,
- // if it exists
- if ( IsNumberEntryUsedL() )
- {
- // get the number entry contents
- TPhoneCmdParamString stringParam;
- stringParam.SetString( &ptr );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewGetLocalizedNumberFromEntry,
- &stringParam );
- }
-
- // Show text query with send key enabled
- const TBool enableSendKey = ETrue;
-
- CPhoneState::ShowTextQueryL(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneNewCallPhoneNumberEditor ),
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneCallHandlingNewCallFindCBA ),
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneCallHandlingNewCallCallCBA ),
- &ptr,
- enableSendKey );
-
- CleanupStack::PopAndDestroy( text );
- }
-
- }
// -----------------------------------------------------------
// CPhoneStateInCall::CallFetchedNumberL
@@ -914,19 +723,13 @@
TPtr ptr( content->Des() );
dtmfSequence.SetString( &ptr );
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
+ if ( iOnScreenDialer )
{
iViewCommandHandle->ExecuteCommand(
EPhoneViewGetNumberFromEntry,
&dtmfSequence );
- CloseDTMFEditorL();
- }
- else
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
- &dtmfSequence );
- }
+ }
// Send the DTMF
if ( ptr.Length() )
@@ -940,38 +743,6 @@
}
// -----------------------------------------------------------
-// CPhoneStateInCall::LaunchDtmfManualQueryL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::LaunchDtmfManualQueryL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateInCall::LaunchDtmfManualQueryL()" );
-
- HBufC *text = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( text->Des() );
- // Pre-populate the query with the number entry contents, if it exists
- if ( IsNumberEntryUsedL() )
- {
- // get the number entry contents
- TPhoneCmdParamString stringParam;
- stringParam.SetString( &ptr );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewGetLocalizedNumberFromEntry,
- &stringParam );
- }
-
- ShowDtmfTextQueryL(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneDtmfNumberQuery ),
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneSendDtmfEmptyEditBoxCBA ),
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneSendDtmfNormalEditBoxCBA ),
- &ptr );
- CleanupStack::PopAndDestroy( text );
- }
-
-// -----------------------------------------------------------
// CPhoneStateInCall::LaunchDtmfListQueryL
// -----------------------------------------------------------
//
@@ -1042,57 +813,7 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewShowQuery,
&queryDialogParam );
}
- }
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::LaunchDtmfSearchDialogL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::LaunchDtmfSearchDialogL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::LaunchDtmfSearchDialogL()" );
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger( EPhoneDtmfNumberQuery );
- iViewCommandHandle->HandleCommandL( EPhoneViewOpenSingleItemFetchDialog, &integerParam );
- }
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::LaunchDtmfListViewSearchDialogL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::LaunchDtmfListViewSearchDialogL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::LaunchDtmfListViewSearchDialogL()" );
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger( EPhoneDtmfFetchTitle );
- iViewCommandHandle->HandleCommandL( EPhoneViewOpenSingleItemFetchDialog, &integerParam );
- }
-
-// -----------------------------------------------------------
-// CPhoneStateInCall::LaunchNewCallSearchDialogL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::LaunchNewCallSearchDialogL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::LaunchNewCallSearchDialogL()" );
-
- TPhoneCmdParamBoolean blockingDialogStatus;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetBlockingDialogStatus,
- &blockingDialogStatus );
- // Prevents unlegal use of singleitem fetch
- if ( !blockingDialogStatus.Boolean() )
- {
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger( EPhoneNewCallFetchTitle );
- iViewCommandHandle->HandleCommandL( EPhoneViewOpenSingleItemFetchDialog, &integerParam );
- }
- }
+ }
// ---------------------------------------------------------
// CPhoneStateInCall::IsVideoCallActiveL
@@ -1244,144 +965,15 @@
EPhoneViewEnableKeyLock );
}
}
-
-// -----------------------------------------------------------------------------
-// CPhoneStateInCall::HandleSuccessFetchedNumberL
-// -----------------------------------------------------------------------------
-//
-void CPhoneStateInCall::HandleSuccessFetchedNumberL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::HandleSuccessFetchedNumberL()");
- TBuf<KPhoneNumberEntryBufferSize> fetchContent;
- fetchContent = iViewCommandHandle->FetchContent();
-
- TPhoneCmdParamInteger fetchTypeParam;
- iViewCommandHandle->ExecuteCommand( EPhoneViewGetSingleItemFetchType,
- &fetchTypeParam );
- TInt fetchType( fetchTypeParam.Integer() );
-
- if ( fetchType == EPhoneNewCallFetchTitle )
- {
- if ( iOnScreenDialer )
- {
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetNumberEntryContent,
- 0,
- fetchContent );
- }
- // Call the fetched number
- CallFetchedNumberL( fetchContent );
- }
- else if ( fetchType == EPhoneDtmfFetchTitle )
- {
- // Send the DTMF
- iStateMachine->PhoneEngineInfo()->SetDtmfStringCommand( fetchContent );
- iStateMachine->SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessageSendDTMF );
- }
- else if( iCustomization && fetchType > EPhoneRssBaseLast )
- {
- // Handle unattended transfer contact fetch
- iCustomization->HandleCommandL( fetchType );
- }
- else // EPhoneCmdDtmfSearch
- {
- // Send the DTMF
- iStateMachine->PhoneEngineInfo()->SetDtmfStringCommand( fetchContent );
- iStateMachine->SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessageSendDTMF );
- }
- }
-
-// -----------------------------------------------------------------------------
-// CPhoneStateInCall::HandleFailedFetchedNumberL
-// -----------------------------------------------------------------------------
-//
-void CPhoneStateInCall::HandleFailedFetchedNumberL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::HandleFailedFetchedNumberL()");
-
- TPhoneCmdParamInteger fetchTypeParam;
- iViewCommandHandle->ExecuteCommand( EPhoneViewGetSingleItemFetchType,
- &fetchTypeParam );
- TInt fetchType( fetchTypeParam.Integer() );
-
- if ( fetchType == EPhoneNewCallFetchTitle )
- {
- HandleCommandL( EPhoneInCallCmdNewCall );
- }
- else if ( fetchType == EPhoneDtmfFetchTitle )
- {
- HandleCommandL( EPhoneInCallCmdDtmfListQuery );
- }
- else // EPhoneCmdDtmfSearch
- {
- HandleCommandL( EPhoneDtmfFetchTitle );
- }
- }
-
// -----------------------------------------------------------------------------
// CPhoneStateInCall::CloseDtmfQueryL
// -----------------------------------------------------------------------------
//
EXPORT_C void CPhoneStateInCall::CloseDtmfQueryL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::CloseDtmfQueryL()");
- TPhoneCmdParamInteger fetchTypeParam;
- iViewCommandHandle->ExecuteCommand( EPhoneViewGetSingleItemFetchType,
- &fetchTypeParam );
- TInt fetchType( fetchTypeParam.Integer() );
-
- // If DTMF fetch is active then remove numberentry because it is considered
- // to be a part of DTMF fetch operation.
- if ( fetchType == EPhoneDtmfFetchTitle )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- iViewCommandHandle->ExecuteCommand( EPhoneViewCloseSingleItemFetchDialog );
- }
-
- // Close dtmf dialer or dtmf query if exist.
- if ( IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
+ {
}
-// -----------------------------------------------------------
-// CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL() ");
- TPhoneCmdParamBoolean phoneNumberAvailable;
-
- const TBool contactInfoAvailable =
- iStateMachine->PhoneEngineInfo()->RemoteName( aCallId ).Length() ||
- iStateMachine->PhoneEngineInfo()->RemoteCompanyName( aCallId ).Length();
-
- if( iStateMachine->PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() ||
- contactInfoAvailable )
- {
- // Phone number is available straight or via contact info
- // so switch to video/voice call is possible
- __PHONELOG( EBasic, EPhoneControl, "CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL - Phonenumber is available" );
- phoneNumberAvailable.SetBoolean( ETrue );
- }
- else
- {
- __PHONELOG( EBasic, EPhoneControl, "CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL - Phonenumber is not available" );
- phoneNumberAvailable.SetBoolean( EFalse );
- }
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetPhoneNumberAvailableInPhoneEngine,
- &phoneNumberAvailable );
- }
-
// -----------------------------------------------------------------------------
// CPhoneStateInCall::HandleEndKeyPressL
@@ -1427,20 +1019,11 @@
if ( IsNumberEntryUsedL() )
{
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
- else
- {
- BeginTransEffectLC( ENumberEntryClose );
- // Remove number entry from screen
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewRemoveNumberEntry );
- EndTransEffect();
- // Do state-specific operation when number entry is cleared
- HandleNumberEntryClearedL();
- }
+ // Remove number entry from screen
+ iViewCommandHandle->ExecuteCommandL(
+ EPhoneViewRemoveNumberEntry );
+ // Do state-specific operation when number entry is cleared
+ HandleNumberEntryClearedL();
}
if ( !TopAppIsDisplayedL() )
@@ -1453,15 +1036,7 @@
}
}
else
- {
- if ( IsNumberEntryUsedL() )
- {
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
- }
-
+ {
// handle short end key
CPhoneState::DisconnectCallL();
}
--- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -153,7 +153,6 @@
"CPhoneStateIncoming::HandleNumberEntryClearedL ()" );
// Set incoming call CBA when number entry is cleared
iCbaManager->UpdateIncomingCbaL( iRingingCallId );
- UpdateSilenceButtonDimming();
}
// -----------------------------------------------------------
@@ -219,12 +218,6 @@
// Answer the call if long press of selection key
AnswerCallL();
}
- else if ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported(
- KTelephonyLVFlagCoverHideSendEndKey ))
- {
- // Open number entry OK menubar
- OpenMenuBarL();
- }
break;
case EKeyDeviceF:
@@ -387,8 +380,6 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
}
-
- BeginTransEffectLC( ENumberEntryOpen );
if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
&& iStateMachine->PhoneStorage()->IsScreenLocked() )
@@ -405,11 +396,9 @@
UpdateSingleActiveCallL( aCallId );
SetTouchPaneButtons( EPhoneIncallButtons );
- SetToolbarDimming( EFalse );
SetBackButtonActive(ETrue);
EndUiUpdate();
- EndTransEffect();
// Go to single state
iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -425,24 +414,9 @@
{
__LOGMETHODSTARTEND(EPhoneControl,
"CPhoneStateIncoming::HandleAudioPlayStoppedL ()" );
- // Update the CBA
-
// Set the ringtone silenced status
iCbaManager->SetRingtoneSilencedStatus( ETrue );
TInt resourceId = EPhoneCallHandlingIncomingRejectCBA;
- // Get the soft reject flag status
- TPhoneCmdParamBoolean softRejectParam;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSoftRejectFlag,
- &softRejectParam );
-
- if ( IsNumberEntryVisibleL() && !iOnScreenDialer )
- {
- resourceId = EPhoneNumberAcqCBA;
- }
- else if ( softRejectParam.Boolean() )
- {
- resourceId = EPhoneCallHandlingIncomingSoftRejectCBA;
- }
iCbaManager->SetCbaL( resourceId );
}
@@ -454,8 +428,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl,
"CPhoneStateIncoming::HandleIdleL ()" );
-
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
// Enable call UI
@@ -470,8 +442,6 @@
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Stop tone playing, if necessary
iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
@@ -489,8 +459,6 @@
// Return phone to the background if send to background is needed.
iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
// Set Number Entry CBA
iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
}
@@ -500,8 +468,7 @@
SetNumberEntryVisibilityL(ETrue);
}
}
- else if ( NeedToSendToBackgroundL() ||
- SoftRejectMessageEditorIsDisplayedL() )
+ else if ( NeedToSendToBackgroundL() )
{
// Continue displaying current app but set up the
// idle screen in the background
@@ -517,7 +484,6 @@
SetBackButtonActive(ETrue);
EndUiUpdate();
- EndTransEffect();
// Go to idle state
iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
iStateMachine->ChangeState( EPhoneStateIdle );
@@ -539,8 +505,6 @@
// Stop tone playing, if necessary.
// And stop vibrating, if it is active.
iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
- // Open the menu bar
- OpenMenuBarL();
break;
case EPhoneCallComingCmdAnswer:
@@ -563,8 +527,6 @@
case EPhoneCallComingCmdSilent:
// Silence the ringer. And stop vibrating, if it is active.
iViewCommandHandle->ExecuteCommandL( EPhoneViewMuteRingTone );
- // Dim silence button
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
HandleAudioPlayStoppedL();
iStateMachine->SendPhoneEngineMessage(
MPEPhoneModel::EPEMessageStopTonePlay );
@@ -579,22 +541,6 @@
HandleSendL();
break;
- case EPhoneInCallCmdHelp:
- {
- TPtrC contextName;
- if( IsVideoCall( iRingingCallId ) )
- {
- contextName.Set( KINCAL_HLP_VIDEOCALL() );
- }
- else
- {
- contextName.Set( KINCAL_HLP_CALL_HANDLING() );
- }
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication, 0, contextName );
- }
- break;
-
default:
commandStatus = CPhoneState::HandleCommandL( aCommand );
break;
@@ -675,14 +621,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl,
"CPhoneStateIncoming::OpenSoftRejectMessageEditorL ()" );
- // Clear the soft reject flag
- TPhoneCmdParamBoolean softRejectParam;
- softRejectParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSoftRejectFlag,
- &softRejectParam );
-
- // Dim silence button
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
// Silence the vibrating
iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
@@ -716,76 +654,6 @@
EPhoneViewOpenSoftRejectEditor, &sfiDataParam );
}
-// -----------------------------------------------------------
-// CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL
-// -----------------------------------------------------------
-//
-TBool CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL() const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL () ");
- // Get the foreground application window group id
- TPhoneCmdParamInteger foregroundAppParam;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetForegroundApplication,
- &foregroundAppParam );
-
- // Get the soft reject message editor window group id
- TPhoneCmdParamInteger softRejectMessageEditorWgId;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSoftRejectWindowGroupId,
- &softRejectMessageEditorWgId );
-
- __PHONELOG1(
- EBasic,
- EPhoneControl,
- "CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL() SoftRejectGroupId %d",
- softRejectMessageEditorWgId.Integer() );
- __PHONELOG1(
- EBasic,
- EPhoneControl,
- "CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL() ForegroundAppGroupId %d",
- foregroundAppParam.Integer() );
- // Return ETrue if soft reject message editor is displayed
- return softRejectMessageEditorWgId.Integer() == foregroundAppParam.Integer();
- }
-
-// -----------------------------------------------------------
-// CPhoneStateIncoming::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneStateIncoming::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateIncoming::OpenMenuBarL ()" );
- TInt resourceId;
-
- // Determine the correct menu bar to display
- if ( CPhoneState::IsNumberEntryVisibleL() )
- {
- resourceId = GetNumberEntryVisibleMenuBar();
- }
- else
- {
- resourceId = GetNumberEntryNotVisibleMenuBar();
- }
-
- // Silence the ringer. And stop vibrating, if it is active.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
- iStateMachine->SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessageStopTonePlay );
-
- //Set correct cba
- HandleAudioPlayStoppedL();
-
- // Dim button
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
-
- // Open the menu bar
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
// -----------------------------------------------------------
// CPhoneStateIncoming::GetNumberEntryVisibleMenuBar
@@ -820,39 +688,6 @@
}
// -----------------------------------------------------------
-// CPhoneStateIncoming::DynInitMenuPaneL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateIncoming::DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::DynInitMenuPaneL() ");
- __ASSERT_DEBUG( aMenuPane && aResourceId,
- Panic( EPhoneCtrlParameterNotInitialized ) );
-
- // Save the number of digits in the number entry before processing
- // the menu pane
- if ( IsNumberEntryUsedL() )
- {
- TPhoneCmdParamBoolean serviceCodeParam;
- serviceCodeParam.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetServiceCodeFlag,
- &serviceCodeParam );
- }
-
- if ( iCustomization )
- {
- iCustomization->CustomizeMenuPaneL(aResourceId, aMenuPane);
- }
- // Process the menu pane
- TPhoneCmdParamDynMenu dynMenuPane;
- dynMenuPane.SetResourceId( aResourceId );
- dynMenuPane.SetDynMenu( aMenuPane );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuPane, &dynMenuPane );
- }
-
-// -----------------------------------------------------------
// CPhoneStateIncoming::ShowDisconnectingL
// -----------------------------------------------------------
//
--- a/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -62,12 +62,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateStartup::ConstructL() ");
CPhoneState::BaseConstructL();
-
- // Set send key activation off.
- TPhoneCmdParamBoolean boolean;
- boolean.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSendKeyDialerActivationFlag,
- &boolean );
// CAPTURE KEY EVENTS PERMANENTLY
@@ -159,8 +153,6 @@
SetDefaultFlagsL();
iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
- iViewCommandHandle->ExecuteCommand( EPhoneViewPrepareIcons );
-
iStateMachine->ChangeState( EPhoneStateIdle );
}
}
@@ -196,17 +188,6 @@
// Empty implementation
}
-// CPhoneStateStartup::HandleCreateNumberEntryL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateStartup::HandleCreateNumberEntryL(
- const TKeyEvent& /* aKeyEvent */ ,
- TEventCode /* aEventCode */ )
- {
- // Empty implementation
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateStartup::HandleCreateNumberEntryL() ");
- }
-
// -----------------------------------------------------------
// CPhoneStateStartup::HandleDtmfKeyToneL
// -----------------------------------------------------------
@@ -248,9 +229,6 @@
SetDefaultFlagsL();
iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
- iViewCommandHandle->ExecuteCommand( EPhoneViewPrepareIcons );
- iViewCommandHandle->ExecuteCommand( EPhoneViewLoadPlugins );
-
iStateMachine->ChangeState( EPhoneStateIdle );
}
}
--- a/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -110,28 +110,6 @@
}
// ---------------------------------------------------------
-// CPhoneSystemEventHandler::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CPhoneSystemEventHandler::DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane )
- {
- iStateMachine->State()->DynInitMenuPaneL( aResourceId, aMenuPane );
- }
-
-// ---------------------------------------------------------
-// CPhoneSystemEventHandler::DynInitMenuBarL
-// ---------------------------------------------------------
-//
-void CPhoneSystemEventHandler::DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar )
- {
- iStateMachine->State()->DynInitMenuBarL( aResourceId, aMenuBar );
- }
-
-// ---------------------------------------------------------
// CPhoneSystemEventHandler::HandleSystemEventL
// ---------------------------------------------------------
//
--- a/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -107,12 +107,6 @@
// Store the phone engine information in the state machine
iStateMachine->SetPhoneEngine( iPhoneEngine );
-
- // Set Number Entry observer
- TPhoneCmdParamNumberEntryObserver cmdParamNumberEntryObserver;
- cmdParamNumberEntryObserver.SetObserver( TCallBack( HandlePhoneNumberEditorCallBack, this ) );
- aViewCommandHandle->ExecuteCommand( EPhoneViewSetNumberEntryObserver,
- &cmdParamNumberEntryObserver);
// Go to the startup state
iStateMachine->ChangeState( EPhoneStateStartup );
@@ -227,37 +221,11 @@
{
iStateMachine->State()->HandleDtmfKeyToneL( aKeyEvent, aEventCode );
}
-
-
return EKeyWasNotConsumed;
}
// ---------------------------------------------------------
-// CPhoneUIController::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneUIController::DynInitMenuPaneL(
- TInt aResourceId,
- CEikMenuPane* aMenuPane )
- {
- __ASSERT_DEBUG( iSystemEventHandler, Panic( EPhoneCtrlInvariant ) );
- iSystemEventHandler->DynInitMenuPaneL( aResourceId, aMenuPane );
- }
-
-// ---------------------------------------------------------
-// CPhoneUIController::DynInitMenuBarL
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneUIController::DynInitMenuBarL(
- TInt aResourceId,
- CEikMenuBar* aMenuBar )
- {
- __ASSERT_DEBUG( iSystemEventHandler, Panic( EPhoneCtrlInvariant ) );
- iSystemEventHandler->DynInitMenuBarL( aResourceId, aMenuBar );
- }
-
-// ---------------------------------------------------------
// CPhoneUIController::HandleSystemEventL
// ---------------------------------------------------------
//
@@ -416,7 +384,6 @@
//
void CPhoneUIController::DoHandlePhoneNumberEditorCallBack()
{
- iStateMachine->State()->HandleNumberEntryEdited();
}
// End of File
--- a/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -575,7 +575,7 @@
{
aCallHeaderData->SetCLIText(
iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
- TPhoneCmdParamCallHeaderData::ERight );
+ TPhoneCmdParamCallHeaderData::ELeft );
}
// If KTelephonyLVFlagUUS is enabled it will over write RemotePartyName setting.
@@ -669,22 +669,23 @@
else if ( identity == RMobileCall::ERemoteIdentityUnavailableNoCliCoinOrPayphone ||
identity == RMobileCall::ERemoteIdentityAvailableNoCliCoinOrPayphone )
{
- __PHONELOG( EBasic, EPhoneControl, "GetRemoteInfoDataL br2.5: payphone" );
+ __PHONELOG( EBasic, EPhoneControl, "GetRemoteInfoDataL : payphone" );
// Display "Payphone".
iManagerUtility.LoadResource( aData, EPhoneCLIPayphone );
}
else if ( identity == RMobileCall::ERemoteIdentityUnknown )
{
- __PHONELOG( EBasic, EPhoneControl, "GetRemoteInfoDataL br2.6: unknown number" );
+ __PHONELOG( EBasic, EPhoneControl, "GetRemoteInfoDataL : unknown number" );
// Display "Unknown Number".
iManagerUtility.LoadResource( aData, EPhoneCallCLIUnknown );
}
+ else if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() )
+ {
+ // Display the number if it is available
+ aData.Copy( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ) );
+ }
}
- else if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() )
- {
- // Display the number if it is available
- aData.Copy( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ) );
- }
+
}
return secondaryCli;
}
--- a/phoneapp/phoneuiqtviewadapter/inc/phonebubblewrapper.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonebubblewrapper.h Fri Jul 09 15:40:55 2010 +0300
@@ -54,9 +54,9 @@
void setLabel (int bubble, const TDesC &text);
- void setCli (int bubble, const TDesC &cliText);
+ void setCli (int bubble, const TDesC &cliText, Qt::TextElideMode elide);
- void setSecondaryCli (int bubble, const TDesC &cliText);
+ void setSecondaryCli (int bubble, const TDesC &cliText, Qt::TextElideMode elide);
void setCallType (int bubble, int callType);
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneindicatorcontroller.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneindicatorcontroller.h Fri Jul 09 15:40:55 2010 +0300
@@ -26,11 +26,16 @@
class LogsModel;
class LogsFilter;
class XQSettingsKey;
+class XQAiwRequest;
+class PhoneVisibilityHandler;
+
class PhoneIndicatorController : public QObject
{
Q_OBJECT
public:
- PhoneIndicatorController(QObject *parent = 0);
+ PhoneIndicatorController(
+ PhoneVisibilityHandler& visibilityHandler,
+ QObject *parent = 0);
virtual ~PhoneIndicatorController();
void setActiveCallData();
@@ -42,6 +47,7 @@
void updateMissedCallIndicator(const XQSettingsKey &key, const QVariant &value);
void updateDivertIndicator(const XQSettingsKey &key, const QVariant &value);
void setMissedallIndicatorData();
+ void handleInteraction(QString type,QVariantMap data);
private:
void updateDiverIndicator(bool activeDiverts);
@@ -55,6 +61,8 @@
QString m_cli;
QString m_callImage;
+ XQAiwRequest* m_request;
+ PhoneVisibilityHandler& m_phoneVisibilityHandler;
};
#endif /* PHONEINDICATORCONTROLLER_H_ */
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h Fri Jul 09 15:40:55 2010 +0300
@@ -30,34 +30,20 @@
enum
{
- EPhoneViewCreateNumberEntry = KPhoneViewCommandCommonFirst,
- EPhoneViewSetNumberEntryContent,
- EPhoneViewSendKeyEventToNumberEntry,
- EPhoneViewRemoveNumberEntry,
+ EPhoneViewRemoveNumberEntry = KPhoneViewCommandCommonFirst,
EPhoneViewSetNumberEntryVisible,
EPhoneViewGetNumberFromEntry,
EPhoneViewGetNumberEntryCount,
EPhoneViewGetNumberEntryIsUsedStatus,
EPhoneViewGetNumberEntryIsVisibleStatus,
- EPhoneViewToggleNumberEntryAlphaNumericMode, // 10
- EPhoneViewIsNumberEntryNumericMode,
EPhoneViewClearNumberEntryContent,
EPhoneViewCreateCallHeader,
EPhoneViewCreateEmergencyCallHeader,
EPhoneViewUpdateCallHeaderRemoteInfoData,
EPhoneViewUpdateCallHeaderCallDuration,
EPhoneViewRemoveCallHeader,
- EPhoneViewMenuBarOpen, //20
- EPhoneViewMenuBarClose,
- EPhoneViewDimCbaCommand,
EPhoneViewUpdateCba,
EPhoneViewUpdateBubble,
- EPhoneViewMenuPane,
- EPhoneViewMenuBar,
- EPhoneViewSetTitlePaneContent,
- EPhoneViewSetNaviPaneContent,
- EPhoneViewSetTitlePanePicture,
- EPhoneViewGetTitlePaneIsVisibleStatus, //30
EPhoneViewActivateAudioPathUIChanges,
EPhoneViewActivateAudioAvailabilityUIChanges,
EPhoneViewActivateMuteUIChanges,
@@ -67,55 +53,30 @@
EPhoneViewRemoveNote,
EPhoneViewRemoveProgressNote,
EPhoneViewRemoveGlobalNote,
- EPhoneViewGetIsNoteVisible, // 40
- EPhoneViewGetIsProgressNoteVisible,
EPhoneViewShowQuery,
- EPhoneViewSetListQueryString,
+ EPhoneViewSetListQueryString,
EPhoneViewRemoveQuery,
- EPhoneViewGetTextQueryContent,
EPhoneViewSetTopApplication,
EPhoneViewBringAppToForeground,
EPhoneViewSendToBackground,
- EPhoneViewSetNeedToSendToBackgroundStatus,
- EPhoneViewGetNeedToSendToBackgroundStatus, // 50
- EPhoneViewGetTopApplicationIsDisplayedStatus,
- EPhoneViewGetForegroundApplication,
- EPhoneViewSetBackgroundImageBitmap,
- EPhoneViewGetBackgroundImageBitmap,
- EPhoneViewActivateApp,
- EPhoneViewActivateAppView,
- EPhoneViewActivateAppViewWithCustomMessage,
- EPhoneViewActivateAppViewConventional,
- EPhoneViewLaunchApplication,
- EPhoneViewLaunchHelpApplication, // 60
- EPhoneViewOpenMessageEditor,
- EPhoneViewExitApplications,
- EPhoneViewUpdateIncallIndicator,
+ EPhoneViewSetNeedToSendToBackgroundStatus,
+ EPhoneViewGetNeedToSendToBackgroundStatus,
+ EPhoneViewGetTopApplicationIsDisplayedStatus,
+ EPhoneViewGetForegroundApplication,
EPhoneViewStartCapturingKey,
EPhoneViewStopCapturingKey,
EPhoneViewSetGlobalNotifiersDisabled,
EPhoneViewGetHoldFlag,
EPhoneViewSetHoldFlag,
- EPhoneViewSetSoftRejectFlag,
- EPhoneViewGetSoftRejectFlag,
- EPhoneViewSetServiceCodeFlag,
- EPhoneViewUpdateContact, // 80
- EPhoneViewAddContact,
- EPhoneViewOpenSingleItemFetchDialog,
EPhoneViewRemovePhoneDialogs,
EPhoneViewCreateConference,
EPhoneViewAddToConference,
EPhoneViewRemoveFromConference,
EPhoneViewPrivateFromConference,
EPhoneViewSelectedConfMember,
- EPhoneViewGetConferenceListVisibleFlag,
- EPhoneViewOpenConferenceList, // 90
- EPhoneViewGetCallState,
EPhoneViewGetCallIdByState,
- EPhoneViewMoveHighLightInList,
EPhoneViewGetCountOfActiveCalls,
EPhoneViewSetNaviPaneAudioVolume,
- EPhoneViewShowNaviPaneAudioVolume,
EPhoneViewHideNaviPaneAudioVolume,
EPhoneViewGetIsConference,
EPhoneViewGetCallExistsInConference,
@@ -125,106 +86,51 @@
EPhoneViewStopRingTone,
EPhoneViewMuteRingToneOnAnswer,
EPhoneViewCipheringInfoChange,
- EPhoneViewUpdateMaxConfMemberFlag, // 110
EPhoneViewCloseFSW,
- EPhoneViewLaunchRfsDeep,
- EPhoneViewLaunchRfsNormal,
- EPhoneViewUpdateView,
+ EPhoneViewLaunchRfsDeep,
+ EPhoneViewLaunchRfsNormal,
EPhoneViewOpenSoftRejectEditor,
- EPhoneViewSendMessage,
- EPhoneViewSetBlockingDialogStatus,
- EPhoneViewSetPhoneNumberAvailableInPhoneEngine,
- EPhoneViewSetSecurityMode,
- EPhoneViewGetSecurityModeStatus, // 120
- EPhoneViewSetStatusPaneVisible,
- EPhoneViewEnableKeyLock,
- EPhoneViewEnableKeyLockWithoutNote,
- EPhoneViewLaunchFaxModem,
+ EPhoneViewSetSecurityMode,
+ EPhoneViewGetSecurityModeStatus,
+ EPhoneViewEnableKeyLock,
+ EPhoneViewEnableKeyLockWithoutNote,
EPhoneViewUpdateFSW,
- EPhoneViewIsQuery,
+ EPhoneViewIsQuery,
EPhoneViewBringIdleToForeground,
EPhoneViewSetIdleTopApplication,
EPhoneViewBeginUpdate,
- EPhoneViewEndUpdate, // 130
- EPhoneViewSetConfrenceOptionsFlag,
+ EPhoneViewEndUpdate,
EPhoneViewRemoveConferenceBubble,
- EPhoneViewGetSoftRejectWindowGroupId,
- EPhoneViewSetTouchPaneButtons,
- EPhoneViewSetTouchPaneVisible,
- EPhoneViewEnableTouchButton,
- EPhoneViewDisableTouchButton,
- EPhoneResetTouchButtons,
- EPhoneViewGetIsConferenceInSelectionMode,
- EPhoneViewIsStraightCallToVideoMailBox, // 140
- EPhoneViewSetDtmfDialerViewVisible,
- EPhoneViewSetRetrictedDialer,
- EPhoneViewIsConferenceInExpandedMode,
- EPhoneViewIsMenuBarVisible,
- EPhoneViewGetBlockingDialogStatus,
- EPhoneViewYesSingleItemFetch,
- EPhoneViewNoSingleItemFetch,
- EPhoneViewGetLocalizedNumberFromEntry,
- EPhoneViewIsNoteActive,
- EPhoneViewOpenNumberEntry, //150
- EPhoneViewOpenCallHandling,
- EPhoneViewGetConferenceAndSingleFlag,
- EPhoneViewSetConferenceAndSingleFlag,
- EPhoneViewSetVideoCallFlag,
- EPhoneViewSetDtmfOptionsFlag,
- EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery,
- EPhoneViewGetAudioVolumeLevel,
- EPhoneViewIsIdleTopApp,
- EPhoneViewUpdateToolbar,
- EPhoneViewSetControlAndVisibility, //160
- EPhoneViewAllowWaitingCallHeader,
- EPhoneViewBeginTransEffect,
- EPhoneViewEndTransEffect,
- EPhoneViewSetDialerControlVisible,
- EPhoneViewCloseSingleItemFetchDialog,
- EPhoneViewGetActivatePreviousApp,
- EPhoneViewActivatePreviousApp,
- EPhoneViewSetPointerCapture,
- EPhoneViewSetSendKeyDialerActivationFlag,
- EPhoneViewPrepareIcons, //170
- EPhoneViewKeypadAudioEnabled,
- EPhoneViewKeypadAudioDisabled,
+ EPhoneViewSetTouchPaneButtons,
+ EPhoneViewGetBlockingDialogStatus,
+ EPhoneViewIsNoteActive,
+ EPhoneViewOpenCallHandling,
+ EPhoneViewGetAudioVolumeLevel,
EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
EPhoneViewRemoveDtmfNote,
- EPhoneViewUpdatePhoneIconToFSW,
EPhoneViewSetEikonNotifiersDisabled,
- EPhoneViewCancelAllNotications,
- EPhoneViewSetVideoCallDTMFVisibilityFlag,
- EPhoneViewIsKeyLockEnabled,
- EPhoneViewDisableKeyLock,
- EPhoneViewLoadPlugins, // 170
- EPhoneViewOpenVirtualKeyBoard,
- EPhoneViewUpdateNoteSoftkeys,
-
- EPhoneViewSendAiwCommand,
- EPhoneViewShowCustomizedDialer,
- EPhoneViewHideCustomizedDialer,
- EPhoneViewGetCustomizedDialerMenuResourceId,
- EPhoneViewGetCustomizedDialerCbaResourceId,
- EPhoneViewCipheringInfoChangePlayTone,
- EPhoneViewCreatePhoneBookServices,
- EPhoneViewDisableKeyLockWithoutNote,
- EPhoneViewGetKeyLockStatus,
- EPhoneViewSetNumberEntryObserver,
- EPhoneViewGetSingleItemFetchType,
+ EPhoneViewCancelAllNotications,
+ EPhoneViewDisableKeyLock,
+ EPhoneViewSendAiwCommand,
+
+ EPhoneViewCipheringInfoChangePlayTone,
+ EPhoneViewDisableKeyLockWithoutNote,
+
+ EPhoneViewGetKeyLockStatus,
+
EPhoneViewRemoveGlobalWaitNote,
- EPhoneViewSetPhoneCustomization,
- EPhoneViewSetViewCustomization,
- EPhoneViewSetButtonCustomization,
- EPhoneViewUpdateContactByString,
- EPhoneViewAddContactByString,
- EPhoneViewIsActiveNoteDissmissableByKeyEvent,
- EPhoneViewUpdateContextMenu,
- EPhoneViewSetNoConnectedCalls,
- EPhoneViewIsDTMFEditorVisible,
- EPhoneViewSetToolbarDimming,
- EPhoneViewEnableToolbarButton,
- EPhoneViewHideToolbar,
- EPhoneViewShowToolbar,
+ EPhoneViewSetPhoneCustomization,
+ EPhoneViewSetViewCustomization,
+ EPhoneViewSetButtonCustomization,
+
+ EPhoneViewUpdateContactByString,
+ EPhoneViewAddContactByString,
+
+ EPhoneViewIsActiveNoteDissmissableByKeyEvent,
+
+ EPhoneViewEnableToolbarButton,
+ EPhoneViewHideToolbar,
+ EPhoneViewShowToolbar,
EPhoneViewGetExpandedBubbleCallId,
EPhoneViewOpenDialer,
EPhoneSetConferenceExpanded,
--- a/phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -136,18 +136,20 @@
m_bubbleManager.setLabel (bubble, labelText, Qt::ElideRight);
}
-void PhoneBubbleWrapper::setCli (int bubble, const TDesC &cliText)
+void PhoneBubbleWrapper::setCli (int bubble, const TDesC &cliText,
+ Qt::TextElideMode elide)
{
QString text = QString::fromUtf16 (cliText.Ptr (), cliText.Length ());
PHONE_DEBUG2("PhoneBubbleWrapper::setCli, cli:", text);
- m_bubbleManager.setCli (bubble, text, Qt::ElideRight);
+ m_bubbleManager.setCli (bubble, text, elide);
}
-void PhoneBubbleWrapper::setSecondaryCli (int bubble, const TDesC &cliText)
+void PhoneBubbleWrapper::setSecondaryCli (int bubble, const TDesC &cliText,
+ Qt::TextElideMode elide)
{
QString text = QString::fromUtf16 (cliText.Ptr (), cliText.Length ());
PHONE_DEBUG2("PhoneBubbleWrapper::setSecondaryCli, SecondaryCli:", text);
- m_bubbleManager.setSecondaryCli (bubble, text);
+ m_bubbleManager.setSecondaryCli (bubble, text, elide);
}
void PhoneBubbleWrapper::setCallType (int bubble, int callType)
@@ -260,7 +262,7 @@
m_bubbles.insert(callId,bubble);
setState(callId, bubble, callState );
setLabel(bubble, labelText);
- setCli (bubble, cliText);
+ setCli (bubble, cliText, Qt::ElideRight);
//Set conference bubble expanded if no other
//bubbles (like waiting bubble).
--- a/phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneindicatorcontroller.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -17,6 +17,7 @@
#include "phoneindicatorcontroller.h"
#include "phoneindicators.h"
+#include "phonevisibilityhandler.h"
#include "qtphonelog.h"
#include <QByteArray>
@@ -27,6 +28,9 @@
#include <logsfilter.h>
#include <LogsDomainCRKeys.h>
#include <ctsydomaincrkeys.h>
+#include <xqaiwrequest.h>
+#include <xqappmgr.h>
+#include <logsservices.h>
#endif
namespace PhoneIndicatorControllerKeys{
@@ -42,8 +46,10 @@
-PhoneIndicatorController::PhoneIndicatorController(QObject *parent):
- QObject(parent), m_logsModel(0), m_missedCallsFilter(0)
+PhoneIndicatorController::PhoneIndicatorController(
+ PhoneVisibilityHandler& visibilityHandler, QObject *parent):
+ QObject(parent), m_logsModel(0), m_missedCallsFilter(0),
+ m_request(0), m_phoneVisibilityHandler(visibilityHandler)
{
PHONE_TRACE
#ifdef Q_OS_SYMBIAN
@@ -73,6 +79,9 @@
updateDiverIndicator(cfStatus & KCFVoiceForwarded);
}
#endif
+
+ connect(&m_indicator,SIGNAL(userActivated(QString,QVariantMap)),
+ this,SLOT(handleInteraction(QString,QVariantMap)));
}
PhoneIndicatorController::~PhoneIndicatorController()
@@ -254,3 +263,57 @@
PHONE_TRACE
return ( first.key() == second.key() && first.uid() == second.uid() );
}
+
+void PhoneIndicatorController::handleInteraction(QString type,QVariantMap data)
+{
+ PHONE_TRACE
+
+ if (data.contains(QLatin1String("interaction")) &&
+ data.value(QLatin1String("interaction")).canConvert<int>()) {
+
+ XQApplicationManager appManager;
+ QList<QVariant> args;
+ QString service;
+ QString interface;
+ QString operation;
+ QVariantHash hash;
+ QVariantMap map;
+ int interaction = data.value("interaction").toInt();
+
+ switch(interaction){
+ case OpenMissedCallView:
+ service = "logs";
+ interface = "com.nokia.symbian.ILogsView";
+ operation = "show(QVariantMap)";
+ map.insert("view_index",QVariant((int)LogsServices::ViewMissed));
+ map.insert("show_dialpad",QVariant(false));
+ map.insert("dialpad_text", QVariant(QString()));
+ args.append(QVariant(map));
+ break;
+ case OpenCallUi:
+ m_phoneVisibilityHandler.bringToForeground();
+ break;
+ case OpenDiverSettingsView:
+ interface = "com.nokia.symbian.ICpPluginLauncher";
+ operation = "launchSettingView(QString,QVariant)";
+ args << QVariant("cptelephonyplugin.dll");
+ hash["view"] = "divert_view";
+ hash["heading"] = "txt_phone_subhead_telephone";
+ args << hash;
+ break;
+ default:
+ break;
+ }
+
+ delete m_request;
+ m_request = service.isEmpty() ?
+ appManager.create( interface, operation, false):
+ appManager.create(service, interface, operation, false);
+ if ( m_request == NULL ){
+ return;
+ }
+ m_request->setArguments(args);
+ m_request->send();
+
+ }
+}
--- a/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -112,6 +112,7 @@
}
case R_PHONEUI_OUT_GOING_CALL:
+ case R_PHONEUI_OUT_GOING_VIDEO_CALL:
{
PhoneAction *text = new PhoneAction;
text->setText (hbTrId("txt_phone_other_calling"));
@@ -244,7 +245,7 @@
case R_PHONE_ERROR_REQUEST_REJECTED:
{
- ret = hbTrId("txt_phone_info_request_rejected").arg(causeCode);
+ ret = hbTrId("txt_phone_dpopinfo_request_rejected_l1").arg(causeCode);
}
break;
@@ -268,7 +269,7 @@
case R_PHONE_INCALL_INFO_NO_NETWORK_SUPPORT:
{
- ret = hbTrId("txt_phone_info_no_network_support_for_video_call").arg(causeCode);
+ ret = hbTrId("txt_phone_info_videocall_only_possible_under_3g").arg(causeCode);
}
break;
case R_PHONE_ERROR_EMERGENCY_CALLS_ONLY:
@@ -418,6 +419,11 @@
ret = hbTrId("txt_phone_info_video_call_not_allowed_during_resto").arg(causeCode);
}
break;
+ case R_NOTETEXT_NUMBER_NOT_IN_CUG:
+ {
+ ret = hbTrId("txt_phone_info_number_not_in_closed_group").arg(causeCode);
+ }
+ break;
default:
break;
}
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -636,7 +636,7 @@
case PhoneInCallCmdSwap: {
action = new PhoneAction;
- action->setIcon(HbIcon("qtg_mono_replace_call"));
+ action->setIcon(HbIcon("qtg_mono_swap_call"));
action->setDisabled(disabled);
action->setCommand(EPhoneInCallCmdSwap);
}
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -71,6 +71,13 @@
const TUint32 KTelIncallTouchButtons = 0x00000001;
+inline Qt::TextElideMode clipToElide(
+ TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection clip)
+ {
+ return clip == TPhoneCmdParamCallHeaderData::ELeft ?
+ Qt::ElideLeft : Qt::ElideRight;
+ }
+
PhoneUIQtViewAdapter::PhoneUIQtViewAdapter (PhoneUIQtViewIF &view, QObject *parent) :
QObject (parent),
m_view (view),
@@ -104,8 +111,8 @@
setToolbarButtons(&intParam);
m_telephonyService = new TelephonyService (this, this);
- m_indicatorController = new PhoneIndicatorController(this);
m_visibilityHandler = new PhoneVisibilityHandler(view, this);
+ m_indicatorController = new PhoneIndicatorController(*m_visibilityHandler,this);
m_appLauncher = new PhoneAppLauncher(this);
m_messageController = new PhoneMessageController(*m_appLauncher, this);
@@ -382,18 +389,11 @@
switch (aCmdId) {
case EPhoneIsDTMFDialerVisible:
- case EPhoneViewIsDTMFEditorVisible: //TODO
case EPhoneIsCustomizedDialerVisible:
case EPhoneViewGetNeedToSendToBackgroundStatus:
// TODO: currently not supported
response = EPhoneViewResponseFailed;
break;
- case EPhoneViewIsMenuBarVisible:
- {
- //TODO
- response = EPhoneViewResponseFailed;
- break;
- }
case EPhoneViewGetNumberEntryIsVisibleStatus:
case EPhoneViewGetNumberEntryIsUsedStatus: // Fall through
{
@@ -460,12 +460,6 @@
case EPhoneViewGetNumberFromEntry:
getNumberFromDialpad(aCommandParam);
break;
- case EPhoneViewSetDtmfOptionsFlag:
- //TODO
- break;
- case EPhoneViewSetVideoCallDTMFVisibilityFlag:
- //TODO
- break;
case EPhoneViewBackButtonActive: {
TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
m_view.setBackButtonVisible(param->Boolean());
@@ -614,10 +608,10 @@
}
int bubble = m_bubbleWrapper->createCallHeader (callId);
- m_bubbleWrapper->setState (callId, bubble, data.CallState ());
- m_bubbleWrapper->setCli (bubble, data.CLIText ());
+ m_bubbleWrapper->setState (callId, bubble, data.CallState ());
+ m_bubbleWrapper->setCli (bubble, data.CLIText (), clipToElide(data.CLITextClippingDirection()));
m_bubbleWrapper->setServiceId(callId, data.ServiceId());
- m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText ());
+ m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText (), clipToElide(data.CNAPTextClippingDirection()));
m_bubbleWrapper->setLabel (bubble, data.LabelText ());
m_bubbleWrapper->setCallType (bubble, data.CallType ());
m_bubbleWrapper->setDivert (bubble, data.Diverted ());
@@ -651,7 +645,7 @@
m_bubbleWrapper->bubbleManager ().startChanges ();
int bubble = m_bubbleWrapper->createCallHeader (callId);
m_bubbleWrapper->setLabel (bubble, data.LabelText ());
- m_bubbleWrapper->setCli (bubble, data.HeaderText ());
+ m_bubbleWrapper->setCli (bubble, data.HeaderText (), Qt::ElideRight);
m_bubbleWrapper->setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
m_bubbleWrapper->bubbleManager ().endChanges ();
@@ -690,8 +684,10 @@
int bubble = m_bubbleWrapper->bubbleId (callId);
if ( -1 != bubble ) {
m_bubbleWrapper->bubbleManager ().startChanges ();
- m_bubbleWrapper->setCli (bubble, data.CLIText ());
- m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText ());
+ m_bubbleWrapper->setCli (bubble, data.CLIText (),
+ clipToElide(data.CLITextClippingDirection()));
+ m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText (),
+ clipToElide(data.CNAPTextClippingDirection()));
m_bubbleWrapper->setDivert (bubble, data.Diverted ());
m_bubbleWrapper->bubbleManager ().endChanges ();
}
@@ -710,8 +706,10 @@
int bubble = m_bubbleWrapper->bubbleId (callId);
if ( -1 != bubble ) {
m_bubbleWrapper->bubbleManager ().startChanges ();
- m_bubbleWrapper->setCli (bubble, data.CLIText ());
- m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText ());
+ m_bubbleWrapper->setCli (bubble, data.CLIText (),
+ clipToElide(data.CLITextClippingDirection()));
+ m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText (),
+ clipToElide(data.CNAPTextClippingDirection()));
m_bubbleWrapper->setLabel (bubble, data.LabelText ());
m_bubbleWrapper->setDivert (bubble, data.Diverted ());
m_bubbleWrapper->bubbleManager ().endChanges ();
--- a/phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -117,6 +117,11 @@
void PhoneVisibilityHandler::sendToBackground(bool homeScreenForeground)
{
PHONE_TRACE2(": homeScreenForeground =", homeScreenForeground);
+ PHONE_TRACE2(": m_carModeEnabled =", m_carModeEnabled);
+ if(m_carModeEnabled) {
+ // Don't bring homescreen to foreground
+ return;
+ }
enableKeyGuard();
@@ -234,22 +239,24 @@
} else if (m_hideDeviceDialogs) {
PHONE_TRACE1(": Hide dialogs");
m_eikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront + 100);
-
+
} else if (m_deviceLockEnabled) {
// critical notes are allowed to show on top of Phone application
PHONE_TRACE1(": Devicelock");
m_eikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront);
-
+
} else if (BringForwards == action) {
// Try to show phone with normal priority
PHONE_TRACE1(": Bring forward");
m_eikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNormal);
-
+
} else {
// Normalize visiblity after ie. device lock
PHONE_TRACE1(": Normalize");
m_eikonEnv->RootWin().SetOrdinalPosition(ordinalPos, ECoeWinPriorityNormal);
-
+ // Flush is needed here, because otherwise launching an application may fail
+ // if done same time with normalization.
+ m_eikonEnv->WsSession().Flush();
}
PHONE_TRACE1(": END");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/mocks/mock_phoneapplauncher.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,85 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "phoneapplauncher.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// PhoneAppLauncher::PhoneAppLauncher
+// -----------------------------------------------------------------------------
+//
+PhoneAppLauncher::PhoneAppLauncher(
+ QObject * parent )
+ //:
+ //QObject( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneAppLauncher::~PhoneAppLauncher
+// -----------------------------------------------------------------------------
+//
+PhoneAppLauncher::~PhoneAppLauncher( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneAppLauncher::launchMessaging
+// -----------------------------------------------------------------------------
+//
+void PhoneAppLauncher::launchMessaging(
+ const QString & toField,
+ const QString & name,
+ const QString & messageBody )
+ {
+ SMC_MOCK_METHOD3( void, const QString &, toField,
+ const QString &, name,
+ const QString &, messageBody )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneAppLauncher::launchContacts
+// -----------------------------------------------------------------------------
+//
+void PhoneAppLauncher::launchContacts( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneAppLauncher::launchLogs
+// -----------------------------------------------------------------------------
+//
+void PhoneAppLauncher::launchLogs(
+ int activatedView,
+ bool showDialpad,
+ const QString & dialpadText )
+ {
+ SMC_MOCK_METHOD3( void, int, activatedView,
+ bool, showDialpad,
+ const QString &, dialpadText )
+ }
+
+
--- a/phoneapp/phoneuiqtviewadapter/tsrc/runtests.bat Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/runtests.bat Fri Jul 09 15:40:55 2010 +0300
@@ -15,27 +15,19 @@
@rem
echo OFF
-
-del \epoc32\winscw\c\data\ut_phoneuiqtbuttonscontroller.log
-\epoc32\release\winscw\udeb\ut_phoneuiqtbuttonscontroller.exe -o c:\data\ut_phoneuiqtbuttonscontroller.log
-type \epoc32\winscw\c\data\ut_phoneuiqtbuttonscontroller.log
-
-del \epoc32\winscw\c\data\ut_phoneuiqtviewadapter.log
-\epoc32\release\winscw\udeb\ut_phoneuiqtviewadapter.exe -o c:\data\ut_phoneuiqtviewadapter.log
-type \epoc32\winscw\c\data\ut_phoneuiqtviewadapter.log
+call :RUN ut_phonebubblewrapper
+call :RUN ut_phonecommandextensionwrapper
+call :RUN ut_phonemessagecontroller
+call :RUN ut_phonenotecontroller
+call :RUN ut_phoneresourceadapter
+call :RUN ut_phoneuicommandcontroller
+call :RUN ut_phoneuiqtbuttonscontroller
+call :RUN ut_phoneuiqtviewadapter
+call :RUN ut_phonevisibilityhandler
+call :RUN ut_telephonyservice
-del \epoc32\winscw\c\data\ut_phonebubblewrapper.log
-\epoc32\release\winscw\udeb\ut_phonebubblewrapper.exe -o c:\data\ut_phonebubblewrapper.log
-type \epoc32\winscw\c\data\ut_phonebubblewrapper.log
-
-del \epoc32\winscw\c\data\ut_phoneresourceadapter.log
-\epoc32\release\winscw\udeb\ut_phoneresourceadapter.exe -o c:\data\ut_phoneresourceadapter.log
-type \epoc32\winscw\c\data\ut_phoneresourceadapter.log
+:RUN
+del \epoc32\winscw\c\data\%1.log
+\epoc32\release\winscw\udeb\%1.exe -o c:\data\%1.log
+type \epoc32\winscw\c\data\%1.log
-del \epoc32\winscw\c\data\ut_telephonyservice.log
-\epoc32\release\winscw\udeb\ut_telephonyservice.exe -o c:\data\ut_telephonyservice.log
-type \epoc32\winscw\c\data\ut_telephonyservice.log
-
-del \epoc32\winscw\c\data\ut_phonevisibilityhandler.log
-\epoc32\release\winscw\udeb\ut_phonevisibilityhandler.exe -o c:\data\ut_phonevisibilityhandler.log
-type \epoc32\winscw\c\data\ut_phonevisibilityhandler.log
--- a/phoneapp/phoneuiqtviewadapter/tsrc/unit.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/unit.pro Fri Jul 09 15:40:55 2010 +0300
@@ -16,9 +16,13 @@
#
TEMPLATE = subdirs
+SUBDIRS += ut_phonebubblewrapper
+SUBDIRS += ut_phonecommandextensionwrapper
+SUBDIRS += ut_phonemessagecontroller
+SUBDIRS += ut_phonenotecontroller
+SUBDIRS += ut_phoneresourceadapter
+SUBDIRS += ut_phoneuicommandcontroller
SUBDIRS += ut_phoneuiqtbuttonscontroller
SUBDIRS += ut_phoneuiqtviewadapter
-SUBDIRS += ut_phonebubblewrapper
-SUBDIRS += ut_phoneresourceadapter
+SUBDIRS += ut_phonevisibilityhandler
SUBDIRS += ut_telephonyservice
-SUBDIRS += ut_phonevisibilityhandler
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -204,7 +204,7 @@
void TestPhoneBubbleWrapper::testSetCli ()
{
_LIT (KTestText, "Test Name");
- m_wrapper->setCli (3, KTestText);
+ m_wrapper->setCli (3, KTestText, Qt::ElideRight);
QCOMPARE (m_int, 3);
QCOMPARE (m_string, QString ("Test Name"));
QCOMPARE (m_elideMode, Qt::ElideRight);
@@ -213,7 +213,7 @@
void TestPhoneBubbleWrapper::testSetSecondaryCli ()
{
_LIT (KTestText, "Test Name");
- m_wrapper->setSecondaryCli (4, KTestText);
+ m_wrapper->setSecondaryCli (4, KTestText, Qt::ElideLeft);
QCOMPARE (m_int, 4);
QCOMPARE (m_string, QString ("Test Name"));
QCOMPARE (m_elideMode, Qt::ElideLeft);
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/menuextension_stub.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/menuextension_stub.h Fri Jul 09 15:40:55 2010 +0300
@@ -3,7 +3,7 @@
* Name :
* Part of :
* Description :
-* Version : %version: 3 %
+* Version : %version: 6 %
*
* Copyright 2008 Nokia. All rights reserved.
* This material, including documentation and any related computer
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/phoneapplauncher_stub.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +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:
-*
-*/
-
-#include <devicelockaccessapi.h>
-
-#include "phoneapplauncher.h"
-#include "qtphonelog.h"
-
-QList<QVariant> gList;
-
-/*!
- PhoneAppLauncher::PhoneAppLauncher.
- */
-PhoneAppLauncher::PhoneAppLauncher(QObject *parent)
- : QObject(parent)
-{
- PHONE_TRACE;
-}
-
-
-/*!
- PhoneAppLauncher::~PhoneAppLauncher.
- */
-PhoneAppLauncher::~PhoneAppLauncher()
-{
- PHONE_TRACE;
-}
-
-/*!
- PhoneAppLauncher::launchMessaging.
- */
-void PhoneAppLauncher::launchMessaging(
- const QString &toField,
- const QString &name,
- const QString &messageBody)
-{
- gList.append(toField);
- gList.append(name);
- gList.append(messageBody);
-}
-
-/*!
- PhoneAppLauncher::launchContacts.
- */
-void PhoneAppLauncher::launchContacts()
-{
-
-}
-
-/*!
- PhoneAppLauncher::launchLogs.
- */
-void PhoneAppLauncher::launchLogs(
- int activatedView,
- bool showDialpad,
- const QString &dialpadText)
-{
- Q_UNUSED(activatedView);
- Q_UNUSED(showDialpad);
- Q_UNUSED(dialpadText);
-}
-
-/*!
- PhoneAppLauncher::sendServiceRequest.
- */
-void PhoneAppLauncher::sendServiceRequest(
- const QString &service,
- const QString &interface,
- const QString &function,
- const QList<QVariant> &arguments)
-{
- Q_UNUSED(service);
- Q_UNUSED(interface);
- Q_UNUSED(function);
- Q_UNUSED(arguments);
-}
-
-// end of file
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -1,5 +1,5 @@
/*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -11,46 +11,55 @@
*
* Contributors:
*
-* Description: Unit tests for PhoneNoteController.
+* Description: Unit tests for PhoneMessageController.
*
*/
#include <QtTest/QtTest>
#include <QtGui>
-#include <hbapplication.h>
-#include <QSignalSpy>
-#include "phoneconstants.h"
-#include "cphonecenrepproxy.h"
-#include "cphonepubsubproxy.h"
+#include <HbGlobal>
+#include <mockservice.h>
#include <settingsinternalcrkeys.h>
#include "phoneapplauncher.h"
#include "phonemessagecontroller.h"
#include "tphonecmdparamsfidata.h"
+#include "phoneconstants.h"
+#include "cphonecenrepproxy.h"
-extern QList<QVariant> gList;
+const QString KNumber = "1234567";
+const QString KName = "Tester";
+const QString KUserDefinedSoftRejectText = "user defined text";
+
+void enableUserDefinedSoftRejectText(
+ const TUid & aUid,
+ const TUint aId,
+ TInt & aValue)
+{
+ Q_UNUSED(aUid)
+ Q_UNUSED(aId)
+
+ aValue = 1;
+}
-#define PHONE_QT_MESSAGE_CONTROLLER_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
- HbApplication app(argc, argv); \
- TestObject tc; \
- QResource::registerResource("../hbcore.rcc"); \
- int ret = QTest::qExec(&tc, argc, argv); \
- /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
- /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
- /* app.exec() where the signal is normally emitted is not called here. */ \
- /* So, invoking the signal explicitly. */ \
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
- return ret; \
+void setUserDefinedSoftRejectText(
+ const TUid & aUid,
+ const TUint aId,
+ TDes & aValue)
+{
+ Q_UNUSED(aUid)
+ Q_UNUSED(aId)
+
+ aValue.Copy(KUserDefinedSoftRejectText.utf16());
}
-class TestPhoneMessageController : public QObject
+
+class UT_PhoneMessageController : public QObject, public MockService
{
Q_OBJECT
public:
- TestPhoneMessageController();
- virtual ~TestPhoneMessageController();
+ UT_PhoneMessageController();
+ virtual ~UT_PhoneMessageController();
public slots:
void initTestCase();
@@ -59,91 +68,100 @@
void cleanup();
private slots:
- void testOpenSoftRejectEditor();
-
+ void t_openSoftRejectEditorDefaultText();
+ void t_openSoftRejectEditorUserDefinedText();
private:
- QString softRejectText();
-
-private:
PhoneAppLauncher *m_launcher;
PhoneMessageController *m_messageController; // class under test
};
-TestPhoneMessageController::TestPhoneMessageController()
-{
-}
-TestPhoneMessageController::~TestPhoneMessageController()
+UT_PhoneMessageController::UT_PhoneMessageController()
+ :
+ m_launcher(NULL),
+ m_messageController(NULL)
{
}
-void TestPhoneMessageController::initTestCase()
-{
- m_launcher = new PhoneAppLauncher(this);
- m_messageController = new PhoneMessageController(*m_launcher, this);
-}
-void TestPhoneMessageController::cleanupTestCase()
+UT_PhoneMessageController::~UT_PhoneMessageController()
{
delete m_messageController;
delete m_launcher;
}
-void TestPhoneMessageController::init()
+
+void UT_PhoneMessageController::initTestCase()
{
-}
-
-void TestPhoneMessageController::cleanup()
-{
+ m_launcher = new PhoneAppLauncher(this);
+ m_messageController = new PhoneMessageController(*m_launcher, this);
}
-void TestPhoneMessageController::testOpenSoftRejectEditor()
+
+void UT_PhoneMessageController::cleanupTestCase()
{
- QString text = softRejectText();
- TPhoneCmdParamSfiData sfiParam;
- sfiParam.SetNumber(_L("1234567"));
- sfiParam.SetName(_L("Tester"));
-
- m_messageController->openSoftRejectMessageEditor(&sfiParam);
-
- QVERIFY( gList.contains("1234567") );
- QVERIFY( gList.contains("Tester") );
- QVERIFY( gList.contains(text) );
+ delete m_messageController;
+ m_messageController = NULL;
+ delete m_launcher;
+ m_launcher = NULL;
+}
+
+
+void UT_PhoneMessageController::init()
+{
+ initialize();
+}
+
+
+void UT_PhoneMessageController::cleanup()
+{
+ reset();
}
-QString TestPhoneMessageController::softRejectText()
+
+void UT_PhoneMessageController::t_openSoftRejectEditorDefaultText()
{
- QString messageBody;
- // Get message body
- TInt softRejectDefaultInUseValue = 0;
- const TInt err = CPhoneCenRepProxy::Instance()->GetInt(
- KCRUidTelephonySettings,
- KSettingsSoftRejectDefaultInUse,
- softRejectDefaultInUseValue );
+ const QString KDefaultSoftRejectText =
+ hbTrId("txt_phone_setlabel_soft_reject_val_default_text");
+ EXPECT(PhoneAppLauncher::launchMessaging)
+ .with(KNumber, KName, KDefaultSoftRejectText);
- if (softRejectDefaultInUseValue) {
- HBufC* softRejectTxt = NULL;
- TRAP_IGNORE( softRejectTxt = HBufC::NewL( KPhoneSMSLength ) );
-
- if (softRejectTxt) {
- TPtr string( softRejectTxt->Des() );
-
- // Default txt used or not
- CPhoneCenRepProxy::Instance()->GetString(
- KCRUidTelephonySettings,
- KSettingsSoftRejectText,
- string );
-
- messageBody = QString::fromUtf16(string.Ptr(), string.Length());
- delete softRejectTxt;
- }
- } else {
- messageBody = hbTrId("txt_phone_setlabel_soft_reject_val_default_text");
- }
+ TPhoneCmdParamSfiData sfiParam;
+ sfiParam.SetNumber(TBuf16<20>(KNumber.utf16()));
+ sfiParam.SetName(TBuf16<20>(KName.utf16()));
+ m_messageController->openSoftRejectMessageEditor(&sfiParam);
- return messageBody;
+ QVERIFY(verify());
}
-PHONE_QT_MESSAGE_CONTROLLER_TEST_MAIN(TestPhoneMessageController)
+
+void UT_PhoneMessageController::t_openSoftRejectEditorUserDefinedText()
+{
+ EXPECT(PhoneAppLauncher::launchMessaging)
+ .with(KNumber, KName, KUserDefinedSoftRejectText);
+ EXPECT(CPhoneCenRepProxy::GetInt)
+ .with(KCRUidTelephonySettings, KSettingsSoftRejectDefaultInUse, 0)
+ .willOnce(invoke(enableUserDefinedSoftRejectText));
+ EXPECT(CPhoneCenRepProxy::GetString)
+ .with(KCRUidTelephonySettings, KSettingsSoftRejectText, KNullDesC())
+ .willOnce(invoke(setUserDefinedSoftRejectText));
+
+ TPhoneCmdParamSfiData sfiParam;
+ sfiParam.SetNumber(TBuf16<20>(KNumber.utf16()));
+ sfiParam.SetName(TBuf16<20>(KName.utf16()));
+ m_messageController->openSoftRejectMessageEditor(&sfiParam);
+
+ QVERIFY(verify());
+}
+
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication(argc, argv);
+ UT_PhoneMessageController tc;
+ int ret = QTest::qExec(&tc, argc, argv); \
+ return ret;
+}
+
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/ut_phonemessagecontroller.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/ut_phonemessagecontroller.pro Fri Jul 09 15:40:55 2010 +0300
@@ -33,7 +33,7 @@
../../../../inc \
../../../phoneui2/srcdata
- LIBS += -lphoneuiutils
+ LIBS += -lmocklib -lsymbianmock -lphoneuiutils
TARGET.CAPABILITY = ALL -TCB
DEFINES += FT_SYMBIAN_INTEGRATION
@@ -43,7 +43,9 @@
# Input
HEADERS += ../../inc/phonemessagecontroller.h
SOURCES += ../../src/phonemessagecontroller.cpp
-HEADERS += ../../inc/phoneapplauncher.h
-SOURCES += phoneapplauncher_stub.cpp
SOURCES += unit_tests.cpp
+# MOCKED DEPENDENCIES
+HEADERS += ../../inc/phoneapplauncher.h
+SOURCES += ../mocks/mock_phoneapplauncher.cpp
+SOURCES += ../../../../internal/mocks/phoneapp/phoneuiutils/mock_cphonecenrepproxy.cpp
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/xqservicerequest.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*!
-* Copyright (c) 2009 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: Unit tests for PhoneNoteController.
-*
-*/
-
-#ifndef T_XQSERVICEREQUEST_H
-#define T_XQSERVICEREQUEST_H
-
-#include <QObject>
-#include <QVariant>
-#include <QtTest/qtestcase.h>
-
-extern QString mService;
-extern QString mMessage;
-extern bool mSend;
-extern QList<QVariant> mList;
-
-
-/*!
- \class XQServiceRequest
-*/
-class XQServiceRequest : public QObject
-{
-Q_OBJECT
-
-public:
-
- XQServiceRequest(const QString &service,
- const QString &message,
- const bool &synchronous = true)
- {
- mService = service;
- mMessage = message;
- }
-
- ~XQServiceRequest()
- {
- }
-
- bool send(QVariant &retValue)
- {
- mSend = true;
- return mSend;
- }
-
- template <typename T>
- inline bool send(T& retValue)
- {
- QVariant retData;
- bool ret=send(retData);
- retValue = qVariantValue<T>(retData);
- return ret;
- }
-
- void setArguments(QList<QVariant> list)
- {
- mList = list;
- }
-
-Q_SIGNALS:
-
- void requestCompleted(const QVariant &value);
-
-};
-
-#endif //T_XQSERVICEREQUEST_H
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -76,7 +76,7 @@
int volumeSliderValue () { m_volumeSliderValueCalled = true; return 5; };
void removeVolumeSlider () { m_removeVolumeSliderCalled = true; };
void setVolumeSliderValue (
- int ,
+ int value,
int ,
int ,
int ) { m_setVolumeSliderValueCalled = true; m_volumeSliderValue = value; };
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper.h Fri Jul 09 15:40:55 2010 +0300
@@ -70,8 +70,8 @@
void removeCallHeader (int callId);
void setState (int callId, int bubble, int callState);
void setLabel (int bubble, const TDesC &text);
- void setCli (int bubble, const TDesC &cliText);
- void setSecondaryCli (int bubble, const TDesC &cliText);
+ void setCli (int bubble, const TDesC &cliText, Qt::TextElideMode elide);
+ void setSecondaryCli (int bubble, const TDesC &cliText, Qt::TextElideMode elide);
void setCallType (int bubble, int callType);
BubbleManagerIF& bubbleManager ();
int bubbleId (int callId);
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper_stub.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper_stub.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -124,14 +124,14 @@
m_setLabelText = &text;
}
-void PhoneBubbleWrapper::setCli (int bubble, const TDesC &cliText)
+void PhoneBubbleWrapper::setCli (int bubble, const TDesC &cliText, Qt::TextElideMode elide)
{
m_setCliCalled = true;
m_setCliBubbleId = bubble;
m_setCliText = &cliText;
}
-void PhoneBubbleWrapper::setSecondaryCli (int bubble, const TDesC &cliText)
+void PhoneBubbleWrapper::setSecondaryCli (int bubble, const TDesC &cliText, Qt::TextElideMode elide)
{
m_setSecondaryCliCalled = true;
m_setSecondaryCliBubbleId = bubble;
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -61,7 +61,6 @@
extern bool m_ordinalPositionCalled;
extern bool m_sendToBackgroundCalled;
-
#define PHONE_QT_VIEW_ADAPTER_TEST_MAIN(TestObject) \
int main(int argc, char *argv[]) \
{ \
@@ -935,8 +934,6 @@
QVERIFY( EPhoneViewResponseFailed == m_adapter->HandleCommandL (
EPhoneIsDTMFDialerVisible) );
QVERIFY( EPhoneViewResponseFailed == m_adapter->HandleCommandL (
- EPhoneViewIsDTMFEditorVisible) );
- QVERIFY( EPhoneViewResponseFailed == m_adapter->HandleCommandL (
EPhoneViewGetNumberEntryIsVisibleStatus) );
/*QVERIFY( EPhoneViewResponseFailed == m_adapter->HandleCommandL (
EPhoneViewGetNumberEntryIsUsedStatus) );*/
@@ -951,8 +948,6 @@
QVERIFY( EPhoneViewResponseSuccess == m_adapter->HandleCommandL (0, &boolean) );
m_adapter->ExecuteCommand(0);
- m_adapter->ExecuteCommand(EPhoneViewSetDtmfOptionsFlag, &boolean);
- m_adapter->ExecuteCommand(EPhoneViewSetVideoCallDTMFVisibilityFlag, &boolean);
m_adapter->ExecuteCommand(0, &boolean);
m_adapter->ExecuteCommandL(0, 0, &boolean);
_LIT (KText, "test");
--- a/phoneapp/phoneuistates/bwins/phoneuistatesu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/bwins/phoneuistatesu.def Fri Jul 09 15:40:55 2010 +0300
@@ -32,34 +32,31 @@
?ShowErrorSpecificNoteL@CPhoneErrorMessagesHandler@@UAEXABUTPEErrorInfo@@@Z @ 31 NONAME ; void CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL(struct TPEErrorInfo const &)
??1CPhoneStateMachineGSM@@UAE@XZ @ 32 NONAME ; CPhoneStateMachineGSM::~CPhoneStateMachineGSM(void)
?SendGlobalInfoNoteL@CPhoneErrorMessagesHandler@@IAEXHH@Z @ 33 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalInfoNoteL(int, int)
- ?OpenMenuBarL@CPhoneSingleCall@@MAEXXZ @ 34 NONAME ; void CPhoneSingleCall::OpenMenuBarL(void)
- ??0CPhoneStateMachineGSM@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 35 NONAME ; CPhoneStateMachineGSM::CPhoneStateMachineGSM(class MPhoneViewCommandHandle *)
- ?SetDivertIndication@CPhoneGsmInCall@@MAEXH@Z @ 36 NONAME ; void CPhoneGsmInCall::SetDivertIndication(int)
- ?HandlePhoneEngineMessageL@CPhoneTwoSingles@@UAEXHH@Z @ 37 NONAME ; void CPhoneTwoSingles::HandlePhoneEngineMessageL(int, int)
- ?HandlePhoneEngineMessageL@CPhoneAlerting@@UAEXHH@Z @ 38 NONAME ; void CPhoneAlerting::HandlePhoneEngineMessageL(int, int)
- ?HandleRemConCommandL@CPhoneEmergency@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 39 NONAME ; int CPhoneEmergency::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
- ?ConstructL@CPhoneSingleCall@@MAEXXZ @ 40 NONAME ; void CPhoneSingleCall::ConstructL(void)
- ?HandlePhoneEngineMessageL@CPhoneIncoming@@UAEXHH@Z @ 41 NONAME ; void CPhoneIncoming::HandlePhoneEngineMessageL(int, int)
- ?State@CPhoneStateMachineGSM@@UAEPAVMPhoneState@@XZ @ 42 NONAME ; class MPhoneState * CPhoneStateMachineGSM::State(void)
- ?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXHH@Z @ 43 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int, int)
- ?HandleErrorL@CPhoneIdle@@MAEXABUTPEErrorInfo@@@Z @ 44 NONAME ; void CPhoneIdle::HandleErrorL(struct TPEErrorInfo const &)
- ?HandleConnectingL@CPhoneCallSetup@@MAEXH@Z @ 45 NONAME ; void CPhoneCallSetup::HandleConnectingL(int)
- ?UpdateInCallCbaL@CPhoneTwoSingles@@MAEXXZ @ 46 NONAME ; void CPhoneTwoSingles::UpdateInCallCbaL(void)
- ?SendGlobalWarningNoteL@CPhoneErrorMessagesHandler@@IAEXHH@Z @ 47 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalWarningNoteL(int, int)
- ?HandleErrorL@CPhoneSingleAndWaiting@@MAEXABUTPEErrorInfo@@@Z @ 48 NONAME ; void CPhoneSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
- ??0CPhoneResourceResolverGSM@@IAE@XZ @ 49 NONAME ; CPhoneResourceResolverGSM::CPhoneResourceResolverGSM(void)
- ?ConstructL@CPhoneResourceResolverGSM@@IAEXXZ @ 50 NONAME ; void CPhoneResourceResolverGSM::ConstructL(void)
- ?HandlePhoneForegroundEventL@CPhoneGsmInCall@@MAEXXZ @ 51 NONAME ; void CPhoneGsmInCall::HandlePhoneForegroundEventL(void)
- ?HandlePhoneEngineMessageL@CPhoneIdle@@UAEXHH@Z @ 52 NONAME ; void CPhoneIdle::HandlePhoneEngineMessageL(int, int)
- ??1CPhoneIdle@@UAE@XZ @ 53 NONAME ; CPhoneIdle::~CPhoneIdle(void)
- ??1CPhoneCallSetup@@UAE@XZ @ 54 NONAME ; CPhoneCallSetup::~CPhoneCallSetup(void)
- ?ConstructL@CPhoneIdle@@MAEXXZ @ 55 NONAME ; void CPhoneIdle::ConstructL(void)
- ??0CPhoneAlerting@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 56 NONAME ; CPhoneAlerting::CPhoneAlerting(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?OpenMenuBarL@CPhoneAlerting@@MAEXXZ @ 57 NONAME ; void CPhoneAlerting::OpenMenuBarL(void)
- ?HandleNumberEntryClearedL@CPhoneTwoSingles@@MAEXXZ @ 58 NONAME ; void CPhoneTwoSingles::HandleNumberEntryClearedL(void)
- ?CheckIfShowCallTerminationNote@CPhoneAlerting@@MAEHXZ @ 59 NONAME ; int CPhoneAlerting::CheckIfShowCallTerminationNote(void)
- ?OpenMenuBarL@CPhoneTwoSingles@@MAEXXZ @ 60 NONAME ; void CPhoneTwoSingles::OpenMenuBarL(void)
- ??0CPhoneTwoSingles@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 61 NONAME ; CPhoneTwoSingles::CPhoneTwoSingles(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?CallId@CPhoneSingleCall@@IBEHXZ @ 62 NONAME ; int CPhoneSingleCall::CallId(void) const
- ?HandleConnectedConferenceL@CPhoneTwoSingles@@MAEXH@Z @ 63 NONAME ; void CPhoneTwoSingles::HandleConnectedConferenceL(int)
+ ??0CPhoneStateMachineGSM@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 34 NONAME ; CPhoneStateMachineGSM::CPhoneStateMachineGSM(class MPhoneViewCommandHandle *)
+ ?SetDivertIndication@CPhoneGsmInCall@@MAEXH@Z @ 35 NONAME ; void CPhoneGsmInCall::SetDivertIndication(int)
+ ?HandlePhoneEngineMessageL@CPhoneTwoSingles@@UAEXHH@Z @ 36 NONAME ; void CPhoneTwoSingles::HandlePhoneEngineMessageL(int, int)
+ ?HandlePhoneEngineMessageL@CPhoneAlerting@@UAEXHH@Z @ 37 NONAME ; void CPhoneAlerting::HandlePhoneEngineMessageL(int, int)
+ ?HandleRemConCommandL@CPhoneEmergency@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 38 NONAME ; int CPhoneEmergency::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+ ?ConstructL@CPhoneSingleCall@@MAEXXZ @ 39 NONAME ; void CPhoneSingleCall::ConstructL(void)
+ ?HandlePhoneEngineMessageL@CPhoneIncoming@@UAEXHH@Z @ 40 NONAME ; void CPhoneIncoming::HandlePhoneEngineMessageL(int, int)
+ ?State@CPhoneStateMachineGSM@@UAEPAVMPhoneState@@XZ @ 41 NONAME ; class MPhoneState * CPhoneStateMachineGSM::State(void)
+ ?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXHH@Z @ 42 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int, int)
+ ?HandleErrorL@CPhoneIdle@@MAEXABUTPEErrorInfo@@@Z @ 43 NONAME ; void CPhoneIdle::HandleErrorL(struct TPEErrorInfo const &)
+ ?HandleConnectingL@CPhoneCallSetup@@MAEXH@Z @ 44 NONAME ; void CPhoneCallSetup::HandleConnectingL(int)
+ ?UpdateInCallCbaL@CPhoneTwoSingles@@MAEXXZ @ 45 NONAME ; void CPhoneTwoSingles::UpdateInCallCbaL(void)
+ ?SendGlobalWarningNoteL@CPhoneErrorMessagesHandler@@IAEXHH@Z @ 46 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalWarningNoteL(int, int)
+ ?HandleErrorL@CPhoneSingleAndWaiting@@MAEXABUTPEErrorInfo@@@Z @ 47 NONAME ; void CPhoneSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+ ??0CPhoneResourceResolverGSM@@IAE@XZ @ 48 NONAME ; CPhoneResourceResolverGSM::CPhoneResourceResolverGSM(void)
+ ?ConstructL@CPhoneResourceResolverGSM@@IAEXXZ @ 49 NONAME ; void CPhoneResourceResolverGSM::ConstructL(void)
+ ?HandlePhoneForegroundEventL@CPhoneGsmInCall@@MAEXXZ @ 50 NONAME ; void CPhoneGsmInCall::HandlePhoneForegroundEventL(void)
+ ?HandlePhoneEngineMessageL@CPhoneIdle@@UAEXHH@Z @ 51 NONAME ; void CPhoneIdle::HandlePhoneEngineMessageL(int, int)
+ ??1CPhoneIdle@@UAE@XZ @ 52 NONAME ; CPhoneIdle::~CPhoneIdle(void)
+ ??1CPhoneCallSetup@@UAE@XZ @ 53 NONAME ; CPhoneCallSetup::~CPhoneCallSetup(void)
+ ?ConstructL@CPhoneIdle@@MAEXXZ @ 54 NONAME ; void CPhoneIdle::ConstructL(void)
+ ??0CPhoneAlerting@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 55 NONAME ; CPhoneAlerting::CPhoneAlerting(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?HandleNumberEntryClearedL@CPhoneTwoSingles@@MAEXXZ @ 56 NONAME ; void CPhoneTwoSingles::HandleNumberEntryClearedL(void)
+ ?CheckIfShowCallTerminationNote@CPhoneAlerting@@MAEHXZ @ 57 NONAME ; int CPhoneAlerting::CheckIfShowCallTerminationNote(void)
+ ??0CPhoneTwoSingles@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 58 NONAME ; CPhoneTwoSingles::CPhoneTwoSingles(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?CallId@CPhoneSingleCall@@IBEHXZ @ 59 NONAME ; int CPhoneSingleCall::CallId(void) const
+ ?HandleConnectedConferenceL@CPhoneTwoSingles@@MAEXH@Z @ 60 NONAME ; void CPhoneTwoSingles::HandleConnectedConferenceL(int)
--- a/phoneapp/phoneuistates/eabi/phoneuistatesu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/eabi/phoneuistatesu.def Fri Jul 09 15:40:55 2010 +0300
@@ -9,250 +9,235 @@
_ZN10CPhoneIdleD1Ev @ 8 NONAME
_ZN10CPhoneIdleD2Ev @ 9 NONAME
_ZN14CPhoneAlerting10ConstructLEv @ 10 NONAME
- _ZN14CPhoneAlerting12OpenMenuBarLEv @ 11 NONAME
- _ZN14CPhoneAlerting14HandleCommandLEi @ 12 NONAME
- _ZN14CPhoneAlerting16HandleConnectedLEi @ 13 NONAME
- _ZN14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 14 NONAME
- _ZN14CPhoneAlerting20HandleDisconnectingLEi @ 15 NONAME
- _ZN14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 16 NONAME
- _ZN14CPhoneAlerting30CheckIfShowCallTerminationNoteEv @ 17 NONAME
- _ZN14CPhoneAlertingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 18 NONAME
- _ZN14CPhoneAlertingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 19 NONAME
- _ZN14CPhoneAlertingD0Ev @ 20 NONAME
- _ZN14CPhoneAlertingD1Ev @ 21 NONAME
- _ZN14CPhoneAlertingD2Ev @ 22 NONAME
- _ZN14CPhoneIncoming10ConstructLEv @ 23 NONAME
- _ZN14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 24 NONAME
- _ZN14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 25 NONAME
- _ZN14CPhoneIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 26 NONAME
- _ZN14CPhoneIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 27 NONAME
- _ZN14CPhoneIncomingD0Ev @ 28 NONAME
- _ZN14CPhoneIncomingD1Ev @ 29 NONAME
- _ZN14CPhoneIncomingD2Ev @ 30 NONAME
- _ZN15CPhoneCallSetup10ConstructLEv @ 31 NONAME
- _ZN15CPhoneCallSetup17HandleConnectingLEi @ 32 NONAME
- _ZN15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 33 NONAME
- _ZN15CPhoneCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 34 NONAME
- _ZN15CPhoneCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 35 NONAME
- _ZN15CPhoneCallSetupD0Ev @ 36 NONAME
- _ZN15CPhoneCallSetupD1Ev @ 37 NONAME
- _ZN15CPhoneCallSetupD2Ev @ 38 NONAME
- _ZN15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 39 NONAME
- _ZN15CPhoneGsmInCall14HandleCommandLEi @ 40 NONAME
- _ZN15CPhoneGsmInCall19SetDivertIndicationEi @ 41 NONAME
- _ZN15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 42 NONAME
- _ZN16CPhoneSingleCall10ConstructLEv @ 43 NONAME
- _ZN16CPhoneSingleCall12OpenMenuBarLEv @ 44 NONAME
- _ZN16CPhoneSingleCall14HandleCommandLEi @ 45 NONAME
- _ZN16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 46 NONAME
- _ZN16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 47 NONAME
- _ZN16CPhoneSingleCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 48 NONAME
- _ZN16CPhoneSingleCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 49 NONAME
- _ZN16CPhoneSingleCallD0Ev @ 50 NONAME
- _ZN16CPhoneSingleCallD1Ev @ 51 NONAME
- _ZN16CPhoneSingleCallD2Ev @ 52 NONAME
- _ZN16CPhoneTwoSingles10ConstructLEv @ 53 NONAME
- _ZN16CPhoneTwoSingles12OpenMenuBarLEv @ 54 NONAME
- _ZN16CPhoneTwoSingles16UpdateInCallCbaLEv @ 55 NONAME
- _ZN16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 56 NONAME
- _ZN16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 57 NONAME
- _ZN16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 58 NONAME
- _ZN16CPhoneTwoSingles26HandleConnectedConferenceLEi @ 59 NONAME
- _ZN16CPhoneTwoSinglesC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 60 NONAME
- _ZN16CPhoneTwoSinglesC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 61 NONAME
- _ZN16CPhoneTwoSinglesD0Ev @ 62 NONAME
- _ZN16CPhoneTwoSinglesD1Ev @ 63 NONAME
- _ZN16CPhoneTwoSinglesD2Ev @ 64 NONAME
- _ZN21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 65 NONAME
- _ZN21CPhoneStateMachineGSM5StateEv @ 66 NONAME
- _ZN21CPhoneStateMachineGSMC1EP23MPhoneViewCommandHandle @ 67 NONAME
- _ZN21CPhoneStateMachineGSMC2EP23MPhoneViewCommandHandle @ 68 NONAME
- _ZN21CPhoneStateMachineGSMD0Ev @ 69 NONAME
- _ZN21CPhoneStateMachineGSMD1Ev @ 70 NONAME
- _ZN21CPhoneStateMachineGSMD2Ev @ 71 NONAME
- _ZN22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 72 NONAME
- _ZN25CPhoneResourceResolverGSM10ConstructLEv @ 73 NONAME
- _ZN25CPhoneResourceResolverGSMC1Ev @ 74 NONAME
- _ZN25CPhoneResourceResolverGSMC2Ev @ 75 NONAME
- _ZN25CPhoneResourceResolverGSMD0Ev @ 76 NONAME
- _ZN25CPhoneResourceResolverGSMD1Ev @ 77 NONAME
- _ZN25CPhoneResourceResolverGSMD2Ev @ 78 NONAME
- _ZN26CPhoneErrorMessagesHandler19SendGlobalInfoNoteLEii @ 79 NONAME
- _ZN26CPhoneErrorMessagesHandler20SendGlobalErrorNoteLEii @ 80 NONAME
- _ZN26CPhoneErrorMessagesHandler22SendGlobalWarningNoteLEii @ 81 NONAME
- _ZN26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 82 NONAME
- _ZN26CPhoneErrorMessagesHandlerC1EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 83 NONAME
- _ZN26CPhoneErrorMessagesHandlerC2EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 84 NONAME
- _ZN26CPhoneErrorMessagesHandlerD0Ev @ 85 NONAME
- _ZN26CPhoneErrorMessagesHandlerD1Ev @ 86 NONAME
- _ZN26CPhoneErrorMessagesHandlerD2Ev @ 87 NONAME
- _ZN26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 88 NONAME
- _ZNK16CPhoneSingleCall6CallIdEv @ 89 NONAME
- _ZNK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 90 NONAME
- _ZTI10CPhoneIdle @ 91 NONAME
- _ZTI13CPhoneStartup @ 92 NONAME
- _ZTI14CPhoneAlerting @ 93 NONAME
- _ZTI14CPhoneIncoming @ 94 NONAME
- _ZTI15CPhoneCallSetup @ 95 NONAME
- _ZTI15CPhoneEmergency @ 96 NONAME
- _ZTI15CPhoneGsmInCall @ 97 NONAME
- _ZTI16CPhoneConference @ 98 NONAME
- _ZTI16CPhoneSingleCall @ 99 NONAME
- _ZTI16CPhoneTwoSingles @ 100 NONAME
- _ZTI21CPhoneStateMachineGSM @ 101 NONAME
- _ZTI22CPhoneSingleAndWaiting @ 102 NONAME
- _ZTI23CPhoneSingleAndAlerting @ 103 NONAME
- _ZTI24CPhoneSingleAndCallSetup @ 104 NONAME
- _ZTI25CPhoneCallSetupAndWaiting @ 105 NONAME
- _ZTI25CPhoneConferenceAndSingle @ 106 NONAME
- _ZTI25CPhoneResourceResolverGSM @ 107 NONAME
- _ZTI26CPhoneConferenceAndWaiting @ 108 NONAME
- _ZTI26CPhoneErrorMessagesHandler @ 109 NONAME
- _ZTI26CPhoneTwoSinglesAndWaiting @ 110 NONAME
- _ZTI28CPhoneConferenceAndCallSetup @ 111 NONAME
- _ZTI30CPhoneUIStateMachineFactoryGSM @ 112 NONAME
- _ZTI31CPhoneGeneralGsmMessagesHandler @ 113 NONAME
- _ZTI34CPhoneSingleAndCallSetupAndWaiting @ 114 NONAME
- _ZTI35CPhoneConferenceAndSingleAndWaiting @ 115 NONAME
- _ZTI38CPhoneConferenceAndWaitingAndCallSetup @ 116 NONAME
- _ZTV10CPhoneIdle @ 117 NONAME
- _ZTV13CPhoneStartup @ 118 NONAME
- _ZTV14CPhoneAlerting @ 119 NONAME
- _ZTV14CPhoneIncoming @ 120 NONAME
- _ZTV15CPhoneCallSetup @ 121 NONAME
- _ZTV15CPhoneEmergency @ 122 NONAME
- _ZTV15CPhoneGsmInCall @ 123 NONAME
- _ZTV16CPhoneConference @ 124 NONAME
- _ZTV16CPhoneSingleCall @ 125 NONAME
- _ZTV16CPhoneTwoSingles @ 126 NONAME
- _ZTV21CPhoneStateMachineGSM @ 127 NONAME
- _ZTV22CPhoneSingleAndWaiting @ 128 NONAME
- _ZTV23CPhoneSingleAndAlerting @ 129 NONAME
- _ZTV24CPhoneSingleAndCallSetup @ 130 NONAME
- _ZTV25CPhoneCallSetupAndWaiting @ 131 NONAME
- _ZTV25CPhoneConferenceAndSingle @ 132 NONAME
- _ZTV25CPhoneResourceResolverGSM @ 133 NONAME
- _ZTV26CPhoneConferenceAndWaiting @ 134 NONAME
- _ZTV26CPhoneErrorMessagesHandler @ 135 NONAME
- _ZTV26CPhoneTwoSinglesAndWaiting @ 136 NONAME
- _ZTV28CPhoneConferenceAndCallSetup @ 137 NONAME
- _ZTV30CPhoneUIStateMachineFactoryGSM @ 138 NONAME
- _ZTV31CPhoneGeneralGsmMessagesHandler @ 139 NONAME
- _ZTV34CPhoneSingleAndCallSetupAndWaiting @ 140 NONAME
- _ZTV35CPhoneConferenceAndSingleAndWaiting @ 141 NONAME
- _ZTV38CPhoneConferenceAndWaitingAndCallSetup @ 142 NONAME
- _ZThn12_N10CPhoneIdleD0Ev @ 143 NONAME
- _ZThn12_N10CPhoneIdleD1Ev @ 144 NONAME
- _ZThn12_N14CPhoneAlertingD0Ev @ 145 NONAME
- _ZThn12_N14CPhoneAlertingD1Ev @ 146 NONAME
- _ZThn12_N14CPhoneIncomingD0Ev @ 147 NONAME
- _ZThn12_N14CPhoneIncomingD1Ev @ 148 NONAME
- _ZThn12_N15CPhoneCallSetupD0Ev @ 149 NONAME
- _ZThn12_N15CPhoneCallSetupD1Ev @ 150 NONAME
- _ZThn12_N15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 151 NONAME
- _ZThn12_N16CPhoneSingleCallD0Ev @ 152 NONAME
- _ZThn12_N16CPhoneSingleCallD1Ev @ 153 NONAME
- _ZThn12_N16CPhoneTwoSinglesD0Ev @ 154 NONAME
- _ZThn12_N16CPhoneTwoSinglesD1Ev @ 155 NONAME
- _ZThn16_N10CPhoneIdleD0Ev @ 156 NONAME
- _ZThn16_N10CPhoneIdleD1Ev @ 157 NONAME
- _ZThn16_N14CPhoneAlerting14HandleCommandLEi @ 158 NONAME
- _ZThn16_N14CPhoneAlertingD0Ev @ 159 NONAME
- _ZThn16_N14CPhoneAlertingD1Ev @ 160 NONAME
- _ZThn16_N14CPhoneIncomingD0Ev @ 161 NONAME
- _ZThn16_N14CPhoneIncomingD1Ev @ 162 NONAME
- _ZThn16_N15CPhoneCallSetupD0Ev @ 163 NONAME
- _ZThn16_N15CPhoneCallSetupD1Ev @ 164 NONAME
- _ZThn16_N15CPhoneGsmInCall14HandleCommandLEi @ 165 NONAME
- _ZThn16_N16CPhoneSingleCall14HandleCommandLEi @ 166 NONAME
- _ZThn16_N16CPhoneSingleCallD0Ev @ 167 NONAME
- _ZThn16_N16CPhoneSingleCallD1Ev @ 168 NONAME
- _ZThn16_N16CPhoneTwoSinglesD0Ev @ 169 NONAME
- _ZThn16_N16CPhoneTwoSinglesD1Ev @ 170 NONAME
- _ZThn20_N10CPhoneIdleD0Ev @ 171 NONAME
- _ZThn20_N10CPhoneIdleD1Ev @ 172 NONAME
- _ZThn20_N14CPhoneAlertingD0Ev @ 173 NONAME
- _ZThn20_N14CPhoneAlertingD1Ev @ 174 NONAME
- _ZThn20_N14CPhoneIncomingD0Ev @ 175 NONAME
- _ZThn20_N14CPhoneIncomingD1Ev @ 176 NONAME
- _ZThn20_N15CPhoneCallSetupD0Ev @ 177 NONAME
- _ZThn20_N15CPhoneCallSetupD1Ev @ 178 NONAME
- _ZThn20_N15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 179 NONAME
- _ZThn20_N16CPhoneSingleCallD0Ev @ 180 NONAME
- _ZThn20_N16CPhoneSingleCallD1Ev @ 181 NONAME
- _ZThn20_N16CPhoneTwoSinglesD0Ev @ 182 NONAME
- _ZThn20_N16CPhoneTwoSinglesD1Ev @ 183 NONAME
- _ZThn24_N10CPhoneIdleD0Ev @ 184 NONAME
- _ZThn24_N10CPhoneIdleD1Ev @ 185 NONAME
- _ZThn24_N14CPhoneAlertingD0Ev @ 186 NONAME
- _ZThn24_N14CPhoneAlertingD1Ev @ 187 NONAME
- _ZThn24_N14CPhoneIncomingD0Ev @ 188 NONAME
- _ZThn24_N14CPhoneIncomingD1Ev @ 189 NONAME
- _ZThn24_N15CPhoneCallSetupD0Ev @ 190 NONAME
- _ZThn24_N15CPhoneCallSetupD1Ev @ 191 NONAME
- _ZThn24_N15CPhoneGsmInCall19SetDivertIndicationEi @ 192 NONAME
- _ZThn24_N16CPhoneSingleCallD0Ev @ 193 NONAME
- _ZThn24_N16CPhoneSingleCallD1Ev @ 194 NONAME
- _ZThn24_N16CPhoneTwoSinglesD0Ev @ 195 NONAME
- _ZThn24_N16CPhoneTwoSinglesD1Ev @ 196 NONAME
- _ZThn32_N16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 197 NONAME
- _ZThn36_N10CPhoneIdleD0Ev @ 198 NONAME
- _ZThn36_N10CPhoneIdleD1Ev @ 199 NONAME
- _ZThn36_N14CPhoneAlertingD0Ev @ 200 NONAME
- _ZThn36_N14CPhoneAlertingD1Ev @ 201 NONAME
- _ZThn36_N14CPhoneIncomingD0Ev @ 202 NONAME
- _ZThn36_N14CPhoneIncomingD1Ev @ 203 NONAME
- _ZThn36_N15CPhoneCallSetupD0Ev @ 204 NONAME
- _ZThn36_N15CPhoneCallSetupD1Ev @ 205 NONAME
- _ZThn36_N16CPhoneSingleCallD0Ev @ 206 NONAME
- _ZThn36_N16CPhoneSingleCallD1Ev @ 207 NONAME
- _ZThn36_N16CPhoneTwoSinglesD0Ev @ 208 NONAME
- _ZThn36_N16CPhoneTwoSinglesD1Ev @ 209 NONAME
- _ZThn4_N10CPhoneIdle12HandleErrorLERK12TPEErrorInfo @ 210 NONAME
- _ZThn4_N10CPhoneIdle25HandlePhoneEngineMessageLEii @ 211 NONAME
- _ZThn4_N10CPhoneIdleD0Ev @ 212 NONAME
- _ZThn4_N10CPhoneIdleD1Ev @ 213 NONAME
- _ZThn4_N14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 214 NONAME
- _ZThn4_N14CPhoneAlertingD0Ev @ 215 NONAME
- _ZThn4_N14CPhoneAlertingD1Ev @ 216 NONAME
- _ZThn4_N14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 217 NONAME
- _ZThn4_N14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 218 NONAME
- _ZThn4_N14CPhoneIncomingD0Ev @ 219 NONAME
- _ZThn4_N14CPhoneIncomingD1Ev @ 220 NONAME
- _ZThn4_N15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 221 NONAME
- _ZThn4_N15CPhoneCallSetupD0Ev @ 222 NONAME
- _ZThn4_N15CPhoneCallSetupD1Ev @ 223 NONAME
- _ZThn4_N16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 224 NONAME
- _ZThn4_N16CPhoneSingleCallD0Ev @ 225 NONAME
- _ZThn4_N16CPhoneSingleCallD1Ev @ 226 NONAME
- _ZThn4_N16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 227 NONAME
- _ZThn4_N16CPhoneTwoSinglesD0Ev @ 228 NONAME
- _ZThn4_N16CPhoneTwoSinglesD1Ev @ 229 NONAME
- _ZThn4_N21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 230 NONAME
- _ZThn4_N21CPhoneStateMachineGSM5StateEv @ 231 NONAME
- _ZThn4_N21CPhoneStateMachineGSMD0Ev @ 232 NONAME
- _ZThn4_N21CPhoneStateMachineGSMD1Ev @ 233 NONAME
- _ZThn4_N22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 234 NONAME
- _ZThn4_N25CPhoneResourceResolverGSMD0Ev @ 235 NONAME
- _ZThn4_N25CPhoneResourceResolverGSMD1Ev @ 236 NONAME
- _ZThn4_N26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 237 NONAME
- _ZThn4_N26CPhoneErrorMessagesHandlerD0Ev @ 238 NONAME
- _ZThn4_N26CPhoneErrorMessagesHandlerD1Ev @ 239 NONAME
- _ZThn4_N26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 240 NONAME
- _ZThn4_NK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 241 NONAME
- _ZThn8_N10CPhoneIdleD0Ev @ 242 NONAME
- _ZThn8_N10CPhoneIdleD1Ev @ 243 NONAME
- _ZThn8_N14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 244 NONAME
- _ZThn8_N14CPhoneAlertingD0Ev @ 245 NONAME
- _ZThn8_N14CPhoneAlertingD1Ev @ 246 NONAME
- _ZThn8_N14CPhoneIncomingD0Ev @ 247 NONAME
- _ZThn8_N14CPhoneIncomingD1Ev @ 248 NONAME
- _ZThn8_N15CPhoneCallSetupD0Ev @ 249 NONAME
- _ZThn8_N15CPhoneCallSetupD1Ev @ 250 NONAME
- _ZThn8_N16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 251 NONAME
- _ZThn8_N16CPhoneSingleCallD0Ev @ 252 NONAME
- _ZThn8_N16CPhoneSingleCallD1Ev @ 253 NONAME
- _ZThn8_N16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 254 NONAME
- _ZThn8_N16CPhoneTwoSinglesD0Ev @ 255 NONAME
- _ZThn8_N16CPhoneTwoSinglesD1Ev @ 256 NONAME
+ _ZN14CPhoneAlerting14HandleCommandLEi @ 11 NONAME
+ _ZN14CPhoneAlerting16HandleConnectedLEi @ 12 NONAME
+ _ZN14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 13 NONAME
+ _ZN14CPhoneAlerting20HandleDisconnectingLEi @ 14 NONAME
+ _ZN14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 15 NONAME
+ _ZN14CPhoneAlerting30CheckIfShowCallTerminationNoteEv @ 16 NONAME
+ _ZN14CPhoneAlertingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 17 NONAME
+ _ZN14CPhoneAlertingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 18 NONAME
+ _ZN14CPhoneAlertingD0Ev @ 19 NONAME
+ _ZN14CPhoneAlertingD1Ev @ 20 NONAME
+ _ZN14CPhoneAlertingD2Ev @ 21 NONAME
+ _ZN14CPhoneIncoming10ConstructLEv @ 22 NONAME
+ _ZN14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 23 NONAME
+ _ZN14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 24 NONAME
+ _ZN14CPhoneIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 25 NONAME
+ _ZN14CPhoneIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 26 NONAME
+ _ZN14CPhoneIncomingD0Ev @ 27 NONAME
+ _ZN14CPhoneIncomingD1Ev @ 28 NONAME
+ _ZN14CPhoneIncomingD2Ev @ 29 NONAME
+ _ZN15CPhoneCallSetup10ConstructLEv @ 30 NONAME
+ _ZN15CPhoneCallSetup17HandleConnectingLEi @ 31 NONAME
+ _ZN15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 32 NONAME
+ _ZN15CPhoneCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 33 NONAME
+ _ZN15CPhoneCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 34 NONAME
+ _ZN15CPhoneCallSetupD0Ev @ 35 NONAME
+ _ZN15CPhoneCallSetupD1Ev @ 36 NONAME
+ _ZN15CPhoneCallSetupD2Ev @ 37 NONAME
+ _ZN15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 38 NONAME
+ _ZN15CPhoneGsmInCall14HandleCommandLEi @ 39 NONAME
+ _ZN15CPhoneGsmInCall19SetDivertIndicationEi @ 40 NONAME
+ _ZN15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 41 NONAME
+ _ZN16CPhoneSingleCall10ConstructLEv @ 42 NONAME
+ _ZN16CPhoneSingleCall14HandleCommandLEi @ 43 NONAME
+ _ZN16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 44 NONAME
+ _ZN16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 45 NONAME
+ _ZN16CPhoneSingleCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 46 NONAME
+ _ZN16CPhoneSingleCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 47 NONAME
+ _ZN16CPhoneSingleCallD0Ev @ 48 NONAME
+ _ZN16CPhoneSingleCallD1Ev @ 49 NONAME
+ _ZN16CPhoneSingleCallD2Ev @ 50 NONAME
+ _ZN16CPhoneTwoSingles10ConstructLEv @ 51 NONAME
+ _ZN16CPhoneTwoSingles16UpdateInCallCbaLEv @ 52 NONAME
+ _ZN16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 53 NONAME
+ _ZN16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 54 NONAME
+ _ZN16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 55 NONAME
+ _ZN16CPhoneTwoSingles26HandleConnectedConferenceLEi @ 56 NONAME
+ _ZN16CPhoneTwoSinglesC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 57 NONAME
+ _ZN16CPhoneTwoSinglesC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 58 NONAME
+ _ZN16CPhoneTwoSinglesD0Ev @ 59 NONAME
+ _ZN16CPhoneTwoSinglesD1Ev @ 60 NONAME
+ _ZN16CPhoneTwoSinglesD2Ev @ 61 NONAME
+ _ZN21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 62 NONAME
+ _ZN21CPhoneStateMachineGSM5StateEv @ 63 NONAME
+ _ZN21CPhoneStateMachineGSMC1EP23MPhoneViewCommandHandle @ 64 NONAME
+ _ZN21CPhoneStateMachineGSMC2EP23MPhoneViewCommandHandle @ 65 NONAME
+ _ZN21CPhoneStateMachineGSMD0Ev @ 66 NONAME
+ _ZN21CPhoneStateMachineGSMD1Ev @ 67 NONAME
+ _ZN21CPhoneStateMachineGSMD2Ev @ 68 NONAME
+ _ZN22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 69 NONAME
+ _ZN25CPhoneResourceResolverGSM10ConstructLEv @ 70 NONAME
+ _ZN25CPhoneResourceResolverGSMC1Ev @ 71 NONAME
+ _ZN25CPhoneResourceResolverGSMC2Ev @ 72 NONAME
+ _ZN25CPhoneResourceResolverGSMD0Ev @ 73 NONAME
+ _ZN25CPhoneResourceResolverGSMD1Ev @ 74 NONAME
+ _ZN25CPhoneResourceResolverGSMD2Ev @ 75 NONAME
+ _ZN26CPhoneErrorMessagesHandler19SendGlobalInfoNoteLEii @ 76 NONAME
+ _ZN26CPhoneErrorMessagesHandler20SendGlobalErrorNoteLEii @ 77 NONAME
+ _ZN26CPhoneErrorMessagesHandler22SendGlobalWarningNoteLEii @ 78 NONAME
+ _ZN26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 79 NONAME
+ _ZN26CPhoneErrorMessagesHandlerC1EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 80 NONAME
+ _ZN26CPhoneErrorMessagesHandlerC2EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 81 NONAME
+ _ZN26CPhoneErrorMessagesHandlerD0Ev @ 82 NONAME
+ _ZN26CPhoneErrorMessagesHandlerD1Ev @ 83 NONAME
+ _ZN26CPhoneErrorMessagesHandlerD2Ev @ 84 NONAME
+ _ZN26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 85 NONAME
+ _ZNK16CPhoneSingleCall6CallIdEv @ 86 NONAME
+ _ZNK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 87 NONAME
+ _ZTI10CPhoneIdle @ 88 NONAME
+ _ZTI13CPhoneStartup @ 89 NONAME
+ _ZTI14CPhoneAlerting @ 90 NONAME
+ _ZTI14CPhoneIncoming @ 91 NONAME
+ _ZTI15CPhoneCallSetup @ 92 NONAME
+ _ZTI15CPhoneEmergency @ 93 NONAME
+ _ZTI15CPhoneGsmInCall @ 94 NONAME
+ _ZTI16CPhoneConference @ 95 NONAME
+ _ZTI16CPhoneSingleCall @ 96 NONAME
+ _ZTI16CPhoneTwoSingles @ 97 NONAME
+ _ZTI21CPhoneStateMachineGSM @ 98 NONAME
+ _ZTI22CPhoneSingleAndWaiting @ 99 NONAME
+ _ZTI23CPhoneSingleAndAlerting @ 100 NONAME
+ _ZTI24CPhoneSingleAndCallSetup @ 101 NONAME
+ _ZTI25CPhoneCallSetupAndWaiting @ 102 NONAME
+ _ZTI25CPhoneConferenceAndSingle @ 103 NONAME
+ _ZTI25CPhoneResourceResolverGSM @ 104 NONAME
+ _ZTI26CPhoneConferenceAndWaiting @ 105 NONAME
+ _ZTI26CPhoneErrorMessagesHandler @ 106 NONAME
+ _ZTI26CPhoneTwoSinglesAndWaiting @ 107 NONAME
+ _ZTI28CPhoneConferenceAndCallSetup @ 108 NONAME
+ _ZTI30CPhoneUIStateMachineFactoryGSM @ 109 NONAME
+ _ZTI31CPhoneGeneralGsmMessagesHandler @ 110 NONAME
+ _ZTI34CPhoneSingleAndCallSetupAndWaiting @ 111 NONAME
+ _ZTI35CPhoneConferenceAndSingleAndWaiting @ 112 NONAME
+ _ZTI38CPhoneConferenceAndWaitingAndCallSetup @ 113 NONAME
+ _ZTV10CPhoneIdle @ 114 NONAME
+ _ZTV13CPhoneStartup @ 115 NONAME
+ _ZTV14CPhoneAlerting @ 116 NONAME
+ _ZTV14CPhoneIncoming @ 117 NONAME
+ _ZTV15CPhoneCallSetup @ 118 NONAME
+ _ZTV15CPhoneEmergency @ 119 NONAME
+ _ZTV15CPhoneGsmInCall @ 120 NONAME
+ _ZTV16CPhoneConference @ 121 NONAME
+ _ZTV16CPhoneSingleCall @ 122 NONAME
+ _ZTV16CPhoneTwoSingles @ 123 NONAME
+ _ZTV21CPhoneStateMachineGSM @ 124 NONAME
+ _ZTV22CPhoneSingleAndWaiting @ 125 NONAME
+ _ZTV23CPhoneSingleAndAlerting @ 126 NONAME
+ _ZTV24CPhoneSingleAndCallSetup @ 127 NONAME
+ _ZTV25CPhoneCallSetupAndWaiting @ 128 NONAME
+ _ZTV25CPhoneConferenceAndSingle @ 129 NONAME
+ _ZTV25CPhoneResourceResolverGSM @ 130 NONAME
+ _ZTV26CPhoneConferenceAndWaiting @ 131 NONAME
+ _ZTV26CPhoneErrorMessagesHandler @ 132 NONAME
+ _ZTV26CPhoneTwoSinglesAndWaiting @ 133 NONAME
+ _ZTV28CPhoneConferenceAndCallSetup @ 134 NONAME
+ _ZTV30CPhoneUIStateMachineFactoryGSM @ 135 NONAME
+ _ZTV31CPhoneGeneralGsmMessagesHandler @ 136 NONAME
+ _ZTV34CPhoneSingleAndCallSetupAndWaiting @ 137 NONAME
+ _ZTV35CPhoneConferenceAndSingleAndWaiting @ 138 NONAME
+ _ZTV38CPhoneConferenceAndWaitingAndCallSetup @ 139 NONAME
+ _ZThn12_N10CPhoneIdleD0Ev @ 140 NONAME
+ _ZThn12_N10CPhoneIdleD1Ev @ 141 NONAME
+ _ZThn12_N14CPhoneAlertingD0Ev @ 142 NONAME
+ _ZThn12_N14CPhoneAlertingD1Ev @ 143 NONAME
+ _ZThn12_N14CPhoneIncomingD0Ev @ 144 NONAME
+ _ZThn12_N14CPhoneIncomingD1Ev @ 145 NONAME
+ _ZThn12_N15CPhoneCallSetupD0Ev @ 146 NONAME
+ _ZThn12_N15CPhoneCallSetupD1Ev @ 147 NONAME
+ _ZThn12_N15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 148 NONAME
+ _ZThn12_N16CPhoneSingleCallD0Ev @ 149 NONAME
+ _ZThn12_N16CPhoneSingleCallD1Ev @ 150 NONAME
+ _ZThn12_N16CPhoneTwoSinglesD0Ev @ 151 NONAME
+ _ZThn12_N16CPhoneTwoSinglesD1Ev @ 152 NONAME
+ _ZThn16_N10CPhoneIdleD0Ev @ 153 NONAME
+ _ZThn16_N10CPhoneIdleD1Ev @ 154 NONAME
+ _ZThn16_N14CPhoneAlerting14HandleCommandLEi @ 155 NONAME
+ _ZThn16_N14CPhoneAlertingD0Ev @ 156 NONAME
+ _ZThn16_N14CPhoneAlertingD1Ev @ 157 NONAME
+ _ZThn16_N14CPhoneIncomingD0Ev @ 158 NONAME
+ _ZThn16_N14CPhoneIncomingD1Ev @ 159 NONAME
+ _ZThn16_N15CPhoneCallSetupD0Ev @ 160 NONAME
+ _ZThn16_N15CPhoneCallSetupD1Ev @ 161 NONAME
+ _ZThn16_N15CPhoneGsmInCall14HandleCommandLEi @ 162 NONAME
+ _ZThn16_N16CPhoneSingleCall14HandleCommandLEi @ 163 NONAME
+ _ZThn16_N16CPhoneSingleCallD0Ev @ 164 NONAME
+ _ZThn16_N16CPhoneSingleCallD1Ev @ 165 NONAME
+ _ZThn16_N16CPhoneTwoSinglesD0Ev @ 166 NONAME
+ _ZThn16_N16CPhoneTwoSinglesD1Ev @ 167 NONAME
+ _ZThn20_N10CPhoneIdleD0Ev @ 168 NONAME
+ _ZThn20_N10CPhoneIdleD1Ev @ 169 NONAME
+ _ZThn20_N14CPhoneAlertingD0Ev @ 170 NONAME
+ _ZThn20_N14CPhoneAlertingD1Ev @ 171 NONAME
+ _ZThn20_N14CPhoneIncomingD0Ev @ 172 NONAME
+ _ZThn20_N14CPhoneIncomingD1Ev @ 173 NONAME
+ _ZThn20_N15CPhoneCallSetupD0Ev @ 174 NONAME
+ _ZThn20_N15CPhoneCallSetupD1Ev @ 175 NONAME
+ _ZThn20_N15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 176 NONAME
+ _ZThn20_N16CPhoneSingleCallD0Ev @ 177 NONAME
+ _ZThn20_N16CPhoneSingleCallD1Ev @ 178 NONAME
+ _ZThn20_N16CPhoneTwoSinglesD0Ev @ 179 NONAME
+ _ZThn20_N16CPhoneTwoSinglesD1Ev @ 180 NONAME
+ _ZThn24_N10CPhoneIdleD0Ev @ 181 NONAME
+ _ZThn24_N10CPhoneIdleD1Ev @ 182 NONAME
+ _ZThn24_N14CPhoneAlertingD0Ev @ 183 NONAME
+ _ZThn24_N14CPhoneAlertingD1Ev @ 184 NONAME
+ _ZThn24_N14CPhoneIncomingD0Ev @ 185 NONAME
+ _ZThn24_N14CPhoneIncomingD1Ev @ 186 NONAME
+ _ZThn24_N15CPhoneCallSetupD0Ev @ 187 NONAME
+ _ZThn24_N15CPhoneCallSetupD1Ev @ 188 NONAME
+ _ZThn24_N15CPhoneGsmInCall19SetDivertIndicationEi @ 189 NONAME
+ _ZThn24_N16CPhoneSingleCallD0Ev @ 190 NONAME
+ _ZThn24_N16CPhoneSingleCallD1Ev @ 191 NONAME
+ _ZThn24_N16CPhoneTwoSinglesD0Ev @ 192 NONAME
+ _ZThn24_N16CPhoneTwoSinglesD1Ev @ 193 NONAME
+ _ZThn32_N16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 194 NONAME
+ _ZThn4_N10CPhoneIdle12HandleErrorLERK12TPEErrorInfo @ 195 NONAME
+ _ZThn4_N10CPhoneIdle25HandlePhoneEngineMessageLEii @ 196 NONAME
+ _ZThn4_N10CPhoneIdleD0Ev @ 197 NONAME
+ _ZThn4_N10CPhoneIdleD1Ev @ 198 NONAME
+ _ZThn4_N14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 199 NONAME
+ _ZThn4_N14CPhoneAlertingD0Ev @ 200 NONAME
+ _ZThn4_N14CPhoneAlertingD1Ev @ 201 NONAME
+ _ZThn4_N14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 202 NONAME
+ _ZThn4_N14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 203 NONAME
+ _ZThn4_N14CPhoneIncomingD0Ev @ 204 NONAME
+ _ZThn4_N14CPhoneIncomingD1Ev @ 205 NONAME
+ _ZThn4_N15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 206 NONAME
+ _ZThn4_N15CPhoneCallSetupD0Ev @ 207 NONAME
+ _ZThn4_N15CPhoneCallSetupD1Ev @ 208 NONAME
+ _ZThn4_N16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 209 NONAME
+ _ZThn4_N16CPhoneSingleCallD0Ev @ 210 NONAME
+ _ZThn4_N16CPhoneSingleCallD1Ev @ 211 NONAME
+ _ZThn4_N16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 212 NONAME
+ _ZThn4_N16CPhoneTwoSinglesD0Ev @ 213 NONAME
+ _ZThn4_N16CPhoneTwoSinglesD1Ev @ 214 NONAME
+ _ZThn4_N21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 215 NONAME
+ _ZThn4_N21CPhoneStateMachineGSM5StateEv @ 216 NONAME
+ _ZThn4_N21CPhoneStateMachineGSMD0Ev @ 217 NONAME
+ _ZThn4_N21CPhoneStateMachineGSMD1Ev @ 218 NONAME
+ _ZThn4_N22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 219 NONAME
+ _ZThn4_N25CPhoneResourceResolverGSMD0Ev @ 220 NONAME
+ _ZThn4_N25CPhoneResourceResolverGSMD1Ev @ 221 NONAME
+ _ZThn4_N26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 222 NONAME
+ _ZThn4_N26CPhoneErrorMessagesHandlerD0Ev @ 223 NONAME
+ _ZThn4_N26CPhoneErrorMessagesHandlerD1Ev @ 224 NONAME
+ _ZThn4_N26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 225 NONAME
+ _ZThn4_NK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 226 NONAME
+ _ZThn8_N10CPhoneIdleD0Ev @ 227 NONAME
+ _ZThn8_N10CPhoneIdleD1Ev @ 228 NONAME
+ _ZThn8_N14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 229 NONAME
+ _ZThn8_N14CPhoneAlertingD0Ev @ 230 NONAME
+ _ZThn8_N14CPhoneAlertingD1Ev @ 231 NONAME
+ _ZThn8_N14CPhoneIncomingD0Ev @ 232 NONAME
+ _ZThn8_N14CPhoneIncomingD1Ev @ 233 NONAME
+ _ZThn8_N15CPhoneCallSetupD0Ev @ 234 NONAME
+ _ZThn8_N15CPhoneCallSetupD1Ev @ 235 NONAME
+ _ZThn8_N16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 236 NONAME
+ _ZThn8_N16CPhoneSingleCallD0Ev @ 237 NONAME
+ _ZThn8_N16CPhoneSingleCallD1Ev @ 238 NONAME
+ _ZThn8_N16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 239 NONAME
+ _ZThn8_N16CPhoneTwoSinglesD0Ev @ 240 NONAME
+ _ZThn8_N16CPhoneTwoSinglesD1Ev @ 241 NONAME
--- a/phoneapp/phoneuistates/inc/cphonealerting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonealerting.h Fri Jul 09 15:40:55 2010 +0300
@@ -83,11 +83,6 @@
IMPORT_C virtual void HandleKeyMessageL(
TPhoneKeyEventMessages aMessage,
TKeyCode aCode );
-
- /**
- * Open menu bar
- */
- IMPORT_C virtual void OpenMenuBarL();
/**
* Handles user selected UI commands.
--- a/phoneapp/phoneuistates/inc/cphonecallsetupandwaiting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonecallsetupandwaiting.h Fri Jul 09 15:40:55 2010 +0300
@@ -75,10 +75,6 @@
*/
virtual void ConstructL();
- /**
- * Open menu bar
- */
- virtual void OpenMenuBarL();
virtual void UpdateInCallCbaL();
--- a/phoneapp/phoneuistates/inc/cphoneconference.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconference.h Fri Jul 09 15:40:55 2010 +0300
@@ -86,8 +86,6 @@
TEventCode aEventCode );
virtual void HandleNumberEntryClearedL();
-
- virtual void OpenMenuBarL();
virtual void HandleIdleL( TInt aCallId );
@@ -105,46 +103,26 @@
virtual void DisplayCallSetupL( TInt aCallId );
- virtual TBool IsConferenceBubbleInSelectionMode() const;
-
virtual void UpdateInCallCbaL();
-
- void CloseSelectionListL();
-
- virtual void SetHoldFlagL();
-
- virtual void DefineAndSetHoldFlagL();
-
- virtual void HandleCreateNumberEntryL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
void UpdateConferenceSecurityStatusL( TInt aCallId );
private:
-
- void OpenParticipantsListL();
void HandleHeldConferenceL( TInt aCallId );
void HandleConnectedConferenceL();
void ToggleHoldL();
-
- void OpenDropParticipantSelectionL();
void DropSelectedParticipantL();
- void OpenPrivateSelectionL();
-
void PrivateSelectedParticipantL();
void MakeStateTransitionToIdleL();
void HandleDiallingL( TInt aCallId );
-
- void CallFromNewCallQueryL();
void HandleWentOneToOneL( TInt aCallId );
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandcallsetup.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandcallsetup.h Fri Jul 09 15:40:55 2010 +0300
@@ -81,8 +81,6 @@
*/
virtual void ConstructL();
- virtual void OpenMenuBarL();
-
virtual void UpdateInCallCbaL();
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandsingle.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandsingle.h Fri Jul 09 15:40:55 2010 +0300
@@ -80,8 +80,6 @@
*/
virtual void ConstructL();
- virtual void OpenMenuBarL();
-
virtual void UpdateInCallCbaL();
virtual void HandleIncomingL( TInt aCallId );
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h Fri Jul 09 15:40:55 2010 +0300
@@ -81,8 +81,6 @@
*/
virtual void ConstructL();
- virtual void OpenMenuBarL();
-
virtual void HandleIdleL( TInt aCallId );
virtual void HandleConferenceIdleL();
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h Fri Jul 09 15:40:55 2010 +0300
@@ -87,8 +87,6 @@
*/
virtual void ConstructL();
- virtual void OpenMenuBarL();
-
virtual void UpdateInCallCbaL();
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h Fri Jul 09 15:40:55 2010 +0300
@@ -78,9 +78,7 @@
/**
* ConstructL()
*/
- virtual void ConstructL();
-
- virtual void OpenMenuBarL();
+ virtual void ConstructL();
virtual void UpdateInCallCbaL();
--- a/phoneapp/phoneuistates/inc/cphoneemergency.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneemergency.h Fri Jul 09 15:40:55 2010 +0300
@@ -95,11 +95,6 @@
* Handle state-specific behaviour handleErrorL
*/
void HandleErrorL( const TPEErrorInfo& aErrorInfo );
-
- /**
- * Open menu bar
- */
- void OpenMenuBarL();
virtual void UpdateInCallCbaL();
@@ -146,13 +141,6 @@
* Handle initializing cba's
*/
void UpdateSetupCbaL();
-
- /**
- * Passes create number entry command forward if not call setup
- */
- void HandleCreateNumberEntryL(
- const TKeyEvent& aKeyEvent,
- TEventCode aEventCode );
/**
* Handles commands from the Remote Control framework.
--- a/phoneapp/phoneuistates/inc/cphonesingleandalerting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandalerting.h Fri Jul 09 15:40:55 2010 +0300
@@ -90,10 +90,6 @@
void HandleIdleL( TInt aCallId );
/**
- * Open menu bar
- */
- virtual void OpenMenuBarL();
- /**
* Update InCallCba
*/
virtual void UpdateInCallCbaL();
@@ -102,4 +98,4 @@
#endif // CPhoneSingleAndAlerting_H
-// End of File
\ No newline at end of file
+// End of File
--- a/phoneapp/phoneuistates/inc/cphonesingleandcallsetupandwaiting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandcallsetupandwaiting.h Fri Jul 09 15:40:55 2010 +0300
@@ -80,11 +80,6 @@
*/
virtual void ConstructL();
- /**
- * Open menu bar
- */
- virtual void OpenMenuBarL();
-
virtual void UpdateInCallCbaL();
private:
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h Fri Jul 09 15:40:55 2010 +0300
@@ -101,11 +101,6 @@
TEventCode aEventCode );
/**
- * Opens menu bar.
- */
- virtual void OpenMenuBarL();
-
- /**
* Sets correct in call CBAs.
*/
virtual void UpdateInCallCbaL();
@@ -144,11 +139,6 @@
void HandleConnectedL( TInt aCallId );
/**
- * Fetches phone number from new call quoery and dials that number.
- */
- void CallFromNewCallQueryL();
-
- /**
* Handles received dialing message from Phone Engine.
* @param aCallId - call id that received the event
*/
--- a/phoneapp/phoneuistates/inc/cphonesinglecall.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesinglecall.h Fri Jul 09 15:40:55 2010 +0300
@@ -82,11 +82,6 @@
IMPORT_C virtual void ConstructL();
/**
- * Open menu bar
- */
- IMPORT_C virtual void OpenMenuBarL();
-
- /**
* Returns call identifier of the call this state is associated with.
* @return Call identifier.
*/
@@ -106,17 +101,11 @@
void DisplayIncomingCallL(
TInt aCallId,
const TPhoneCmdParamBoolean aCommandParam );
-
- void CallFromNewCallQueryL();
void HandleDiallingL( TInt aCallId );
void DisplayCallSetupL( TInt aCallId );
- void SetCallResumeL();
-
- void SetCallHoldL();
-
void SwitchToVideoL();
void SwitchToVoiceL();
@@ -133,4 +122,4 @@
#endif // CPHONESINGLECALL_H
-// End of File
\ No newline at end of file
+// End of File
--- a/phoneapp/phoneuistates/inc/cphonetwosingles.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonetwosingles.h Fri Jul 09 15:40:55 2010 +0300
@@ -83,8 +83,6 @@
*/
IMPORT_C virtual void HandleNumberEntryClearedL();
- IMPORT_C virtual void OpenMenuBarL();
-
IMPORT_C virtual void HandleConnectedConferenceL( TInt aCallId );
IMPORT_C virtual void UpdateInCallCbaL();
--- a/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h Fri Jul 09 15:40:55 2010 +0300
@@ -94,11 +94,6 @@
* ConstructL()
*/
virtual void ConstructL();
-
- /**
- * Open menu bar
- */
- virtual void OpenMenuBarL();
virtual void HandleConnectedConferenceL( TInt aCallId );
--- a/phoneapp/phoneuistates/src/cphonealerting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -131,11 +131,9 @@
if ( IsNumberEntryUsedL() )
{
- BeginTransEffectLC( ENumberEntryClose );
// Remove number entry from screen
iViewCommandHandle->ExecuteCommandL(
EPhoneViewRemoveNumberEntry );
- EndTransEffect();
// Do state-specific operation when number entry is cleared
HandleNumberEntryClearedL();
}
@@ -242,17 +240,12 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
BeginUiUpdateLC();
// Update the single call
UpdateSingleActiveCallL( aCallId );
SetTouchPaneButtons( EPhoneIncallButtons );
-
- SetToolbarDimming( EFalse );
EndUiUpdate();
@@ -262,42 +255,6 @@
}
// -----------------------------------------------------------
-// CPhoneAlerting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneAlerting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneAlerting::OpenMenuBarL()");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneAlertingCallMenubarWithNumberEntry;
- }
- // Use different resources for alerting data, video and cs call
- else if( IsVideoCallAlertingL() )
- {
- resourceId = EPhoneAlertingVideoCallMenubar;
- }
- else
- {
- resourceId = EPhoneAlertingCallMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneAlerting::HandleCommandL
// -----------------------------------------------------------
//
@@ -305,30 +262,7 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneAlerting::HandleCommandL()" );
- TBool commandStatus = ETrue;
-
- switch( aCommand )
- {
- case EPhoneInCallCmdHelp:
- {
- TPtrC contextName;
- if ( IsVideoCallAlertingL() )
- {
- contextName.Set( KINCAL_HLP_VIDEOCALL() );
- }
- else
- {
- contextName.Set( KINCAL_HLP_CALL_HANDLING() );
- }
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewLaunchHelpApplication, 0, contextName );
- }
- break;
- default:
- commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
- break;
- }
- return commandStatus;
+ return CPhoneGsmInCall::HandleCommandL( aCommand );
}
// -----------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -173,14 +173,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
&callHeaderParam );
- // Remove the number entry if it isn't DTMF dialer
- /*if ( !iOnScreenDialer ||
- !IsNumberEntryVisibleL() ||
- !IsDTMFEditorVisibleL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
- }*/
-
SetToolbarButtonLoudspeakerEnabled();
EndUiUpdate();
--- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -120,37 +120,6 @@
}
// -----------------------------------------------------------
-// CPhoneCallSetupAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneCallSetupAndWaiting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneCallSetupAndWaiting::OpenMenuBarL()");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneAlertingAndWaitingCallMenuBarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneAlertingAndWaitingCallMenuBar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneCallSetupAndWaiting::HandleIdleL
// -----------------------------------------------------------
//
@@ -164,9 +133,6 @@
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Find out do we have waiting or outgoing call left
TPhoneCmdParamCallStateData callStateData;
callStateData.SetCallState( EPEStateRinging );
@@ -175,12 +141,6 @@
if( callStateData.CallId() > KErrNotFound )
{
- // Idle message came for callSetup
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
// Display ringing bubble
TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -194,14 +154,12 @@
// Show incoming call buttons
SetTouchPaneButtons( EPhoneIncomingCallButtons );
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
// Bring up callhandling view
BringIncomingToForegroundL();
// state changes to Incoming
iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
- UpdateSilenceButtonDimming();
SetRingingTonePlaybackL( callStateData.CallId() );
SetBackButtonActive(EFalse);
iStateMachine->ChangeState( EPhoneStateIncoming );
@@ -239,9 +197,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetupAndWaiting::HandleConnectedL() ");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
CPhoneState::BeginUiUpdateLC();
// Update bubble
@@ -252,7 +207,6 @@
// Update Touch buttons
CPhoneState::SetTouchPaneButtons( EPhoneWaitingCallButtons );
- SetToolbarDimming( EFalse );
CPhoneState::EndUiUpdate();
--- a/phoneapp/phoneuistates/src/cphoneconference.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -81,9 +81,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
-
- DefineAndSetHoldFlagL();
-
}
// -----------------------------------------------------------
@@ -195,7 +192,6 @@
{
case EAknSoftkeyCancel:
BeginUiUpdateLC();
- CloseSelectionListL();
SetTouchPaneButtons( EPhoneConferenceButtons );
EndUiUpdate();
UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -215,7 +211,6 @@
// Conference -> Drop participant
case EPhoneInCallCmdDropSelection:
- OpenDropParticipantSelectionL();
break;
// Drop CBA
@@ -224,7 +219,6 @@
break;
case EPhoneInCallCmdPrivateSelection:
- OpenPrivateSelectionL();
break;
case EPhoneInCallCmdPrivate:
@@ -232,25 +226,13 @@
break;
case EPhoneInCallCmdNewCall:
- LaunchNewCallQueryL();
break;
case EPhoneInCallCmdNewCallCall:
- CallFromNewCallQueryL();
break;
case EPhoneInCallCmdParticipants:
- OpenParticipantsListL();
- break;
-
- case EPhoneViewOpenNumberEntry:
- if ( IsConferenceBubbleInSelectionMode() )
- {
- CloseSelectionListL();
- SetTouchPaneButtons( EPhoneConferenceButtons );
- }
- commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
- break;
+ break;
default:
commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
@@ -270,42 +252,6 @@
}
// -----------------------------------------------------------
-// CPhoneConference::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConference::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::OpenMenuBarL()");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneConfCallMenubarWithNumberEntry;
- }
- else if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling )
- && IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsMenubar;
- }
- else
- {
- resourceId = EPhoneConfCallMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConference::HandleKeyEventL
// -----------------------------------------------------------
//
@@ -315,33 +261,19 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::HandleKeyEventL()");
- if ( IsConferenceBubbleInSelectionMode() )
+
+ if ( CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
{
- if ( aKeyEvent.iCode == EKeyUpArrow ||
- aKeyEvent.iCode == EKeyDownArrow )
- {
- TPhoneCmdParamKeyEvent keyEventParam;
- keyEventParam.SetKeyEvent( aKeyEvent );
- keyEventParam.SetEventCode( aEventCode );
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewMoveHighLightInList, &keyEventParam );
- }
+ // Handle numeric keys when key events are received
+ // in conference state.
+ CPhoneGsmInCall::HandleNumericKeyEventL( aKeyEvent, aEventCode );
}
else
{
- if ( CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
- {
- // Handle numeric keys when key events are received
- // in conference state.
- CPhoneGsmInCall::HandleNumericKeyEventL( aKeyEvent, aEventCode );
- }
- else
- {
- // Handle other key events.
- CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
- }
+ // Handle other key events.
+ CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
}
+
}
// --------------------------------------------------------------
@@ -404,12 +336,6 @@
// Stop capturing keys
CaptureKeysDuringCallNotificationL( EFalse );
-
- // If dialler is not open then close menu bar.
- if ( !IsNumberEntryUsedL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- }
// If conference bubble still exists then we have conference and
// single call
@@ -439,8 +365,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::HandleConferenceIdleL()");
-
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
@@ -484,8 +408,7 @@
break;
}
- EndUiUpdate();
- EndTransEffect();
+ EndUiUpdate();
}
// -----------------------------------------------------------
@@ -512,61 +435,16 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewUpdateBubble, aCallId, &callHeaderParam );
-
- // Set Hold flag to view
- SetHoldFlagL();
-
+
if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
{
SendGlobalInfoNoteL( EPhoneInformationConferenceOnHold, ETrue );
}
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
SetTouchPaneButtons( EPhoneConferenceButtons );
UpdateInCallCbaL();
}
-
-// -----------------------------------------------------------
-// CPhoneConference::DefineAndSetHoldFlagL
-// -----------------------------------------------------------
-//
-void CPhoneConference::DefineAndSetHoldFlagL()
- {
- // Find out is conference held or not
- TPhoneCmdParamCallStateData callStateData;
- callStateData.SetCallId( KConferenceCallId );
- iViewCommandHandle->HandleCommandL( EPhoneViewGetCallState,
- &callStateData );
-
- // Set Hold flag to view
- TPhoneCmdParamBoolean holdFlag;
-
- if( callStateData.CallState() == EPEStateHeld )
- {
- holdFlag.SetBoolean( ETrue );
- }
- else
- {
- holdFlag.SetBoolean( EFalse );
- }
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- }
-
-// -----------------------------------------------------------
-// CPhoneConference::SetHoldFlagL
-// -----------------------------------------------------------
-//
-void CPhoneConference::SetHoldFlagL()
- {
- // Set Hold flag to view
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- }
-
// -----------------------------------------------------------
// CPhoneConference::HandleConnectedConferenceL
// -----------------------------------------------------------
@@ -602,29 +480,12 @@
SendGlobalInfoNoteL( EPhoneInformationConferenceActiveted, ETrue );
}
- SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
SetTouchPaneButtons( EPhoneConferenceButtons );
UpdateInCallCbaL();
}
// -----------------------------------------------------------
-// CPhoneConference::OpenDropParticipantSelectionL
-// -----------------------------------------------------------
-//
-void CPhoneConference::OpenDropParticipantSelectionL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::OpenDropParticipantSelectionL()");
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewOpenConferenceList, &booleanParam );
-
- iCbaManager->SetCbaL( EPhoneDropParticipantCBA );
- }
-
-// -----------------------------------------------------------
// CPhoneConference::DropSelectedParticipantL
// -----------------------------------------------------------
//
@@ -648,22 +509,6 @@
}
// -----------------------------------------------------------
-// CPhoneConference::OpenPrivateSelectionL
-// -----------------------------------------------------------
-//
-void CPhoneConference::OpenPrivateSelectionL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::OpenPrivateSelectionL()");
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewOpenConferenceList, &booleanParam );
-
- iCbaManager->SetCbaL( EPhonePrivateParticipantCBA );
- }
-
-// -----------------------------------------------------------
// CPhoneConference::PrivateSelectedParticipantL
// -----------------------------------------------------------
//
@@ -686,7 +531,6 @@
// Update call view
BeginUiUpdateLC();
- CloseSelectionListL();
SetTouchPaneButtons( EPhoneConferenceButtons );
EndUiUpdate();
@@ -708,20 +552,10 @@
if ( IsNumberEntryUsedL() )
{
// 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();
- }
+ SetNumberEntryVisibilityL(ETrue);
}
else if ( !TopAppIsDisplayedL() )
{
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Continue displaying current app but set up the
// idle screen in the background
@@ -729,9 +563,6 @@
}
else
{
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Display idle screen
DisplayIdleScreenL();
}
@@ -752,8 +583,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::MakeStateTransitionToSingleL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
if ( IsNumberEntryUsedL() )
{
@@ -775,8 +604,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::MakeStateTransitionToTwoSinglesL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
if ( IsNumberEntryUsedL() )
{
@@ -794,21 +621,6 @@
}
// -----------------------------------------------------------
-// CPhoneConference::CloseSelectionListL
-// -----------------------------------------------------------
-//
-void CPhoneConference::CloseSelectionListL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::CloseSelectionListL()");
- // Close conference list
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewOpenConferenceList, &booleanParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConference::ToggleHold
// -----------------------------------------------------------
//
@@ -816,18 +628,25 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::ToggleHoldL()");
- TPhoneCmdParamBoolean hold;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetHoldFlag, &hold );
+
+ TPECallControlCaps callControlCaps =
+ iStateMachine->PhoneEngineInfo()->CallControlCaps( KConferenceCallId );
- if( hold.Boolean() )
+ if ( callControlCaps & MCCECallObserver::ECCECapsHold )
{
+ iStateMachine->SetCallId( KConferenceCallId );
iStateMachine->SendPhoneEngineMessage(
- CPEPhoneModelIF::EPEMessageResumeConference );
+ CPEPhoneModelIF::EPEMessageHold );
+ }
+ else if ( callControlCaps & MCCECallObserver::ECCECapsResume )
+ {
+ iStateMachine->SetCallId( KConferenceCallId );
+ iStateMachine->SendPhoneEngineMessage(
+ CPEPhoneModelIF::EPEMessageResume );
}
else
{
- iStateMachine->SendPhoneEngineMessage(
- CPEPhoneModelIF::EPEMessageHoldConference );
+ SendGlobalInfoNoteL( EPhoneNoteTextNotAllowed, ETrue );
}
}
@@ -839,12 +658,8 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::HandleDiallingL()");
-
- BeginTransEffectLC( ENumberEntryClose );
BeginUiUpdateLC();
- CloseSelectionListL();
-
SetNumberEntryVisibilityL(EFalse);
// Display call setup
@@ -854,8 +669,6 @@
SetTouchPaneButtons(EPhoneCallSetupAndSingleButtons);
EndUiUpdate();
-
- EndTransEffect();
// Set Call Setup CBA
UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
@@ -872,8 +685,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::DisplayCallSetupL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Remove dialogs if necessary
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
@@ -891,32 +702,6 @@
DisplayHeaderForOutgoingCallL( aCallId );
}
-// ---------------------------------------------------------
-// CPhoneConference::CallFromNewCallQueryL
-// ---------------------------------------------------------
-//
-void CPhoneConference::CallFromNewCallQueryL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::CallFromNewCallQueryL()");
- // First get the phone number from the dialog
- TPhoneCmdParamString phoneNumberParam;
- HBufC *content = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( content->Des() );
- phoneNumberParam.SetString( &ptr );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
- &phoneNumberParam );
-
- // Store the phone number
- iStateMachine->PhoneEngineInfo()->SetPhoneNumber( ptr );
-
- // clean up stack
- CleanupStack::PopAndDestroy( content );
-
- // Dial number
- DialVoiceCallL();
- }
-
// -----------------------------------------------------------
// CPhoneConference::HandleIncomingL
// -----------------------------------------------------------
@@ -933,9 +718,6 @@
// Get allow waiting call header param value.
AllowShowingOfWaitingCallHeaderL( dialerParam );
-
- CloseSelectionListL();
-
// Close fast swap window if it's displayed
CEikonEnv::Static()->DismissTaskList();
@@ -964,8 +746,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConference::DisplayIncomingCallL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Cannot delete active note, e.g. New call query,
// but show waiting note with or without caller name
@@ -1028,7 +808,6 @@
UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
}
else
{
@@ -1036,73 +815,6 @@
}
EndUiUpdate();
}
-
-// -----------------------------------------------------------
-// CPhoneConference::OpenParticipantsListL
-// -----------------------------------------------------------
-//
-void CPhoneConference::OpenParticipantsListL()
- {
- BeginUiUpdateLC();
-
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenConferenceList,
- &booleanParam );
-
- SetTouchPaneButtons( EPhoneParticipantListButtons );
-
- EndUiUpdate();
-
- iCbaManager->SetCbaL( EPhoneParticipantListCBA );
-
- // Find out is conference held or not
- TPhoneCmdParamCallStateData callStateData;
- callStateData.SetCallId( KConferenceCallId );
- iViewCommandHandle->HandleCommandL( EPhoneViewGetCallState,
- &callStateData );
-
- if( callStateData.CallState() == EPEStateHeld )
- {
- //set Private button to Dimmed.
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
- }
- else
- {
- //set Private button to UnDimmed.
- SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
- }
-
- }
-
-// -----------------------------------------------------------
-// CPhoneConference::IsConferenceBubbleInSelectionMode
-// -----------------------------------------------------------
-//
-TBool CPhoneConference::IsConferenceBubbleInSelectionMode() const
- {
- TPhoneCmdParamBoolean booleanParam;
-
- iViewCommandHandle->ExecuteCommand(
- EPhoneViewGetIsConferenceInSelectionMode, &booleanParam );
-
- return booleanParam.Boolean();
- }
-
-// ---------------------------------------------------------
-// CPhoneState::HandleCreateNumberEntryL
-// ---------------------------------------------------------
-//
-void CPhoneConference::HandleCreateNumberEntryL( const TKeyEvent& aKeyEvent,
- TEventCode aEventCode )
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneConference::HandleCreateNumberEntryL() ");
- if ( !IsConferenceBubbleInSelectionMode() )
- {
- CPhoneGsmInCall::HandleCreateNumberEntryL( aKeyEvent,aEventCode );
- }
- }
// -----------------------------------------------------------
// CPhoneConference::UpdateConferenceSecurityStatusL
--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -52,14 +52,6 @@
//
CPhoneConferenceAndCallSetup::~CPhoneConferenceAndCallSetup()
{
- // Reset flag
- if ( iViewCommandHandle )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
- }
}
// -----------------------------------------------------------
@@ -144,7 +136,6 @@
{
case EPhoneDtmfDialerCancel:
{
- CloseDTMFEditorL();
}
break;
@@ -187,46 +178,6 @@
break;
}
}
-// -----------------------------------------------------------
-// CPhoneConferenceAndCallSetup::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndCallSetup::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::OpenMenuBarL()");
- TInt resourceId;
-
- // Set specific flag to view so that DTMF menu item available
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneAlertingAndConfHeldCallMenuBarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
- else
- {
- resourceId = EPhoneAlertingAndConfHeldCallMenuBar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
// -----------------------------------------------------------
// CPhoneConferenceAndCallSetup::HandleConnectingL
@@ -252,7 +203,7 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || ! IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -281,9 +232,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectedL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Keep Phone in the foreground
TPhoneCmdParamBoolean booleanParam;
booleanParam.SetBoolean( EFalse );
@@ -303,13 +251,12 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || ! IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
EndUiUpdate();
UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA );
@@ -334,9 +281,6 @@
// Stop capturing keys
CaptureKeysDuringCallNotificationL( EFalse );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
TPhoneCmdParamBoolean conferenceExistsForCallId;
iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
aCallId, &conferenceExistsForCallId );
@@ -375,7 +319,6 @@
else
{
// Remove outgoing call
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -390,7 +333,6 @@
SetTouchPaneButtons( EPhoneConferenceButtons );
EndUiUpdate();
- EndTransEffect();
// Go to conference state
UpdateCbaL( EPhoneCallHandlingInCallCBA );
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -57,14 +57,6 @@
//
CPhoneConferenceAndSingle::~CPhoneConferenceAndSingle()
{
- // Reset flag
- if ( iViewCommandHandle )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
- }
}
// -----------------------------------------------------------
@@ -76,7 +68,6 @@
void CPhoneConferenceAndSingle::ConstructL()
{
CPhoneConference::ConstructL();
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
}
// -----------------------------------------------------------
@@ -164,7 +155,6 @@
case EAknSoftkeyCancel:
commandStatus = CPhoneConference::HandleCommandL( aCommand );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
SetTouchPaneButtons( EPhoneConferenceAndHeldSingleButtons );
break;
@@ -174,8 +164,6 @@
break;
case EPhoneInCallCmdParticipants:
- commandStatus = CPhoneConference::HandleCommandL( aCommand );
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
break;
default:
@@ -187,116 +175,6 @@
}
// -----------------------------------------------------------
-// CPhoneConferenceAndSingle::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingle::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::OpenMenuBarL");
-
- // Set Conference And Single specific flag to view
- TPhoneCmdParamBoolean conferenceAndSingleFlag;
- conferenceAndSingleFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag,
- &conferenceAndSingleFlag );
-
- // Set specific flag to view so that DTMF menu item available
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
-
- TPhoneViewResponseId response;
- TPhoneCmdParamCallStateData callStateData;
- TPhoneCmdParamBoolean booleaParam;
- TInt heldCallId( KErrNotFound );
- TInt connectedCallId( KErrNotFound );
-
- // Fetch active call's id from view
- callStateData.SetCallState( EPEStateConnected );
- response = iViewCommandHandle->HandleCommandL(
- EPhoneViewGetCallIdByState, &callStateData );
- if( response != EPhoneViewResponseSuccess )
- {
- // Unsuccesfull fetch - do nothing
- return;
- }
- connectedCallId = callStateData.CallId();
-
- // Fetch held call's id from view
- callStateData.SetCallState( EPEStateHeld );
- response = iViewCommandHandle->HandleCommandL(
- EPhoneViewGetCallIdByState, &callStateData );
- if( response != EPhoneViewResponseSuccess )
- {
- // Unsuccesfull fetch - do nothing
- return;
- }
- heldCallId = callStateData.CallId();
-
- // Open the correct menubar according which call is active
- TInt resourceId;
- if( connectedCallId == KConferenceCallId )
- {
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneConfAndHeldCallMenubarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
- else
- {
- resourceId = EPhoneConfAndHeldCallMenubar;
- }
- }
- else
- {
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneActiveAndHeldConfMenubarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
- else
- {
- resourceId = EPhoneActiveAndHeldConfMenubar;
- }
- }
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
-
- // Check that calls are the same type (f.ex. both are CS calls)
- booleaParam.SetBoolean(
- heldCallId != KErrNotFound && connectedCallId != KErrNotFound &&
- iStateMachine->PhoneEngineInfo()->CallType( heldCallId ) !=
- iStateMachine->PhoneEngineInfo()->CallType( connectedCallId ));
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConfrenceOptionsFlag,
- &booleaParam );
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
- {
- resourceId = CustomizedDialerMenuResourceIdL();
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConferenceAndSingle::HandleConnectedConferenceL
// -----------------------------------------------------------
//
@@ -354,8 +232,6 @@
callLabelId,
CCoeEnv::Static() );
callHeaderParam.SetLabelText( labelText );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
BeginUiUpdateLC();
@@ -427,15 +303,9 @@
UpdateConferenceSecurityStatusL( aCallId );
SetTouchPaneButtons( EPhoneConferenceButtons );
- SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
EndUiUpdate();
- TPhoneCmdParamBoolean conferenceAndSingleFlag;
- conferenceAndSingleFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag,
- &conferenceAndSingleFlag );
-
UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateConference );
}
@@ -468,12 +338,6 @@
// Get allow waiting call header param value.
AllowShowingOfWaitingCallHeaderL( dialerParam );
- // Close conference list
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewOpenConferenceList, &booleanParam );
-
iViewCommandHandle->ExecuteCommandL( EPhoneViewCloseFSW );
// Check if HW Keys or Call UI should be disabled
@@ -483,15 +347,9 @@
DisplayIncomingCallL( aCallId, dialerParam );
// Set touch controls
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneWaitingCallButtons );
EndUiUpdate();
-
- TPhoneCmdParamBoolean conferenceAndSingleFlag;
- conferenceAndSingleFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag,
- &conferenceAndSingleFlag );
// Go to Conference And Single And Waiting state
UpdateCbaL( EPhoneCallHandlingIncomingRejectCBA );
@@ -507,12 +365,6 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndSingle::HandleIdleL");
- // If dialler is not open then close menu bar.
- if ( !IsNumberEntryUsedL() )
- {
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- }
-
TPhoneCmdParamBoolean conferenceExistsForCallId;
iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
aCallId, &conferenceExistsForCallId );
@@ -522,8 +374,6 @@
// Remove conference member from conference bubble
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference,
aCallId );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
}
else
{
@@ -531,24 +381,9 @@
BeginUiUpdateLC();
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
- TPhoneCmdParamBoolean conferenceAndSingleFlag;
- conferenceAndSingleFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag,
- &conferenceAndSingleFlag );
-
- TPhoneCmdParamBoolean participantsVisibleFlag;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetConferenceListVisibleFlag,
- &participantsVisibleFlag );
+ SetTouchPaneButtons( EPhoneConferenceButtons );
- // if participants list is visible - do not change buttons or cba
- if( !participantsVisibleFlag.Boolean() )
- {
- // Go to Conference state
- SetTouchPaneButtons( EPhoneConferenceButtons );
- SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
-
- UpdateCbaL( EPhoneCallHandlingInCallCBA );
- }
+ UpdateCbaL( EPhoneCallHandlingInCallCBA );
EndUiUpdate();
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -57,14 +57,6 @@
//
CPhoneConferenceAndSingleAndWaiting::~CPhoneConferenceAndSingleAndWaiting()
{
- // Reset flag
- if ( iViewCommandHandle )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
- }
}
// -----------------------------------------------------------
@@ -126,72 +118,6 @@
}
// -----------------------------------------------------------
-// CPhoneConferenceAndSingleAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingleAndWaiting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConferenceAndSingleAndWaiting::OpenMenuBarL()");
- TInt resourceId = NULL;
-
- // Set specific flag to view so that DTMF menu item available
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
-
-
- TPhoneCmdParamCallStateData callStateData;
- callStateData.SetCallState( EPEStateHeld );
- iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
- &callStateData );
- if( callStateData.CallId() == KConferenceCallId )
- {
- // Conference call is on hold and single is active
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneCallActiveHeldConfAndWaitingMenubarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
- else
- {
- resourceId = EPhoneCallActiveHeldConfAndWaitingMenubar;
- }
- }
- else if( callStateData.CallId() >= 0 )
- {
- // Single call is on hold and conference is active
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneConfCallActiveHeldAndWaitingMenubarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
- else
- {
- resourceId = EPhoneConfCallActiveHeldAndWaitingMenubar;
- }
- }
- else
- {
- return; // negative call id, don't do anything
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConferenceAndSingleAndWaiting::HandleIdleL
// -----------------------------------------------------------
//
@@ -200,17 +126,8 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndSingleAndWaiting::HandleIdleL()");
- // Effect is shown when dialer exist.
- TBool effectStarted ( EFalse );
- if ( !NeedToSendToBackgroundL() )
- {
- BeginTransEffectLC( ENumberEntryOpen );
- effectStarted = ETrue;
- }
-
BeginUiUpdateLC();
// Set touch controls
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneWaitingCallButtons );
@@ -256,10 +173,6 @@
}
}
EndUiUpdate();
- if ( effectStarted )
- {
- EndTransEffect();
- }
}
// -----------------------------------------------------------
@@ -285,14 +198,8 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndWaitingL()");
- if ( !IsNumberEntryUsedL() )
- {
- // Close menu bar, if number entry isnt open.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- }
SetTouchPaneButtons( EPhoneWaitingCallButtons );
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
// Check if HW Keys or Call UI should be disabled
CheckDisableHWKeysAndCallUIL();
@@ -320,12 +227,6 @@
// Reset blocked keys list
iStateMachine->PhoneStorage()->ResetBlockedKeysList();
- if ( !IsNumberEntryUsedL() )
- {
- // Close menu bar, if number entry isnt open.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- }
-
if ( IsNumberEntryUsedL() )
{
if ( NeedToSendToBackgroundL() )
@@ -333,8 +234,6 @@
// Return phone to the background if send to background is needed.
iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
UpdateCbaL( EPhoneCallHandlingInCallCBA );
}
else
@@ -356,8 +255,6 @@
}
SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
// Go to conference and single state
// CBA updates in above if-else conditions
iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
@@ -376,9 +273,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Remove any phone dialogs if they are displayed
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
@@ -489,10 +383,7 @@
CheckDisableHWKeysAndCallUIL();
SetTouchPaneButtons( EPhoneIncomingCallButtons );
- UpdateSilenceButtonDimming();
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
SetRingingTonePlaybackL( callStateData.CallId() );
- SetToolbarDimming( ETrue );
SetBackButtonActive(EFalse);
iStateMachine->ChangeState( EPhoneStateIncoming );
}
@@ -509,7 +400,6 @@
// Go to Single And Waiting state
UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
SetTouchPaneButtons( EPhoneWaitingCallButtons );
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
// Check if HW Keys or Call UI should be disabled
CheckDisableHWKeysAndCallUIL();
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -204,35 +204,6 @@
}
// -----------------------------------------------------------
-// CPhoneConferenceAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndWaiting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND(EPhoneUIStates,
- "CPhoneConferenceAndWaiting::OpenMenuBarL()");
-
- TInt resourceId( EPhoneConfAndCallWaitingMenubar );
-
- if( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneConfAndCallWaitingMenubarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConferenceAndWaiting::HandleConnectedL
// -----------------------------------------------------------
//
@@ -282,24 +253,11 @@
// Reset blocked keys list
iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-
- // Effect is shown when dialer exist.
- TBool effectStarted ( EFalse );
- if ( !NeedToSendToBackgroundL() )
- {
- BeginTransEffectLC( ENumberEntryOpen );
- effectStarted = ETrue;
- }
BeginUiUpdateLC();
UpdateRemoteInfoDataL ( aCallId );
- if ( IsConferenceBubbleInSelectionMode() )
- {
- CloseSelectionListL();
- }
-
// Show bubble
TPhoneCmdParamCallHeaderData callHeaderParam;
callHeaderParam.SetCallState( EPEStateConnected );
@@ -310,10 +268,7 @@
if ( IsNumberEntryUsedL() )
{
if ( NeedToSendToBackgroundL() )
- {
- // Return phone to the background if send to background is needed.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
+ {
UpdateCbaL( EPhoneCallHandlingInCallCBA );
}
else
@@ -329,13 +284,9 @@
// sendbackround if needed.
}
SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
- SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
EndUiUpdate();
- if( effectStarted )
- {
- EndTransEffect();
- }
+
// CBA updates in above if-else conditions
iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
}
@@ -360,19 +311,8 @@
if( iRingingCallId == aCallId )
{
- // Effect is shown when dialer exist.
- TBool effectStarted ( EFalse );
- if ( !NeedToSendToBackgroundL() )
- {
- BeginTransEffectLC( ENumberEntryOpen );
- effectStarted = ETrue;
- }
BeginUiUpdateLC();
-
- // Idle message came for waiting call
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -383,9 +323,7 @@
{
// Return phone to the background if send to background is needed.
iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
+
UpdateCbaL( EPhoneCallHandlingInCallCBA );
}
else
@@ -415,20 +353,9 @@
// Reset blocked keys list
iStateMachine->PhoneStorage()->ResetBlockedKeysList();
- if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode )
- == EPhoneViewResponseSuccess )
- {
- SetTouchPaneButtons( EPhoneParticipantListButtons );
- }
- else
- {
- SetTouchPaneButtons( EPhoneConferenceButtons );
- }
+ SetTouchPaneButtons( EPhoneConferenceButtons );
+
EndUiUpdate();
- if ( effectStarted )
- {
- EndTransEffect();
- }
// Go to conference state
// CBA updates in above if-else conditions
@@ -458,7 +385,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()");
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
@@ -467,9 +393,6 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewGetCountOfActiveCalls, &activeCallCount );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
switch( activeCallCount.Integer() )
{
case ENoActiveCalls:
@@ -492,7 +415,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
iRingingCallId ,&callHeaderParam );
iCbaManager->UpdateIncomingCbaL( iRingingCallId );
- UpdateSilenceButtonDimming();
// Hide number entry if visible
if ( IsNumberEntryVisibleL() )
@@ -504,9 +426,7 @@
CheckDisableHWKeysAndCallUIL();
SetTouchPaneButtons( EPhoneIncomingCallButtons );
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
SetRingingTonePlaybackL( iRingingCallId );
- SetToolbarDimming( ETrue );
SetBackButtonActive(EFalse);
iStateMachine->ChangeState( EPhoneStateIncoming );
break;
@@ -552,7 +472,6 @@
break;
}
EndUiUpdate();
- EndTransEffect();
}
// -----------------------------------------------------------
@@ -573,8 +492,7 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndWaiting::HandleDiallingL()");
-
- BeginTransEffectLC( ENumberEntryClose );
+
BeginUiUpdateLC();
// Hide number entry if it exists
SetNumberEntryVisibilityL(EFalse);
@@ -585,7 +503,6 @@
SetTouchPaneButtons( EPhoneCallSetupButtons );
EndUiUpdate();
- EndTransEffect();
// Update conference and waiting and call setup softkeys
UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
@@ -625,8 +542,6 @@
if( conferenceBubbleExists.Boolean() &&
( iRingingCallId != KErrNotFound ) )
{
- // Set touch controls
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneWaitingCallButtons );
UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
// Go to Conference And Single And Waiting state
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -54,14 +54,6 @@
//
CPhoneConferenceAndWaitingAndCallSetup::~CPhoneConferenceAndWaitingAndCallSetup()
{
- // Reset flag
- if ( iViewCommandHandle )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
- }
}
// -----------------------------------------------------------
@@ -149,7 +141,6 @@
{
case EPhoneDtmfDialerCancel:
{
- CloseDTMFEditorL();
}
break;
@@ -197,45 +188,6 @@
}
// -----------------------------------------------------------
-// CPhoneConferenceAndWaitingAndCallSetup::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndWaitingAndCallSetup::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConferenceAndWaitingAndCallSetup::OpenMenuBarL");
-
- // Set specific flag to view so that DTMF menu item available
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
- &dtmfSendFlag );
-
- TInt resourceId ( EPhoneAlertingWaitingAndConfHeldCallMenuBar );
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId =
- EPhoneAlertingWaitingAndConfHeldCallMenuBarWithNumberEntry;
- }
- else if ( IsConferenceBubbleInSelectionMode() )
- {
- resourceId = EPhoneConfCallParticipantsDropMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneConferenceAndWaitingAndCallSetup::UpdateInCallCbaL
// -----------------------------------------------------------
//
@@ -283,7 +235,7 @@
&callHeaderParam );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -317,13 +269,12 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
SetTouchPaneButtons( EPhoneWaitingCallButtons );
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
EndUiUpdate();
// Go to Conference And Single And Waiting state
@@ -352,13 +303,9 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL");
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
if ( IsNumberEntryUsedL() )
{
@@ -400,14 +347,11 @@
// Go to Call Setup And Waiting state
SetTouchPaneButtons( EPhoneCallSetupButtons );
- SetToolbarDimming( ETrue );
-
// No need update cbas
iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
}
}
- EndUiUpdate();
- EndTransEffect();
+ EndUiUpdate();
}
// -----------------------------------------------------------
@@ -428,9 +372,6 @@
// Stop capturing keys
CaptureKeysDuringCallNotificationL( EFalse );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
TPhoneCmdParamBoolean conferenceExistsForCallId;
iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
aCallId, &conferenceExistsForCallId );
@@ -457,7 +398,6 @@
}
else
{
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
TPhoneCmdParamCallStateData callStateData;
callStateData.SetCallState( EPEStateRinging );
@@ -486,8 +426,7 @@
UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup );
}
- EndUiUpdate();
- EndTransEffect();
+ EndUiUpdate();
}
}
}
--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -173,15 +173,8 @@
CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
{
- TPhoneCmdParamBoolean isProgressNoteVisible;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsProgressNoteVisible,
- &isProgressNoteVisible );
-
- if ( !isProgressNoteVisible.Boolean() )
- {
- UpdateSetupCbaL();
- }
- }
+ UpdateSetupCbaL();
+ }
break;
case MEngineMonitor::EPEMessageColpNumberAvailable:
@@ -210,18 +203,11 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
-
if ( aCallId == KEmergencyCallId )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
// Remove emergency connecting note if still there
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
TPhoneCmdParamKeyCapture captureParam;
captureParam.SetKeyCode( EKeyNo );
@@ -242,19 +228,10 @@
// Continue displaying current app but set up the
// idle screen in the background
SetupIdleScreenInBackgroundL();
-
- // Update toolbar
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
}
else if ( iOnScreenDialer && IsNumberEntryContentStored() )
{
- if ( !IsNumberEntryUsedL() )
- {
- CreateNumberEntryL();
- }
- // Restore the number entry content from cache
- RestoreNumberEntryContentL();
SetNumberEntryVisibilityL(ETrue);
}
@@ -262,8 +239,6 @@
{
// Show the number entry if it exists
SetNumberEntryVisibilityL(ETrue);
- // Update toolbar
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
}
else
@@ -336,18 +311,9 @@
if ( aCallId == KPEEmergencyCallId )
{
- if ( !IsSimOk() )
- {
- TPhoneCmdParamBoolean visibleMode;
- visibleMode.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetStatusPaneVisible, &visibleMode );
- }
iDeviceLockOn = IsAutoLockOn();
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Disable global notes when the phone is dialling
TPhoneCmdParamBoolean globalNotifierParam;
globalNotifierParam.SetBoolean( ETrue );
@@ -389,9 +355,6 @@
// Remove exit emergency mode query, if it exists
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery );
-
- // Enable the volume display
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
BeginUiUpdateLC();
@@ -516,42 +479,10 @@
SetBackButtonActive(ETrue);
EndUiUpdate();
- SetToolbarDimming( ETrue );
UpdateInCallCbaL();
}
// -----------------------------------------------------------
-// CPhoneEmergency::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneEmergency::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::OpenMenuBarL() ");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneCallHandlingEmergencyMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneCallHandlingEmergencyMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-
-// -----------------------------------------------------------
// CPhoneEmergency::UpdateInCallCbaL
// -----------------------------------------------------------
//
@@ -577,10 +508,6 @@
// end-key
case EKeyNo:
// handle end key
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
DisconnectEmergencyCallL();
break;
@@ -651,16 +578,8 @@
{
if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
{
- CloseDTMFEditorL();
- TPhoneCmdParamBoolean isProgressNoteVisible;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsProgressNoteVisible,
- &isProgressNoteVisible );
-
- if ( !isProgressNoteVisible.Boolean() )
- {
- UpdateSetupCbaL();
- }
+ UpdateSetupCbaL();
}
else
{
@@ -856,21 +775,6 @@
iCbaManager->SetCbaL( resourceId );
}
-// ---------------------------------------------------------
-// CPhoneEmergency::HandleCreateNumberEntryL
-//
-// ---------------------------------------------------------
-//
-void CPhoneEmergency::HandleCreateNumberEntryL( const TKeyEvent& aKeyEvent,
- TEventCode aEventCode )
- {
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneEmergency::HandleCreateNumberEntryL() ");
- if ( !iCallSetup && !iStartupInterrupted )
- {
- CPhoneGsmInCall::HandleCreateNumberEntryL( aKeyEvent, aEventCode );
- }
-
- }
// -----------------------------------------------------------------------------
// CPhoneEmergency::HandleRemConCommandL
--- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -457,11 +457,11 @@
{
if( IsVideoCall( aErrorInfo.iCallId ) )
{
- SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue );
+ SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls );
}
else if ( IsVoiceCall( aErrorInfo.iCallId ))
{
- SendGlobalWarningNoteL( EPhoneNoteCallInfoCauseValue21 );
+ SendGlobalWarningNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue );
}
}
break;
@@ -787,6 +787,7 @@
{
aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls;
aCauseCode = 21;
+ aNotification = (EFalse == IsVideoCall( callId ));
}
break;
@@ -1009,7 +1010,6 @@
break;
case KErrGsmCCUserNotInCug:
- // Todo correct string missing
aResourceId = EPhoneNumberNotInCUG;
aCauseCode = 87;
break;
--- a/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -121,12 +121,6 @@
EBasic,
EPhoneUIStates,
"CPhoneGeneralGsmMessagesHandler::EPEMessageIssuedSSRequest" );
-
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( EFalse );
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewSetBlockingDialogStatus,
- &booleanParam );
break;
}
@@ -161,32 +155,11 @@
EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- TPhoneCmdParamBoolean booleanParam;
- booleanParam.SetBoolean( ETrue );
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewSetBlockingDialogStatus,
- &booleanParam );
-
// Get active call count
TPhoneCmdParamInteger activeCallCount;
iViewCommandHandle.ExecuteCommandL(
EPhoneViewGetCountOfActiveCalls, &activeCallCount );
- if( !activeCallCount.Integer() )
- {
- __PHONELOG(
- EBasic,
- EPhoneUIStates,
- "CPhoneGeneralGsmMessagesHandler::EPEMessageIssuingSSRequest no active call" );
- // Ensure that the dialer is activated to display local notes and dialogs properly.
- TPhoneCmdParamAppInfo param;
- param.SetAppUid( KUidPhoneApplication );
- param.SetViewUid( KUidViewId );
- param.SetCustomMessageId( TUid::Uid( KTouchDiallerViewCommand ) );
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewActivateAppViewWithCustomMessage,
- ¶m );
- }
// Remove phoneumber query
iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveQuery );
break;
--- a/phoneapp/phoneuistates/src/cphonegsmincall.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonegsmincall.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -251,9 +251,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneGsmInCall::BringIncomingToForegroundL( ) ");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Remove any phone dialogs if they are displayed
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
@@ -289,20 +286,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneGsmInCall::AllowShowingOfWaitingCallHeaderL() ");
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewAllowWaitingCallHeader,
- &aCommandParam );
-
- // Non-touch :Hide number entry if it exists on
- // Touch : an internal operation ongoing
- // -> do not hide dialer
- if ( !iOnScreenDialer )
- {
- SetNumberEntryVisibilityL(EFalse);
- }
- // If param is true and number entry is open only then
- // hide number entry.
- else if ( aCommandParam.Boolean() && IsNumberEntryUsedL() )
+ if ( aCommandParam.Boolean() && IsNumberEntryUsedL() )
{
SetNumberEntryVisibilityL(EFalse);
}
@@ -315,19 +299,6 @@
EXPORT_C void CPhoneGsmInCall::HandlePhoneForegroundEventL()
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneGsmInCall::HandlePhoneForegroundEventL( ) ");
- if ( iOnScreenDialer && IsNumberEntryUsedL() )
- {
- // If numberentry is used then we need to call EPhoneViewSetDialerControlVisible
- // to ensure that numberentry/dialler is drawn to UI.
- TPhoneViewResponseId respond =
- iViewCommandHandle->HandleCommandL( EPhoneViewSetDialerControlVisible );
-
- if ( respond && IsNumberEntryVisibleL() )
- {
- // Set Number Entry CBA
- iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
- }
- }
}
// -----------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphoneidle.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneidle.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -146,17 +146,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneIdle::HandleErrorL() ");
- TPhoneCmdParamBoolean blockingDialogStatus;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetBlockingDialogStatus,
- &blockingDialogStatus );
-
- if( blockingDialogStatus.Boolean() )
- {
- blockingDialogStatus.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetBlockingDialogStatus,
- &blockingDialogStatus );
- }
-
CPhoneState::HandleErrorL( aErrorInfo );
}
--- a/phoneapp/phoneuistates/src/cphoneincoming.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -217,8 +217,6 @@
dialerParam.SetBoolean( EFalse );
}
- SetToolbarDimming( EFalse );
-
// Display incoming call
DisplayIncomingCallL( aCallId, dialerParam );
@@ -267,9 +265,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneIncoming::DisplayIncomingCallL()");
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Cannot delete active note, e.g. New call query,
// but show waiting note with or without caller name
@@ -314,20 +309,7 @@
{
__LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneIncoming::AllowShowingOfWaitingCallHeaderL() ");
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewAllowWaitingCallHeader,
- &aCommandParam );
-
- // Non-touch :Hide number entry if it exists on
- // Touch : an internal operation ongoing
- // -> do not hide dialer
- if ( !iOnScreenDialer )
- {
- SetNumberEntryVisibilityL(EFalse);
- }
- // If param is true and number entry is open only then
- // hide number entry.
- else if ( aCommandParam.Boolean() && IsNumberEntryUsedL() )
+ if ( aCommandParam.Boolean() && IsNumberEntryUsedL() )
{
SetNumberEntryVisibilityL(EFalse);
}
--- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -193,9 +193,6 @@
booleanParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
CPhoneState::BeginUiUpdateLC();
@@ -247,9 +244,6 @@
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
if ( !TopAppIsDisplayedL() )
{
// Continue displaying current app but set up the
@@ -283,33 +277,6 @@
}
// -----------------------------------------------------------
-// CPhoneSingleAndAlerting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndAlerting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndAlerting::OpenMenuBarL()");
- TInt resourceId;
-
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneAlertingAndHeldCallMenuBarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneAlertingAndHeldCallMenuBar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneSingleAndAlerting::UpdateInCallCbaL
// -----------------------------------------------------------
//
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -220,7 +220,7 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -266,7 +266,7 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -294,15 +294,11 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetup::HandleIdleL()");
- BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Find out do we have single or outgoing call left
TPhoneCmdParamInteger activeCallCount;
iViewCommandHandle->ExecuteCommandL(
@@ -336,7 +332,6 @@
// Single call was terminated
SetTouchPaneButtons( EPhoneCallSetupButtons );
- SetToolbarDimming( ETrue );
SetToolbarButtonLoudspeakerEnabled();
// Update call setup CBAs
UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
@@ -344,7 +339,6 @@
}
EndUiUpdate();
- EndTransEffect();
}
// -----------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -149,18 +149,11 @@
if ( CPhoneState::IsNumberEntryUsedL() )
{
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
- else
- {
- // Remove number entry from screen
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewRemoveNumberEntry );
- // Do state-specific operation when number entry is cleared
- HandleNumberEntryClearedL();
- }
+ // Remove number entry from screen
+ iViewCommandHandle->ExecuteCommandL(
+ EPhoneViewRemoveNumberEntry );
+ // Do state-specific operation when number entry is cleared
+ HandleNumberEntryClearedL();
}
if ( !TopAppIsDisplayedL() )
{
@@ -245,7 +238,6 @@
case EPhoneDtmfDialerCancel:
{
- CloseDTMFEditorL();
}
break;
@@ -258,36 +250,6 @@
}
// -----------------------------------------------------------
-// CPhoneSingleAndCallSetupAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndCallSetupAndWaiting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::OpenMenuBarL() ");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneAlertingHeldAndWaitingCallMenuBarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneAlertingHeldAndWaitingCallMenuBar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneSingleAndCallSetupAndWaiting:HandleIdleL
// -----------------------------------------------------------
//
@@ -384,7 +346,7 @@
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::HandleConnectingL() ");
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -430,9 +392,6 @@
booleanParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Show bubble
TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -445,7 +404,7 @@
CaptureKeysDuringCallNotificationL( EFalse );
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -472,9 +431,6 @@
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetupAndWaiting::StateChangeToCallSetupAndWaitingL() ");
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Reset Hold flag to view
TPhoneCmdParamBoolean holdFlag;
@@ -484,7 +440,6 @@
BeginUiUpdateLC();
SetTouchPaneButtons( EPhoneCallSetupButtons );
- SetToolbarDimming( ETrue );
SetToolbarButtonLoudspeakerEnabled();
EndUiUpdate();
@@ -513,9 +468,6 @@
booleanParam.SetBoolean( ETrue );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetNumberEntryVisible, &booleanParam );
}
-
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Set Hold flag to view
TPhoneCmdParamBoolean holdFlag;
@@ -542,11 +494,8 @@
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
// Remove the number entry if it isn't DTMF dialer
- if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
+ if ( !iOnScreenDialer || !IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
@@ -577,7 +526,6 @@
BeginUiUpdateLC();
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneTwoSinglesButtons );
EndUiUpdate();
@@ -599,7 +547,6 @@
BeginUiUpdateLC();
SetTouchPaneButtons( EPhoneWaitingCallButtons );
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
EndUiUpdate();
--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -66,13 +66,7 @@
//
CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting()
{
- if ( iViewCommandHandle )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallDTMFVisibilityFlag,
- &dtmfSendFlag );
- }
+
}
// -----------------------------------------------------------
@@ -191,11 +185,9 @@
}
case EPhoneInCallCmdNewCall:
- LaunchNewCallQueryL();
break;
case EPhoneInCallCmdNewCallCall:
- CallFromNewCallQueryL();
break;
case EPhoneCallComingCmdReject: // fall through
@@ -230,65 +222,6 @@
return commandStatus;
}
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::OpenMenuBarL() ");
- TInt resourceId ( KErrNone );
-
-
- if ( !IsAutoLockOn() )
- {
- if( IsVideoCallActiveL() || IsVideoCallRingingL() )
- {
- //DTMF hiding will be set to TRUE
- if( IsVideoCallActiveL() )
- {
- TPhoneCmdParamBoolean dtmfSendFlag;
- dtmfSendFlag.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetVideoCallDTMFVisibilityFlag,
- &dtmfSendFlag );
- }
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneVideoCallWaitingMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneVideoCallWaitingMenubar;
- }
- }
-
- else // single voice and waiting voice
- {
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneCallWaitingMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneCallWaitingMenubar;
- }
- }
- }
- else
- {
- resourceId = EPhoneCallWaitingLockMenubar;
- }
-
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
// --------------------------------------------------------------
// CPhoneSingleAndWaiting::HandleKeyMessageL
// --------------------------------------------------------------
@@ -354,8 +287,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::HandleIdleL() ");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
if ( iSingleCallId == KErrNotFound )
{
@@ -434,19 +365,17 @@
CheckDisableHWKeysAndCallUIL();
SetTouchPaneButtons( EPhoneIncomingCallButtons );
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
// Bring up callhandling view
BringIncomingToForegroundL();
//Set incoming cba
iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
- UpdateSilenceButtonDimming();
// Play ringtone
SetRingingTonePlaybackL( callStateData.CallId() );
}
- SetToolbarDimming( ETrue );
+
SetBackButtonActive(EFalse);
EndUiUpdate();
@@ -454,13 +383,6 @@
}
else
{
- // Effect is shown when dialer exist.
- TBool effectStarted ( EFalse );
- if ( !NeedToSendToBackgroundL() )
- {
- BeginTransEffectLC( ENumberEntryOpen );
- effectStarted = ETrue;
- }
BeginUiUpdateLC();
@@ -475,8 +397,6 @@
// Return phone to the background if send to background is needed.
iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
UpdateCbaL( EPhoneCallHandlingInCallCBA );
}
else
@@ -509,10 +429,7 @@
SetTouchPaneButtons( EPhoneIncallButtons );
EndUiUpdate();
- if( effectStarted )
- {
- EndTransEffect();
- }
+
// CBA updates in above if-else conditions
iStateMachine->ChangeState( EPhoneStateSingle );
}
@@ -590,12 +507,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::HandleUnholdL() ");
- // Close menu if focus is somewhere else than number entry.
- if ( !IsNumberEntryUsedL() )
- {
- // Close menubar
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- }
// Show bubble
TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -627,14 +538,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() ");
-
- // Effect is shown when dialer exist.
- TBool effectStarted ( EFalse );
- if ( !NeedToSendToBackgroundL() )
- {
- BeginTransEffectLC( ENumberEntryOpen );
- effectStarted = ETrue;
- }
// Reset blocked keys list
iStateMachine->PhoneStorage()->ResetBlockedKeysList();
@@ -660,8 +563,6 @@
// Return phone to the background if send to background is needed.
iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
UpdateCbaL( EPhoneCallHandlingInCallCBA );
}
else
@@ -676,53 +577,14 @@
UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
}
- // Close dtmf dialer if exist.
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- CloseDTMFEditorL();
- }
- else if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
- {
- CloseCustomizedDialerL();
- }
-
SetTouchPaneButtons( EPhoneTwoSinglesButtons );
EndUiUpdate();
- if( effectStarted )
- {
- EndTransEffect();
- }
// Go to two singles state
// CBA updates in above if-else conditions
iStateMachine->ChangeState( EPhoneStateTwoSingles );
}
-// ---------------------------------------------------------
-// CPhoneSingleAndWaiting::CallFromNewCallQueryL
-// ---------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::CallFromNewCallQueryL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::CallFromNewCallQueryL() ");
- // First get the phone number from the dialog
- TPhoneCmdParamString phoneNumberParam;
- HBufC *content = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( content->Des() );
- phoneNumberParam.SetString( &ptr );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
- &phoneNumberParam );
-
- // Store the phone number
- iStateMachine->PhoneEngineInfo()->SetPhoneNumber( ptr );
-
- // clean up stack
- CleanupStack::PopAndDestroy( content );
-
- DialVoiceCallL();
- }
-
// -----------------------------------------------------------
// CPhoneSingleAndWaiting::HandleDiallingL
// -----------------------------------------------------------
@@ -732,7 +594,6 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::HandleDiallingL() ");
- BeginTransEffectLC( ENumberEntryClose );
BeginUiUpdateLC();
// Hide number entry if it exists
@@ -749,7 +610,6 @@
SetTouchPaneButtons( EPhoneCallSetupButtons );
EndUiUpdate();
- EndTransEffect();
// Update call setup CBAs
UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
@@ -766,8 +626,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::DisplayCallSetupL() ");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Remove dialogs if necessary
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
--- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -116,10 +116,6 @@
iCallId = callStateData.CallId();
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
-
- // Update phone number availability for menu use
- PhoneNumberAvailableInPhoneEngineL( callStateData.CallId() );
}
@@ -269,11 +265,9 @@
break;
case EPhoneInCallCmdNewCall:
- LaunchNewCallQueryL();
break;
case EPhoneInCallCmdNewCallCall:
- CallFromNewCallQueryL();
break;
case EPhoneInCallCmdSwitchToVideo:
@@ -294,8 +288,6 @@
/* Flow through */
case EPhoneCmdNoSwitchToVideo:
case EPhoneCmdNoSwitchToVoice:
- // Sets touch buttons to correct status if 'No' command has occured.
- iViewCommandHandle->ExecuteCommand( EPhoneResetTouchButtons );
break;
case EPhoneCmdYesSwitchToVoice:
@@ -340,24 +332,6 @@
}
// -----------------------------------------------------------
-// CPhoneSingleCall::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneSingleCall::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::OpenMenuBarL()");
-
- if ( IsVideoCall ( iCallId ))
- {
- OpenVideoCallMenuBarL();
- }
- else
- {
- CPhoneGsmInCall::OpenMenuBarL();
- }
- }
-
-// -----------------------------------------------------------
// CPhoneSingleCall::CallId
// -----------------------------------------------------------
//
@@ -373,26 +347,7 @@
void CPhoneSingleCall::OpenVideoCallMenuBarL()
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleCall::OpenVideoCallMenuBarL()");
- if( FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) )
- {
- TInt resourceId;
-
- if ( IsNumberEntryUsedL() )
- {
- resourceId = EPhoneVideoCallMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneVideoCallMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
+
}
// -----------------------------------------------------------
@@ -569,8 +524,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleCall::DisplayIncomingCallL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Cannot delete active note, e.g. New call query,
// but show waiting note with or without caller name
@@ -605,32 +558,6 @@
DisplayHeaderForCallComingInL( aCallId, ETrue ); //waiting call
}
-
-// ---------------------------------------------------------
-// CPhoneSingleCall::CallFromNewCallQueryL
-// ---------------------------------------------------------
-//
-void CPhoneSingleCall::CallFromNewCallQueryL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleCall::CallFromNewCallQueryL()");
- // First get the phone number from the dialog
- TPhoneCmdParamString phoneNumberParam;
- HBufC *content = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( content->Des() );
- phoneNumberParam.SetString( &ptr );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetTextQueryContent,
- &phoneNumberParam );
-
- // Store the phone number
- iStateMachine->PhoneEngineInfo()->SetPhoneNumber( ptr );
-
- // clean up stack
- CleanupStack::PopAndDestroy( content );
-
- DialVoiceCallL();
- }
-
// -----------------------------------------------------------
// CPhoneSingleCall::HandleDiallingL
// -----------------------------------------------------------
@@ -639,8 +566,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleCall::HandleDiallingL()");
-
- BeginTransEffectLC( ENumberEntryClose );
BeginUiUpdateLC();
SetNumberEntryVisibilityL(EFalse);
@@ -652,8 +577,6 @@
SetTouchPaneButtons( EPhoneCallSetupAndSingleButtons );
EndUiUpdate();
-
- EndTransEffect();
// Go to call setup state
UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
@@ -668,8 +591,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleCall::DisplayCallSetupL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Remove dialogs if necessary
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
@@ -688,60 +609,6 @@
}
// -----------------------------------------------------------
-// CPhoneSingleCall::SetCallHoldL
-// -----------------------------------------------------------
-//
-void CPhoneSingleCall::SetCallHoldL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleCall::SetCallHold()");
-
- TPhoneCmdParamCallStateData callStateData;
- callStateData.SetCallId( iCallId );
- iViewCommandHandle->HandleCommandL( EPhoneViewGetCallState,
- &callStateData );
-
- if( callStateData.CallState() == EPEStateConnected && !IsVideoCallActiveL() )
- {
- iStateMachine->SetCallId( iCallId );
- iStateMachine->SendPhoneEngineMessage(
- CPEPhoneModelIF::EPEMessageHold );
- }
- else
- {
- // Show not allowed note
- SendGlobalInfoNoteL( EPhoneNoteTextNotAllowed, ETrue );
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneSingleCall::SetCallResumeL
-// -----------------------------------------------------------
-//
-void CPhoneSingleCall::SetCallResumeL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleCall::SetCallHold()");
-
- TPhoneCmdParamCallStateData callStateData;
- callStateData.SetCallId( iCallId );
- iViewCommandHandle->HandleCommandL( EPhoneViewGetCallState,
- &callStateData );
-
- if( callStateData.CallState() == EPEStateHeld )
- {
- iStateMachine->SetCallId( iCallId );
- iStateMachine->SendPhoneEngineMessage(
- CPEPhoneModelIF::EPEMessageResume );
- }
- else
- {
- // Show not allowed note
- SendGlobalInfoNoteL( EPhoneNoteTextNotAllowed, ETrue );
- }
- }
-
-// -----------------------------------------------------------
// CPhoneSingleCall::SwitchToVideoL
// -----------------------------------------------------------
//
@@ -756,33 +623,23 @@
KNWTelephonyNetworkMode ) );
TBool restoreOngoing( CPhonePubSubProxy::Instance()->Value( KUidSystemCategory,
conn::KUidBackupRestoreKey ));
-
- TBool resetTouchButtons = EFalse;
if ( networkMode != ENWNetworkModeWcdma )
{
// We aren't in 3G, video call not possible
SendGlobalInfoNoteL( EPhoneInformationNoNetworkSupportForVideoCallNote );
- resetTouchButtons = ETrue;
}
else if ( restoreOngoing & ( conn::EBURRestoreFull | conn::EBURRestorePartial ))
{
// MC restore ongoing
SendGlobalInfoNoteL( EPhoneInformationVideoCallNotAllowedDuringRestoreNote );
- resetTouchButtons = ETrue;
}
else
{
- iSwitchToVideoQuery = ETrue;
- ShowQueryL( EPhoneSwitchToVideoQuery );
- iSwitchToVideoQuery = EFalse;
- }
-
- if( resetTouchButtons )
- {
- // Sets touch buttons to correct status if error has occured.
- iViewCommandHandle->ExecuteCommand( EPhoneResetTouchButtons );
- }
+ iSwitchToVideoQuery = ETrue;
+ //ShowQueryL( EPhoneSwitchToVideoQuery );
+ iSwitchToVideoQuery = EFalse;
+ }
}
}
@@ -795,7 +652,7 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleCall::SwitchToVoiceL()");
- ShowQueryL( EPhoneSwitchToVoiceQuery );
+ //ShowQueryL( EPhoneSwitchToVoiceQuery );
}
// End of File
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -138,47 +138,6 @@
break;
}
}
-
-// -----------------------------------------------------------
-// CPhoneTwoSingles::OpenMenuBarL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneTwoSingles::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneTwoSingles::OpenMenuBarL()");
- TInt resourceId;
-
- if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
- {
- resourceId = EPhoneDtmfDialerMenubar;
- }
- if ( iOnScreenDialer && IsCustomizedDialerVisibleL() )
- {
- resourceId = CustomizedDialerMenuResourceIdL();
- }
- else if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneCallActiveAndHeldMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneCallActiveAndHeldMenubar;
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
-
- // Set Hold flag to view
- TPhoneCmdParamBoolean holdFlag;
- holdFlag.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
// -----------------------------------------------------------
// CPhoneTwoSingles:HandleIdleL
@@ -208,8 +167,6 @@
}
else
{
- // Close menu bar if number entry is not open.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Set incall CBAs
UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -384,7 +341,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
SetTouchPaneButtons( EPhoneConferenceButtons );
- SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
EndUiUpdate();
UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -417,9 +373,6 @@
// Display incoming call
DisplayIncomingCallL( aCallId, dialerParam );
- // Set touch controls
- SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
-
// Check if HW Keys or Call UI should be disabled
CheckDisableHWKeysAndCallUIL();
@@ -443,8 +396,6 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneTwoSingles::DisplayIncomingCallL()");
- // Close menu bar, if it is displayed
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
// Cannot delete active note, e.g. New call query,
// but show waiting note with or without caller name
--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -199,37 +199,6 @@
}
// -----------------------------------------------------------
-// CPhoneTwoSinglesAndWaiting::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneTwoSinglesAndWaiting::OpenMenuBarL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneTwoSinglesAndWaiting::OpenMenuBarL()");
-
- TInt resourceId ( EPhoneCallTwoSinglesWaitingLockMenubar );
-
- if ( !IsAutoLockOn() )
- {
- if ( IsNumberEntryVisibleL() )
- {
- resourceId = EPhoneCallActiveHeldAndWaitingMenubarWithNumberEntry;
- }
- else
- {
- resourceId = EPhoneCallActiveHeldAndWaitingMenubar;
- }
- }
-
- TPhoneCmdParamInteger integerParam;
- integerParam.SetInteger(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
- &integerParam );
- }
-
-// -----------------------------------------------------------
// CPhoneTwoSinglesAndWaiting::HandleIdleL
// -----------------------------------------------------------
//
@@ -237,23 +206,8 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneTwoSinglesAndWaiting::HandleIdleL()");
-
- // Effect is shown when dialer exist.
-
- TBool effectStarted ( EFalse );
- if ( !NeedToSendToBackgroundL())
- {
- BeginTransEffectLC( ENumberEntryOpen );
- effectStarted = ETrue;
- }
BeginUiUpdateLC();
-
- if ( !IsNumberEntryUsedL() )
- {
- // Close menu bar, if number entry isnt open.
- iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- }
// Remove call
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -268,10 +222,6 @@
}
EndUiUpdate();
- if ( effectStarted )
- {
- EndTransEffect();
- }
}
// -----------------------------------------------------------
@@ -290,8 +240,6 @@
// Return phone to the background if send to background is needed.
iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-
UpdateCbaL( EPhoneCallHandlingInCallCBA );
}
else
@@ -324,7 +272,6 @@
iStateMachine->PhoneStorage()->ResetBlockedKeysList();
// Go to two singles state
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneTwoSinglesButtons );
// CBA updates in above if-else conditions
iStateMachine->ChangeState( EPhoneStateTwoSingles );
@@ -351,9 +298,6 @@
{
iCbaManager->SetCbaL( EPhoneCallHandlingCallWaitingCBA );
}
-
- // Set touch controls
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
// Check if HW Keys or Call UI should be disabled
CheckDisableHWKeysAndCallUIL();
@@ -413,7 +357,6 @@
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
// Set touch controls
- SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
SetTouchPaneButtons( EPhoneWaitingCallButtons );
UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
--- a/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def Fri Jul 09 15:40:55 2010 +0300
@@ -306,4 +306,5 @@
?Bitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 305 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::Bitmap(void) const
?SetTone@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 306 NONAME ; void TPhoneCmdParamGlobalNote::SetTone(int)
?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@VTCallBack@@@Z @ 307 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class TCallBack)
+ ??1TPhoneCmdParamCallHeaderData@@QAE@XZ @ 308 NONAME ; TPhoneCmdParamCallHeaderData::~TPhoneCmdParamCallHeaderData(void)
--- a/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def Fri Jul 09 15:40:55 2010 +0300
@@ -400,4 +400,6 @@
_ZThn4_N26CPhoneResourceResolverBaseD1Ev @ 399 NONAME
_ZThn4_NK13CPhoneStorage17GetBlockedKeyListEv @ 400 NONAME
_ZThn4_NK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 401 NONAME
+ _ZN28TPhoneCmdParamCallHeaderDataD1Ev @ 402 NONAME
+ _ZN28TPhoneCmdParamCallHeaderDataD2Ev @ 403 NONAME
--- a/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h Fri Jul 09 15:40:55 2010 +0300
@@ -32,12 +32,6 @@
{
/** EPhoneViewStartValue */
EPhoneViewStartValue,
- /** EPhoneViewCreateNumberEntry */
- EPhoneViewCreateNumberEntry,
- /** EPhoneViewSetNumberEntryContent */
- EPhoneViewSetNumberEntryContent,
- /** EPhoneViewSendKeyEventToNumberEntry */
- EPhoneViewSendKeyEventToNumberEntry,
/** EPhoneViewRemoveNumberEntry */
EPhoneViewRemoveNumberEntry,
/** EPhoneViewSetNumberEntryVisible */
@@ -50,10 +44,6 @@
EPhoneViewGetNumberEntryIsUsedStatus,
/** EPhoneViewGetNumberEntryIsVisibleStatus */
EPhoneViewGetNumberEntryIsVisibleStatus,
- /** EPhoneViewToggleNumberEntryAlphaNumericMode */
- EPhoneViewToggleNumberEntryAlphaNumericMode,
- /** EPhoneViewIsNumberEntryNumericMode */
- EPhoneViewIsNumberEntryNumericMode,
/** EPhoneViewClearNumberEntryContent */
EPhoneViewClearNumberEntryContent,
/** EPhoneViewCreateCallHeader */
@@ -66,28 +56,10 @@
EPhoneViewUpdateCallHeaderCallDuration,
/** EPhoneViewRemoveCallHeader */
EPhoneViewRemoveCallHeader,
- /** EPhoneViewMenuBarOpen */
- EPhoneViewMenuBarOpen,
- /** EPhoneViewMenuBarClose */
- EPhoneViewMenuBarClose,
- /** EPhoneViewDimCbaCommand */
- EPhoneViewDimCbaCommand,
/** EPhoneViewUpdateCba */
EPhoneViewUpdateCba,
/** EPhoneViewUpdateBubble */
EPhoneViewUpdateBubble,
- /** EPhoneViewMenuPane */
- EPhoneViewMenuPane,
- /** EPhoneViewMenuBar */
- EPhoneViewMenuBar,
- /** EPhoneViewSetTitlePaneContent */
- EPhoneViewSetTitlePaneContent,
- /** EPhoneViewSetNaviPaneContent */
- EPhoneViewSetNaviPaneContent,
- /** EPhoneViewSetTitlePanePicture */
- EPhoneViewSetTitlePanePicture,
- /** EPhoneViewGetTitlePaneIsVisibleStatus */
- EPhoneViewGetTitlePaneIsVisibleStatus,
/** EPhoneViewActivateAudioPathUIChanges */
EPhoneViewActivateAudioPathUIChanges,
/** EPhoneViewActivateAudioAvailabilityUIChanges */
@@ -106,18 +78,12 @@
EPhoneViewRemoveProgressNote,
/** EPhoneViewRemoveGlobalNote */
EPhoneViewRemoveGlobalNote,
- /** EPhoneViewGetIsNoteVisible */
- EPhoneViewGetIsNoteVisible,
- /** EPhoneViewGetIsProgressNoteVisible */
- EPhoneViewGetIsProgressNoteVisible,
/** EPhoneViewShowQuery */
EPhoneViewShowQuery,
/** EPhoneViewSetListQueryString */
EPhoneViewSetListQueryString,
/** EPhoneViewRemoveQuery */
EPhoneViewRemoveQuery,
- /** EPhoneViewGetTextQueryContent */
- EPhoneViewGetTextQueryContent,
/** EPhoneViewSetTopApplication */
EPhoneViewSetTopApplication,
/** EPhoneViewBringAppToForeground */
@@ -132,28 +98,6 @@
EPhoneViewGetTopApplicationIsDisplayedStatus,
/** EPhoneViewGetForegroundApplication */
EPhoneViewGetForegroundApplication,
- /** EPhoneViewSetBackgroundImageBitmap */
- EPhoneViewSetBackgroundImageBitmap,
- /** EPhoneViewGetBackgroundImageBitmap */
- EPhoneViewGetBackgroundImageBitmap,
- /** EPhoneViewActivateApp */
- EPhoneViewActivateApp,
- /** EPhoneViewActivateAppView */
- EPhoneViewActivateAppView,
- /** EPhoneViewActivateAppViewWithCustomMessage */
- EPhoneViewActivateAppViewWithCustomMessage,
- /** EPhoneViewActivateAppViewConventional */
- EPhoneViewActivateAppViewConventional,
- /** EPhoneViewLaunchApplication */
- EPhoneViewLaunchApplication,
- /** EPhoneViewLaunchHelpApplication */
- EPhoneViewLaunchHelpApplication,
- /** EPhoneViewOpenMessageEditor */
- EPhoneViewOpenMessageEditor,
- /** EPhoneViewExitApplications */
- EPhoneViewExitApplications,
- /** EPhoneViewUpdateIncallIndicator */
- EPhoneViewUpdateIncallIndicator,
/** EPhoneViewStartCapturingKey */
EPhoneViewStartCapturingKey,
/** EPhoneViewStopCapturingKey */
@@ -164,16 +108,6 @@
EPhoneViewGetHoldFlag,
/** EPhoneViewSetHoldFlag */
EPhoneViewSetHoldFlag,
- /** EPhoneViewSetSoftRejectFlag */
- EPhoneViewSetSoftRejectFlag,
- /** EPhoneViewGetSoftRejectFlag */
- EPhoneViewGetSoftRejectFlag,
- /** EPhoneViewSetServiceCodeFlag */
- EPhoneViewSetServiceCodeFlag,
- /** EPhoneViewUpdateContact */
- EPhoneViewUpdateContact,
- /** EPhoneViewAddContact */
- EPhoneViewAddContact,
/** EPhoneViewOpenSingleItemFetchDialog */
EPhoneViewOpenSingleItemFetchDialog,
/** EPhoneViewRemovePhoneDialogs */
@@ -188,22 +122,12 @@
EPhoneViewPrivateFromConference,
/** EPhoneViewSelectedConfMember */
EPhoneViewSelectedConfMember,
- /** EPhoneViewGetConferenceListVisibleFlag */
- EPhoneViewGetConferenceListVisibleFlag,
- /** EPhoneViewOpenConferenceList */
- EPhoneViewOpenConferenceList,
- /** EPhoneViewGetCallState */
- EPhoneViewGetCallState,
/** EPhoneViewGetCallIdByState */
EPhoneViewGetCallIdByState,
- /** EPhoneViewMoveHighLightInList */
- EPhoneViewMoveHighLightInList,
/** EPhoneViewGetCountOfActiveCalls */
EPhoneViewGetCountOfActiveCalls,
/** EPhoneViewSetNaviPaneAudioVolume */
EPhoneViewSetNaviPaneAudioVolume,
- /** EPhoneViewShowNaviPaneAudioVolume */
- EPhoneViewShowNaviPaneAudioVolume,
/** EPhoneViewHideNaviPaneAudioVolume */
EPhoneViewHideNaviPaneAudioVolume,
/** EPhoneViewGetIsConference */
@@ -222,36 +146,22 @@
EPhoneViewMuteRingToneOnAnswer,
/** EPhoneViewCipheringInfoChange */
EPhoneViewCipheringInfoChange,
- /** EPhoneViewUpdateMaxConfMemberFlag */
- EPhoneViewUpdateMaxConfMemberFlag,
/** EPhoneViewCloseFSW */
EPhoneViewCloseFSW,
/** EPhoneViewLaunchRfsDeep */
EPhoneViewLaunchRfsDeep,
/** EPhoneViewLaunchRfsNormal */
EPhoneViewLaunchRfsNormal,
- /** EPhoneViewUpdateView */
- EPhoneViewUpdateView,
/** EPhoneViewOpenSoftRejectEditor */
EPhoneViewOpenSoftRejectEditor,
- /** EPhoneViewSendMessage */
- EPhoneViewSendMessage,
- /** EPhoneViewSetBlockingDialogStatus */
- EPhoneViewSetBlockingDialogStatus,
- /** EPhoneViewSetPhoneNumberAvailableInPhoneEngine */
- EPhoneViewSetPhoneNumberAvailableInPhoneEngine,
/** EPhoneViewSetSecurityMode */
EPhoneViewSetSecurityMode,
/** EPhoneViewGetSecurityModeStatus */
EPhoneViewGetSecurityModeStatus,
- /** EPhoneViewSetStatusPaneVisible */
- EPhoneViewSetStatusPaneVisible,
/** EPhoneViewEnableKeyLock */
EPhoneViewEnableKeyLock,
/** EPhoneViewEnableKeyLockWithoutNote */
EPhoneViewEnableKeyLockWithoutNote,
- /** EPhoneViewLaunchFaxModem */
- EPhoneViewLaunchFaxModem,
/** EPhoneViewUpdateFSW */
EPhoneViewUpdateFSW,
/** EPhoneViewIsQuery */
@@ -264,134 +174,36 @@
EPhoneViewBeginUpdate,
/** EPhoneViewEndUpdate */
EPhoneViewEndUpdate,
- /** EPhoneViewSetConfrenceOptionsFlag */
- EPhoneViewSetConfrenceOptionsFlag,
/** EPhoneViewRemoveConferenceBubble */
EPhoneViewRemoveConferenceBubble,
- /** EPhoneViewGetSoftRejectWindowGroupId */
- EPhoneViewGetSoftRejectWindowGroupId,
/** EPhoneViewSetTouchPaneButtons */
EPhoneViewSetTouchPaneButtons,
- /** EPhoneViewSetTouchPaneVisible */
- EPhoneViewSetTouchPaneVisible,
- /** EPhoneViewEnableTouchButton */
- EPhoneViewEnableTouchButton,
- /** EPhoneViewDisableTouchButton */
- EPhoneViewDisableTouchButton,
- /** EPhoneResetTouchButtons */
- EPhoneResetTouchButtons,
- /** EPhoneViewGetIsConferenceInSelectionMode */
- EPhoneViewGetIsConferenceInSelectionMode,
- /** EPhoneViewIsStraightCallToVideoMailBox */
- EPhoneViewIsStraightCallToVideoMailBox,
- /** EPhoneViewSetDtmfDialerViewVisible */
- EPhoneViewSetDtmfDialerViewVisible,
- /** EPhoneViewSetRetrictedDialer */
- EPhoneViewSetRetrictedDialer,
- /** EPhoneViewIsConferenceInExpandedMode */
- EPhoneViewIsConferenceInExpandedMode,
- /** EPhoneViewIsMenuBarVisible */
- EPhoneViewIsMenuBarVisible,
/** EPhoneViewGetBlockingDialogStatus */
EPhoneViewGetBlockingDialogStatus,
- /** EPhoneViewYesSingleItemFetch */
- EPhoneViewYesSingleItemFetch,
- /** EPhoneViewNoSingleItemFetch */
- EPhoneViewNoSingleItemFetch,
- /** EPhoneViewGetLocalizedNumberFromEntry */
- EPhoneViewGetLocalizedNumberFromEntry,
/** EPhoneViewIsNoteActive */
EPhoneViewIsNoteActive,
- /** EPhoneViewOpenNumberEntry */
- EPhoneViewOpenNumberEntry,
/** EPhoneViewOpenCallHandling */
EPhoneViewOpenCallHandling,
- /** EPhoneViewGetConferenceAndSingleFlag */
- EPhoneViewGetConferenceAndSingleFlag,
- /** EPhoneViewSetConferenceAndSingleFlag */
- EPhoneViewSetConferenceAndSingleFlag,
- /** EPhoneViewSetVideoCallFlag */
- EPhoneViewSetVideoCallFlag,
- /** EPhoneViewSetDtmfOptionsFlag */
- EPhoneViewSetDtmfOptionsFlag,
- /** EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery */
- EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery,
/** EPhoneViewGetAudioVolumeLevel */
EPhoneViewGetAudioVolumeLevel,
- /** EPhoneViewIsIdleTopApp */
- EPhoneViewIsIdleTopApp,
- /** EPhoneViewUpdateToolbar */
- EPhoneViewUpdateToolbar,
- /** EPhoneViewSetControlAndVisibility */
- EPhoneViewSetControlAndVisibility,
- /** EPhoneViewAllowWaitingCallHeader */
- EPhoneViewAllowWaitingCallHeader,
- /** EPhoneViewBeginTransEffect */
- EPhoneViewBeginTransEffect,
- /** EPhoneViewEndTransEffect */
- EPhoneViewEndTransEffect,
- /** EPhoneViewSetDialerControlVisible */
- EPhoneViewSetDialerControlVisible,
- /** EPhoneViewCloseSingleItemFetchDialog */
- EPhoneViewCloseSingleItemFetchDialog,
- /** EPhoneViewGetActivatePreviousApp */
- EPhoneViewGetActivatePreviousApp,
- /** EPhoneViewActivatePreviousApp */
- EPhoneViewActivatePreviousApp,
- /** EPhoneViewSetPointerCapture */
- EPhoneViewSetPointerCapture,
- /** EPhoneViewSetSendKeyDialerActivationFlag */
- EPhoneViewSetSendKeyDialerActivationFlag,
- /** EPhoneViewPrepareIcons */
- EPhoneViewPrepareIcons,
- /** EPhoneViewKeypadAudioEnabled */
- EPhoneViewKeypadAudioEnabled,
- /** EPhoneViewKeypadAudioDisabled */
- EPhoneViewKeypadAudioDisabled,
/** EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel */
EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
/** EPhoneViewRemoveDtmfNote */
EPhoneViewRemoveDtmfNote,
- /** EPhoneViewUpdatePhoneIconToFSW */
- EPhoneViewUpdatePhoneIconToFSW,
/** EPhoneViewSetEikonNotifiersDisabled */
EPhoneViewSetEikonNotifiersDisabled,
/** EPhoneViewCancelAllNotications */
EPhoneViewCancelAllNotications,
- /** EPhoneViewSetVideoCallDTMFVisibilityFlag */
- EPhoneViewSetVideoCallDTMFVisibilityFlag,
- /** EPhoneViewIsKeyLockEnabled */
- EPhoneViewIsKeyLockEnabled,
/** EPhoneViewDisableKeyLock */
EPhoneViewDisableKeyLock,
- /** EPhoneViewLoadPlugins */
- EPhoneViewLoadPlugins,
- /** EPhoneViewOpenVirtualKeyBoard */
- EPhoneViewOpenVirtualKeyBoard,
- /** EPhoneViewUpdateNoteSoftkeys */
- EPhoneViewUpdateNoteSoftkeys,
/** EPhoneViewSendAiwCommand */
EPhoneViewSendAiwCommand,
- /** EPhoneViewShowCustomizedDialer */
- EPhoneViewShowCustomizedDialer,
- /** EPhoneViewHideCustomizedDialer */
- EPhoneViewHideCustomizedDialer,
- /** EPhoneViewGetCustomizedDialerMenuResourceId */
- EPhoneViewGetCustomizedDialerMenuResourceId,
- /** EPhoneViewGetCustomizedDialerCbaResourceId */
- EPhoneViewGetCustomizedDialerCbaResourceId,
/** EPhoneViewCipheringInfoChangePlayTone */
EPhoneViewCipheringInfoChangePlayTone,
- /** EPhoneViewCreatePhoneBookServices */
- EPhoneViewCreatePhoneBookServices,
/** EPhoneViewDisableKeyLockWithoutNote */
EPhoneViewDisableKeyLockWithoutNote,
/** EPhoneViewGetKeyLockStatus */
EPhoneViewGetKeyLockStatus,
- /** EPhoneViewSetNumberEntryObserver */
- EPhoneViewSetNumberEntryObserver,
- /** EPhoneViewGetSingleItemFetchType */
- EPhoneViewGetSingleItemFetchType,
/** EPhoneViewRemoveGlobalWaitNote */
EPhoneViewRemoveGlobalWaitNote,
/** EPhoneViewSetPhoneCustomization */
@@ -406,14 +218,6 @@
EPhoneViewAddContactByString,
/** EPhoneViewIsActiveNoteDissmissableByKeyEvent */
EPhoneViewIsActiveNoteDissmissableByKeyEvent,
- /** EPhoneViewUpdateContextMenu */
- EPhoneViewUpdateContextMenu,
- /** EPhoneViewSetNoConnectedCalls */
- EPhoneViewSetNoConnectedCalls,
- /** EPhoneViewIsDTMFEditorVisible */
- EPhoneViewIsDTMFEditorVisible,
- /** EPhoneViewSetToolbarDimming */
- EPhoneViewSetToolbarDimming,
/** EPhoneViewEnableToolbarButton */
EPhoneViewEnableToolbarButton,
/** EPhoneViewHideToolbar */
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h Fri Jul 09 15:40:55 2010 +0300
@@ -58,6 +58,10 @@
*/
IMPORT_C TPhoneCmdParamCallHeaderData();
+ /**
+ * destructor.
+ */
+ IMPORT_C ~TPhoneCmdParamCallHeaderData();
public:
/**
@@ -311,12 +315,12 @@
/**
* Call header label text
*/
- TBuf<KPhoneCallHeaderLabelMaxLength> iLabelText;
+ HBufC *iLabelText;
/**
* Call header short label text
*/
- TBuf<KPhoneCallHeaderLabelMaxLength> iShortLabelText;
+ HBufC *iShortLabelText;
/**
* Call header call state
@@ -341,7 +345,7 @@
/**
* Call header CLI Text
*/
- TBuf<KCntMaxTextFieldLength> iCLIText;
+ HBufC *iCLIText;
/**
* Clipping direction of the CLI text.
@@ -357,7 +361,7 @@
/**
* Call header CNAP Text
*/
- TBuf<KCntMaxTextFieldLength> iCNAPText;
+ HBufC *iCNAPText;
/**
* Call header picture data
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -25,213 +25,115 @@
#endif
_STLIT8(K1, "EPhoneViewStartValue");
-_STLIT8(K2, "EPhoneViewCreateNumberEntry");
-_STLIT8(K3, "EPhoneViewSetNumberEntryContent");
-_STLIT8(K4, "EPhoneViewSendKeyEventToNumberEntry");
-_STLIT8(K5, "EPhoneViewRemoveNumberEntry");
-_STLIT8(K6, "EPhoneViewSetNumberEntryVisible");
-_STLIT8(K7, "EPhoneViewGetNumberFromEntry");
-_STLIT8(K8, "EPhoneViewGetNumberEntryCount");
-_STLIT8(K9, "EPhoneViewGetNumberEntryIsUsedStatus");
-_STLIT8(K10, "EPhoneViewGetNumberEntryIsVisibleStatus");
-_STLIT8(K11, "EPhoneViewToggleNumberEntryAlphaNumericMode");
-_STLIT8(K12, "EPhoneViewIsNumberEntryNumericMode");
-_STLIT8(K13, "EPhoneViewClearNumberEntryContent");
-_STLIT8(K14, "EPhoneViewCreateCallHeader");
-_STLIT8(K15, "EPhoneViewCreateEmergencyCallHeader");
-_STLIT8(K16, "EPhoneViewUpdateCallHeaderRemoteInfoData");
-_STLIT8(K17, "EPhoneViewUpdateCallHeaderCallDuration");
-_STLIT8(K18, "EPhoneViewRemoveCallHeader");
-_STLIT8(K19, "EPhoneViewMenuBarOpen");
-_STLIT8(K20, "EPhoneViewMenuBarClose");
-_STLIT8(K21, "EPhoneViewDimCbaCommand");
-_STLIT8(K22, "EPhoneViewUpdateCba");
-_STLIT8(K23, "EPhoneViewUpdateBubble");
-_STLIT8(K24, "EPhoneViewMenuPane");
-_STLIT8(K25, "EPhoneViewMenuBar");
-_STLIT8(K26, "EPhoneViewSetTitlePaneContent");
-_STLIT8(K27, "EPhoneViewSetNaviPaneContent");
-_STLIT8(K28, "EPhoneViewSetTitlePanePicture");
-_STLIT8(K29, "EPhoneViewGetTitlePaneIsVisibleStatus");
-_STLIT8(K30, "EPhoneViewActivateAudioPathUIChanges");
-_STLIT8(K31, "EPhoneViewActivateAudioAvailabilityUIChanges");
-_STLIT8(K32, "EPhoneViewActivateMuteUIChanges");
-_STLIT8(K33, "EPhoneViewShowNote");
-_STLIT8(K34, "EPhoneViewShowGlobalNote");
-_STLIT8(K35, "EPhoneViewShowProgressNote");
-_STLIT8(K36, "EPhoneViewRemoveNote");
-_STLIT8(K37, "EPhoneViewRemoveProgressNote");
-_STLIT8(K38, "EPhoneViewRemoveGlobalNote");
-_STLIT8(K39, "EPhoneViewGetIsNoteVisible");
-_STLIT8(K40, "EPhoneViewGetIsProgressNoteVisible");
-_STLIT8(K41, "EPhoneViewShowQuery");
-_STLIT8(K42, "EPhoneViewSetListQueryString");
-_STLIT8(K43, "EPhoneViewRemoveQuery");
-_STLIT8(K44, "EPhoneViewGetTextQueryContent");
-_STLIT8(K45, "EPhoneViewSetTopApplication");
-_STLIT8(K46, "EPhoneViewBringAppToForeground");
-_STLIT8(K47, "EPhoneViewSendToBackground");
-_STLIT8(K48, "EPhoneViewSetNeedToSendToBackgroundStatus");
-_STLIT8(K49, "EPhoneViewGetNeedToSendToBackgroundStatus");
-_STLIT8(K50, "EPhoneViewGetTopApplicationIsDisplayedStatus");
-_STLIT8(K51, "EPhoneViewGetForegroundApplication");
-_STLIT8(K52, "EPhoneViewSetBackgroundImageBitmap");
-_STLIT8(K53, "EPhoneViewGetBackgroundImageBitmap");
-_STLIT8(K54, "EPhoneViewActivateApp");
-_STLIT8(K55, "EPhoneViewActivateAppView");
-_STLIT8(K56, "EPhoneViewActivateAppViewWithCustomMessage");
-_STLIT8(K57, "EPhoneViewActivateAppViewConventional");
-_STLIT8(K58, "EPhoneViewLaunchApplication");
-_STLIT8(K59, "EPhoneViewLaunchHelpApplication");
-_STLIT8(K60, "EPhoneViewOpenMessageEditor");
-_STLIT8(K61, "EPhoneViewExitApplications");
-_STLIT8(K62, "EPhoneViewUpdateIncallIndicator");
-_STLIT8(K63, "EPhoneViewStartCapturingKey");
-_STLIT8(K64, "EPhoneViewStopCapturingKey");
-_STLIT8(K65, "EPhoneViewSetGlobalNotifiersDisabled");
-_STLIT8(K66, "EPhoneViewGetHoldFlag");
-_STLIT8(K67, "EPhoneViewSetHoldFlag");
-_STLIT8(K68, "EPhoneViewSetSoftRejectFlag");
-_STLIT8(K69, "EPhoneViewGetSoftRejectFlag");
-_STLIT8(K70, "EPhoneViewSetServiceCodeFlag");
-_STLIT8(K71, "EPhoneViewUpdateContact");
-_STLIT8(K72, "EPhoneViewAddContact");
-_STLIT8(K73, "EPhoneViewOpenSingleItemFetchDialog");
-_STLIT8(K74, "EPhoneViewRemovePhoneDialogs");
-_STLIT8(K75, "EPhoneViewCreateConference");
-_STLIT8(K76, "EPhoneViewAddToConference");
-_STLIT8(K77, "EPhoneViewRemoveFromConference");
-_STLIT8(K78, "EPhoneViewPrivateFromConference");
-_STLIT8(K79, "EPhoneViewSelectedConfMember");
-_STLIT8(K80, "EPhoneViewGetConferenceListVisibleFlag");
-_STLIT8(K81, "EPhoneViewOpenConferenceList");
-_STLIT8(K82, "EPhoneViewGetCallState");
-_STLIT8(K83, "EPhoneViewGetCallIdByState");
-_STLIT8(K84, "EPhoneViewMoveHighLightInList");
-_STLIT8(K85, "EPhoneViewGetCountOfActiveCalls");
-_STLIT8(K86, "EPhoneViewSetNaviPaneAudioVolume");
-_STLIT8(K87, "EPhoneViewShowNaviPaneAudioVolume");
-_STLIT8(K88, "EPhoneViewHideNaviPaneAudioVolume");
-_STLIT8(K89, "EPhoneViewGetIsConference");
-_STLIT8(K90, "EPhoneViewGetCallExistsInConference");
-_STLIT8(K91, "EPhoneViewRemoveAllCallHeaders");
-_STLIT8(K92, "EPhoneViewPlayRingTone");
-_STLIT8(K93, "EPhoneViewMuteRingTone");
-_STLIT8(K94, "EPhoneViewStopRingTone");
-_STLIT8(K95, "EPhoneViewMuteRingToneOnAnswer");
-_STLIT8(K96, "EPhoneViewCipheringInfoChange");
-_STLIT8(K97, "EPhoneViewUpdateMaxConfMemberFlag");
-_STLIT8(K98, "EPhoneViewCloseFSW");
-_STLIT8(K99, "EPhoneViewLaunchRfsDeep");
-_STLIT8(K100, "EPhoneViewLaunchRfsNormal");
-_STLIT8(K101, "EPhoneViewUpdateView");
-_STLIT8(K102, "EPhoneViewOpenSoftRejectEditor");
-_STLIT8(K103, "EPhoneViewSendMessage");
-_STLIT8(K104, "EPhoneViewSetBlockingDialogStatus");
-_STLIT8(K105, "EPhoneViewSetPhoneNumberAvailableInPhoneEngine");
-_STLIT8(K106, "EPhoneViewSetSecurityMode");
-_STLIT8(K107, "EPhoneViewGetSecurityModeStatus");
-_STLIT8(K108, "EPhoneViewSetStatusPaneVisible");
-_STLIT8(K109, "EPhoneViewEnableKeyLock");
-_STLIT8(K110, "EPhoneViewEnableKeyLockWithoutNote");
-_STLIT8(K111, "EPhoneViewLaunchFaxModem");
-_STLIT8(K112, "EPhoneViewUpdateFSW");
-_STLIT8(K113, "EPhoneViewIsQuery");
-_STLIT8(K114, "EPhoneViewBringIdleToForeground");
-_STLIT8(K115, "EPhoneViewSetIdleTopApplication");
-_STLIT8(K116, "EPhoneViewBeginUpdate");
-_STLIT8(K117, "EPhoneViewEndUpdate");
-_STLIT8(K118, "EPhoneViewSetConfrenceOptionsFlag");
-_STLIT8(K119, "EPhoneViewRemoveConferenceBubble");
-_STLIT8(K120, "EPhoneViewGetSoftRejectWindowGroupId");
-_STLIT8(K121, "EPhoneViewSetTouchPaneButtons");
-_STLIT8(K122, "EPhoneViewSetTouchPaneVisible");
-_STLIT8(K123, "EPhoneViewEnableTouchButton");
-_STLIT8(K124, "EPhoneViewDisableTouchButton");
-_STLIT8(K125, "EPhoneResetTouchButtons");
-_STLIT8(K126, "EPhoneViewGetIsConferenceInSelectionMode");
-_STLIT8(K127, "EPhoneViewIsStraightCallToVideoMailBox");
-_STLIT8(K128, "EPhoneViewSetDtmfDialerViewVisible");
-_STLIT8(K129, "EPhoneViewSetRetrictedDialer");
-_STLIT8(K130, "EPhoneViewIsConferenceInExpandedMode");
-_STLIT8(K131, "EPhoneViewIsMenuBarVisible");
-_STLIT8(K132, "EPhoneViewGetBlockingDialogStatus");
-_STLIT8(K133, "EPhoneViewYesSingleItemFetch");
-_STLIT8(K134, "EPhoneViewNoSingleItemFetch");
-_STLIT8(K135, "EPhoneViewGetLocalizedNumberFromEntry");
-_STLIT8(K136, "EPhoneViewIsNoteActive");
-_STLIT8(K137, "EPhoneViewOpenNumberEntry");
-_STLIT8(K138, "EPhoneViewOpenCallHandling");
-_STLIT8(K139, "EPhoneViewGetConferenceAndSingleFlag");
-_STLIT8(K140, "EPhoneViewSetConferenceAndSingleFlag");
-_STLIT8(K141, "EPhoneViewSetVideoCallFlag");
-_STLIT8(K142, "EPhoneViewSetDtmfOptionsFlag");
-_STLIT8(K143, "EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery");
-_STLIT8(K144, "EPhoneViewGetAudioVolumeLevel");
-_STLIT8(K145, "EPhoneViewIsIdleTopApp");
-_STLIT8(K146, "EPhoneViewUpdateToolbar");
-_STLIT8(K147, "EPhoneViewSetControlAndVisibility");
-_STLIT8(K148, "EPhoneViewAllowWaitingCallHeader");
-_STLIT8(K149, "EPhoneViewBeginTransEffect");
-_STLIT8(K150, "EPhoneViewEndTransEffect");
-_STLIT8(K151, "EPhoneViewSetDialerControlVisible");
-_STLIT8(K152, "EPhoneViewCloseSingleItemFetchDialog");
-_STLIT8(K153, "EPhoneViewGetActivatePreviousApp");
-_STLIT8(K154, "EPhoneViewActivatePreviousApp");
-_STLIT8(K155, "EPhoneViewSetPointerCapture");
-_STLIT8(K156, "EPhoneViewSetSendKeyDialerActivationFlag");
-_STLIT8(K157, "EPhoneViewPrepareIcons");
-_STLIT8(K158, "EPhoneViewKeypadAudioEnabled");
-_STLIT8(K159, "EPhoneViewKeypadAudioDisabled");
-_STLIT8(K160, "EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel");
-_STLIT8(K161, "EPhoneViewRemoveDtmfNote");
-_STLIT8(K162, "EPhoneViewUpdatePhoneIconToFSW");
-_STLIT8(K163, "EPhoneViewSetEikonNotifiersDisabled");
-_STLIT8(K164, "EPhoneViewCancelAllNotications");
-_STLIT8(K165, "EPhoneViewSetVideoCallDTMFVisibilityFlag");
-_STLIT8(K166, "EPhoneViewIsKeyLockEnabled");
-_STLIT8(K167, "EPhoneViewDisableKeyLock");
-_STLIT8(K168, "EPhoneViewLoadPlugins");
-_STLIT8(K169, "EPhoneViewOpenVirtualKeyBoard");
-_STLIT8(K170, "EPhoneViewUpdateNoteSoftkeys");
-_STLIT8(K171, "EPhoneViewSendAiwCommand");
-_STLIT8(K172, "EPhoneViewShowCustomizedDialer");
-_STLIT8(K173, "EPhoneViewHideCustomizedDialer");
-_STLIT8(K174, "EPhoneViewGetCustomizedDialerMenuResourceId");
-_STLIT8(K175, "EPhoneViewGetCustomizedDialerCbaResourceId");
-_STLIT8(K176, "EPhoneViewCipheringInfoChangePlayTone");
-_STLIT8(K177, "EPhoneViewCreatePhoneBookServices");
-_STLIT8(K178, "EPhoneViewDisableKeyLockWithoutNote");
-_STLIT8(K179, "EPhoneViewGetKeyLockStatus");
-_STLIT8(K180, "EPhoneViewSetNumberEntryObserver");
-_STLIT8(K181, "EPhoneViewGetSingleItemFetchType");
-_STLIT8(K182, "EPhoneViewRemoveGlobalWaitNote");
-_STLIT8(K183, "EPhoneViewSetPhoneCustomization");
-_STLIT8(K184, "EPhoneViewSetViewCustomization");
-_STLIT8(K185, "EPhoneViewSetButtonCustomization");
-_STLIT8(K186, "EPhoneViewUpdateContactByString");
-_STLIT8(K187, "EPhoneViewAddContactByString");
-_STLIT8(K188, "EPhoneViewIsActiveNoteDissmissableByKeyEvent");
-_STLIT8(K189, "EPhoneViewUpdateContextMenu");
-_STLIT8(K190, "EPhoneViewSetNoConnectedCalls");
-_STLIT8(K191, "EPhoneViewIsDTMFEditorVisible");
-_STLIT8(K192, "EPhoneViewSetToolbarDimming");
-_STLIT8(K193, "EPhoneViewEnableToolbarButton");
-_STLIT8(K194, "EPhoneViewHideToolbar");
-_STLIT8(K195, "EPhoneViewShowToolbar");
-_STLIT8(K196, "EPhoneViewGetExpandedBubbleCallId");
-_STLIT8(K197, "EPhoneViewOpenDialer");
-_STLIT8(K198, "EPhoneSetConferenceExpanded");
-_STLIT8(K199, "EPhoneAppShutDown");
-_STLIT8(K200, "EPhoneViewBackButtonActive");
-_STLIT8(K201, "EPhoneViewHsToForegroundAfterCall");
-_STLIT8(K202, "EPhoneViewOpenContacts");
-_STLIT8(K203, "EPhoneViewSetIhfFlag");
-_STLIT8(K204, "EPhoneViewSetMuteFlag");
-_STLIT8(K205, "EPhoneViewLaunchLogs");
-_STLIT8(K206, "EPhoneViewSetBlueToothFlag");
-_STLIT8(K207, "EPhoneViewSetBluetoothAvailableFlag");
-_STLIT8(K208, ", // Don't remove this, this should always be the last in list.");
+_STLIT8(K2, "EPhoneViewRemoveNumberEntry");
+_STLIT8(K3, "EPhoneViewSetNumberEntryVisible");
+_STLIT8(K4, "EPhoneViewGetNumberFromEntry");
+_STLIT8(K5, "EPhoneViewGetNumberEntryCount");
+_STLIT8(K6, "EPhoneViewGetNumberEntryIsUsedStatus");
+_STLIT8(K7, "EPhoneViewGetNumberEntryIsVisibleStatus");
+_STLIT8(K8, "EPhoneViewClearNumberEntryContent");
+_STLIT8(K9, "EPhoneViewCreateCallHeader");
+_STLIT8(K10, "EPhoneViewCreateEmergencyCallHeader");
+_STLIT8(K11, "EPhoneViewUpdateCallHeaderRemoteInfoData");
+_STLIT8(K12, "EPhoneViewUpdateCallHeaderCallDuration");
+_STLIT8(K13, "EPhoneViewRemoveCallHeader");
+_STLIT8(K14, "EPhoneViewUpdateCba");
+_STLIT8(K15, "EPhoneViewUpdateBubble");
+_STLIT8(K16, "EPhoneViewActivateAudioPathUIChanges");
+_STLIT8(K17, "EPhoneViewActivateAudioAvailabilityUIChanges");
+_STLIT8(K18, "EPhoneViewActivateMuteUIChanges");
+_STLIT8(K19, "EPhoneViewShowNote");
+_STLIT8(K20, "EPhoneViewShowGlobalNote");
+_STLIT8(K21, "EPhoneViewShowProgressNote");
+_STLIT8(K22, "EPhoneViewRemoveNote");
+_STLIT8(K23, "EPhoneViewRemoveProgressNote");
+_STLIT8(K24, "EPhoneViewRemoveGlobalNote");
+_STLIT8(K25, "EPhoneViewShowQuery");
+_STLIT8(K26, "EPhoneViewSetListQueryString");
+_STLIT8(K27, "EPhoneViewRemoveQuery");
+_STLIT8(K28, "EPhoneViewSetTopApplication");
+_STLIT8(K29, "EPhoneViewBringAppToForeground");
+_STLIT8(K30, "EPhoneViewSendToBackground");
+_STLIT8(K31, "EPhoneViewSetNeedToSendToBackgroundStatus");
+_STLIT8(K32, "EPhoneViewGetNeedToSendToBackgroundStatus");
+_STLIT8(K33, "EPhoneViewGetTopApplicationIsDisplayedStatus");
+_STLIT8(K34, "EPhoneViewGetForegroundApplication");
+_STLIT8(K35, "EPhoneViewStartCapturingKey");
+_STLIT8(K36, "EPhoneViewStopCapturingKey");
+_STLIT8(K37, "EPhoneViewSetGlobalNotifiersDisabled");
+_STLIT8(K38, "EPhoneViewGetHoldFlag");
+_STLIT8(K39, "EPhoneViewSetHoldFlag");
+_STLIT8(K40, "EPhoneViewOpenSingleItemFetchDialog");
+_STLIT8(K41, "EPhoneViewRemovePhoneDialogs");
+_STLIT8(K42, "EPhoneViewCreateConference");
+_STLIT8(K43, "EPhoneViewAddToConference");
+_STLIT8(K44, "EPhoneViewRemoveFromConference");
+_STLIT8(K45, "EPhoneViewPrivateFromConference");
+_STLIT8(K46, "EPhoneViewSelectedConfMember");
+_STLIT8(K47, "EPhoneViewGetCallIdByState");
+_STLIT8(K48, "EPhoneViewGetCountOfActiveCalls");
+_STLIT8(K49, "EPhoneViewSetNaviPaneAudioVolume");
+_STLIT8(K50, "EPhoneViewHideNaviPaneAudioVolume");
+_STLIT8(K51, "EPhoneViewGetIsConference");
+_STLIT8(K52, "EPhoneViewGetCallExistsInConference");
+_STLIT8(K53, "EPhoneViewRemoveAllCallHeaders");
+_STLIT8(K54, "EPhoneViewPlayRingTone");
+_STLIT8(K55, "EPhoneViewMuteRingTone");
+_STLIT8(K56, "EPhoneViewStopRingTone");
+_STLIT8(K57, "EPhoneViewMuteRingToneOnAnswer");
+_STLIT8(K58, "EPhoneViewCipheringInfoChange");
+_STLIT8(K59, "EPhoneViewCloseFSW");
+_STLIT8(K60, "EPhoneViewLaunchRfsDeep");
+_STLIT8(K61, "EPhoneViewLaunchRfsNormal");
+_STLIT8(K62, "EPhoneViewOpenSoftRejectEditor");
+_STLIT8(K63, "EPhoneViewSetSecurityMode");
+_STLIT8(K64, "EPhoneViewGetSecurityModeStatus");
+_STLIT8(K65, "EPhoneViewEnableKeyLock");
+_STLIT8(K66, "EPhoneViewEnableKeyLockWithoutNote");
+_STLIT8(K67, "EPhoneViewUpdateFSW");
+_STLIT8(K68, "EPhoneViewIsQuery");
+_STLIT8(K69, "EPhoneViewBringIdleToForeground");
+_STLIT8(K70, "EPhoneViewSetIdleTopApplication");
+_STLIT8(K71, "EPhoneViewBeginUpdate");
+_STLIT8(K72, "EPhoneViewEndUpdate");
+_STLIT8(K73, "EPhoneViewRemoveConferenceBubble");
+_STLIT8(K74, "EPhoneViewSetTouchPaneButtons");
+_STLIT8(K75, "EPhoneViewGetBlockingDialogStatus");
+_STLIT8(K76, "EPhoneViewIsNoteActive");
+_STLIT8(K77, "EPhoneViewOpenCallHandling");
+_STLIT8(K78, "EPhoneViewGetAudioVolumeLevel");
+_STLIT8(K79, "EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel");
+_STLIT8(K80, "EPhoneViewRemoveDtmfNote");
+_STLIT8(K81, "EPhoneViewSetEikonNotifiersDisabled");
+_STLIT8(K82, "EPhoneViewCancelAllNotications");
+_STLIT8(K83, "EPhoneViewDisableKeyLock");
+_STLIT8(K84, "EPhoneViewSendAiwCommand");
+_STLIT8(K85, "EPhoneViewCipheringInfoChangePlayTone");
+_STLIT8(K86, "EPhoneViewDisableKeyLockWithoutNote");
+_STLIT8(K87, "EPhoneViewGetKeyLockStatus");
+_STLIT8(K88, "EPhoneViewRemoveGlobalWaitNote");
+_STLIT8(K89, "EPhoneViewSetPhoneCustomization");
+_STLIT8(K90, "EPhoneViewSetViewCustomization");
+_STLIT8(K91, "EPhoneViewSetButtonCustomization");
+_STLIT8(K92, "EPhoneViewUpdateContactByString");
+_STLIT8(K93, "EPhoneViewAddContactByString");
+_STLIT8(K94, "EPhoneViewIsActiveNoteDissmissableByKeyEvent");
+_STLIT8(K95, "EPhoneViewEnableToolbarButton");
+_STLIT8(K96, "EPhoneViewHideToolbar");
+_STLIT8(K97, "EPhoneViewShowToolbar");
+_STLIT8(K98, "EPhoneViewGetExpandedBubbleCallId");
+_STLIT8(K99, "EPhoneViewOpenDialer");
+_STLIT8(K100, "EPhoneSetConferenceExpanded");
+_STLIT8(K101, "EPhoneAppShutDown");
+_STLIT8(K102, "EPhoneViewBackButtonActive");
+_STLIT8(K103, "EPhoneViewHsToForegroundAfterCall");
+_STLIT8(K104, "EPhoneViewOpenContacts");
+_STLIT8(K105, "EPhoneViewSetIhfFlag");
+_STLIT8(K106, "EPhoneViewSetMuteFlag");
+_STLIT8(K107, "EPhoneViewLaunchLogs");
+_STLIT8(K108, "EPhoneViewSetBlueToothFlag");
+_STLIT8(K109, "EPhoneViewSetBluetoothAvailableFlag");
+_STLIT8(K110, ", // Don't remove this, this should always be the last in list.");
// Intermediate
const void * const KStringPointers[] =
@@ -345,106 +247,8 @@
(const void*)&K107,
(const void*)&K108,
(const void*)&K109,
- (const void*)&K110,
- (const void*)&K111,
- (const void*)&K112,
- (const void*)&K113,
- (const void*)&K114,
- (const void*)&K115,
- (const void*)&K116,
- (const void*)&K117,
- (const void*)&K118,
- (const void*)&K119,
- (const void*)&K120,
- (const void*)&K121,
- (const void*)&K122,
- (const void*)&K123,
- (const void*)&K124,
- (const void*)&K125,
- (const void*)&K126,
- (const void*)&K127,
- (const void*)&K128,
- (const void*)&K129,
- (const void*)&K130,
- (const void*)&K131,
- (const void*)&K132,
- (const void*)&K133,
- (const void*)&K134,
- (const void*)&K135,
- (const void*)&K136,
- (const void*)&K137,
- (const void*)&K138,
- (const void*)&K139,
- (const void*)&K140,
- (const void*)&K141,
- (const void*)&K142,
- (const void*)&K143,
- (const void*)&K144,
- (const void*)&K145,
- (const void*)&K146,
- (const void*)&K147,
- (const void*)&K148,
- (const void*)&K149,
- (const void*)&K150,
- (const void*)&K151,
- (const void*)&K152,
- (const void*)&K153,
- (const void*)&K154,
- (const void*)&K155,
- (const void*)&K156,
- (const void*)&K157,
- (const void*)&K158,
- (const void*)&K159,
- (const void*)&K160,
- (const void*)&K161,
- (const void*)&K162,
- (const void*)&K163,
- (const void*)&K164,
- (const void*)&K165,
- (const void*)&K166,
- (const void*)&K167,
- (const void*)&K168,
- (const void*)&K169,
- (const void*)&K170,
- (const void*)&K171,
- (const void*)&K172,
- (const void*)&K173,
- (const void*)&K174,
- (const void*)&K175,
- (const void*)&K176,
- (const void*)&K177,
- (const void*)&K178,
- (const void*)&K179,
- (const void*)&K180,
- (const void*)&K181,
- (const void*)&K182,
- (const void*)&K183,
- (const void*)&K184,
- (const void*)&K185,
- (const void*)&K186,
- (const void*)&K187,
- (const void*)&K188,
- (const void*)&K189,
- (const void*)&K190,
- (const void*)&K191,
- (const void*)&K192,
- (const void*)&K193,
- (const void*)&K194,
- (const void*)&K195,
- (const void*)&K196,
- (const void*)&K197,
- (const void*)&K198,
- (const void*)&K199,
- (const void*)&K200,
- (const void*)&K201,
- (const void*)&K202,
- (const void*)&K203,
- (const void*)&K204,
- (const void*)&K205,
- (const void*)&K206,
- (const void*)&K207,
- (const void*)&K208
+ (const void*)&K110
};
-const TStringTable PhoneLoggerviewCommands::Table = {208, KStringPointers, EFalse};
+const TStringTable PhoneLoggerviewCommands::Table = {110, KStringPointers, EFalse};
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st Fri Jul 09 15:40:55 2010 +0300
@@ -1,34 +1,20 @@
# Phone Application Logger UI Command String Table
fstringtable PhoneLoggerviewCommands
EPhoneViewStartValue EPhoneViewStartValue
-EPhoneViewCreateNumberEntry EPhoneViewCreateNumberEntry
-EPhoneViewSetNumberEntryContent EPhoneViewSetNumberEntryContent
-EPhoneViewSendKeyEventToNumberEntry EPhoneViewSendKeyEventToNumberEntry
EPhoneViewRemoveNumberEntry EPhoneViewRemoveNumberEntry
EPhoneViewSetNumberEntryVisible EPhoneViewSetNumberEntryVisible
EPhoneViewGetNumberFromEntry EPhoneViewGetNumberFromEntry
EPhoneViewGetNumberEntryCount EPhoneViewGetNumberEntryCount
EPhoneViewGetNumberEntryIsUsedStatus EPhoneViewGetNumberEntryIsUsedStatus
EPhoneViewGetNumberEntryIsVisibleStatus EPhoneViewGetNumberEntryIsVisibleStatus
-EPhoneViewToggleNumberEntryAlphaNumericMode EPhoneViewToggleNumberEntryAlphaNumericMode
-EPhoneViewIsNumberEntryNumericMode EPhoneViewIsNumberEntryNumericMode
EPhoneViewClearNumberEntryContent EPhoneViewClearNumberEntryContent
EPhoneViewCreateCallHeader EPhoneViewCreateCallHeader
EPhoneViewCreateEmergencyCallHeader EPhoneViewCreateEmergencyCallHeader
EPhoneViewUpdateCallHeaderRemoteInfoData EPhoneViewUpdateCallHeaderRemoteInfoData
EPhoneViewUpdateCallHeaderCallDuration EPhoneViewUpdateCallHeaderCallDuration
EPhoneViewRemoveCallHeader EPhoneViewRemoveCallHeader
-EPhoneViewMenuBarOpen EPhoneViewMenuBarOpen
-EPhoneViewMenuBarClose EPhoneViewMenuBarClose
-EPhoneViewDimCbaCommand EPhoneViewDimCbaCommand
EPhoneViewUpdateCba EPhoneViewUpdateCba
EPhoneViewUpdateBubble EPhoneViewUpdateBubble
-EPhoneViewMenuPane EPhoneViewMenuPane
-EPhoneViewMenuBar EPhoneViewMenuBar
-EPhoneViewSetTitlePaneContent EPhoneViewSetTitlePaneContent
-EPhoneViewSetNaviPaneContent EPhoneViewSetNaviPaneContent
-EPhoneViewSetTitlePanePicture EPhoneViewSetTitlePanePicture
-EPhoneViewGetTitlePaneIsVisibleStatus EPhoneViewGetTitlePaneIsVisibleStatus
EPhoneViewActivateAudioPathUIChanges EPhoneViewActivateAudioPathUIChanges
EPhoneViewActivateAudioAvailabilityUIChanges EPhoneViewActivateAudioAvailabilityUIChanges
EPhoneViewActivateMuteUIChanges EPhoneViewActivateMuteUIChanges
@@ -38,12 +24,9 @@
EPhoneViewRemoveNote EPhoneViewRemoveNote
EPhoneViewRemoveProgressNote EPhoneViewRemoveProgressNote
EPhoneViewRemoveGlobalNote EPhoneViewRemoveGlobalNote
-EPhoneViewGetIsNoteVisible EPhoneViewGetIsNoteVisible
-EPhoneViewGetIsProgressNoteVisible EPhoneViewGetIsProgressNoteVisible
EPhoneViewShowQuery EPhoneViewShowQuery
EPhoneViewSetListQueryString EPhoneViewSetListQueryString
EPhoneViewRemoveQuery EPhoneViewRemoveQuery
-EPhoneViewGetTextQueryContent EPhoneViewGetTextQueryContent
EPhoneViewSetTopApplication EPhoneViewSetTopApplication
EPhoneViewBringAppToForeground EPhoneViewBringAppToForeground
EPhoneViewSendToBackground EPhoneViewSendToBackground
@@ -51,27 +34,11 @@
EPhoneViewGetNeedToSendToBackgroundStatus EPhoneViewGetNeedToSendToBackgroundStatus
EPhoneViewGetTopApplicationIsDisplayedStatus EPhoneViewGetTopApplicationIsDisplayedStatus
EPhoneViewGetForegroundApplication EPhoneViewGetForegroundApplication
-EPhoneViewSetBackgroundImageBitmap EPhoneViewSetBackgroundImageBitmap
-EPhoneViewGetBackgroundImageBitmap EPhoneViewGetBackgroundImageBitmap
-EPhoneViewActivateApp EPhoneViewActivateApp
-EPhoneViewActivateAppView EPhoneViewActivateAppView
-EPhoneViewActivateAppViewWithCustomMessage EPhoneViewActivateAppViewWithCustomMessage
-EPhoneViewActivateAppViewConventional EPhoneViewActivateAppViewConventional
-EPhoneViewLaunchApplication EPhoneViewLaunchApplication
-EPhoneViewLaunchHelpApplication EPhoneViewLaunchHelpApplication
-EPhoneViewOpenMessageEditor EPhoneViewOpenMessageEditor
-EPhoneViewExitApplications EPhoneViewExitApplications
-EPhoneViewUpdateIncallIndicator EPhoneViewUpdateIncallIndicator
EPhoneViewStartCapturingKey EPhoneViewStartCapturingKey
EPhoneViewStopCapturingKey EPhoneViewStopCapturingKey
EPhoneViewSetGlobalNotifiersDisabled EPhoneViewSetGlobalNotifiersDisabled
EPhoneViewGetHoldFlag EPhoneViewGetHoldFlag
EPhoneViewSetHoldFlag EPhoneViewSetHoldFlag
-EPhoneViewSetSoftRejectFlag EPhoneViewSetSoftRejectFlag
-EPhoneViewGetSoftRejectFlag EPhoneViewGetSoftRejectFlag
-EPhoneViewSetServiceCodeFlag EPhoneViewSetServiceCodeFlag
-EPhoneViewUpdateContact EPhoneViewUpdateContact
-EPhoneViewAddContact EPhoneViewAddContact
EPhoneViewOpenSingleItemFetchDialog EPhoneViewOpenSingleItemFetchDialog
EPhoneViewRemovePhoneDialogs EPhoneViewRemovePhoneDialogs
EPhoneViewCreateConference EPhoneViewCreateConference
@@ -79,14 +46,9 @@
EPhoneViewRemoveFromConference EPhoneViewRemoveFromConference
EPhoneViewPrivateFromConference EPhoneViewPrivateFromConference
EPhoneViewSelectedConfMember EPhoneViewSelectedConfMember
-EPhoneViewGetConferenceListVisibleFlag EPhoneViewGetConferenceListVisibleFlag
-EPhoneViewOpenConferenceList EPhoneViewOpenConferenceList
-EPhoneViewGetCallState EPhoneViewGetCallState
EPhoneViewGetCallIdByState EPhoneViewGetCallIdByState
-EPhoneViewMoveHighLightInList EPhoneViewMoveHighLightInList
EPhoneViewGetCountOfActiveCalls EPhoneViewGetCountOfActiveCalls
EPhoneViewSetNaviPaneAudioVolume EPhoneViewSetNaviPaneAudioVolume
-EPhoneViewShowNaviPaneAudioVolume EPhoneViewShowNaviPaneAudioVolume
EPhoneViewHideNaviPaneAudioVolume EPhoneViewHideNaviPaneAudioVolume
EPhoneViewGetIsConference EPhoneViewGetIsConference
EPhoneViewGetCallExistsInConference EPhoneViewGetCallExistsInConference
@@ -96,91 +58,35 @@
EPhoneViewStopRingTone EPhoneViewStopRingTone
EPhoneViewMuteRingToneOnAnswer EPhoneViewMuteRingToneOnAnswer
EPhoneViewCipheringInfoChange EPhoneViewCipheringInfoChange
-EPhoneViewUpdateMaxConfMemberFlag EPhoneViewUpdateMaxConfMemberFlag
EPhoneViewCloseFSW EPhoneViewCloseFSW
EPhoneViewLaunchRfsDeep EPhoneViewLaunchRfsDeep
EPhoneViewLaunchRfsNormal EPhoneViewLaunchRfsNormal
-EPhoneViewUpdateView EPhoneViewUpdateView
EPhoneViewOpenSoftRejectEditor EPhoneViewOpenSoftRejectEditor
-EPhoneViewSendMessage EPhoneViewSendMessage
-EPhoneViewSetBlockingDialogStatus EPhoneViewSetBlockingDialogStatus
-EPhoneViewSetPhoneNumberAvailableInPhoneEngine EPhoneViewSetPhoneNumberAvailableInPhoneEngine
EPhoneViewSetSecurityMode EPhoneViewSetSecurityMode
EPhoneViewGetSecurityModeStatus EPhoneViewGetSecurityModeStatus
-EPhoneViewSetStatusPaneVisible EPhoneViewSetStatusPaneVisible
EPhoneViewEnableKeyLock EPhoneViewEnableKeyLock
EPhoneViewEnableKeyLockWithoutNote EPhoneViewEnableKeyLockWithoutNote
-EPhoneViewLaunchFaxModem EPhoneViewLaunchFaxModem
EPhoneViewUpdateFSW EPhoneViewUpdateFSW
EPhoneViewIsQuery EPhoneViewIsQuery
EPhoneViewBringIdleToForeground EPhoneViewBringIdleToForeground
EPhoneViewSetIdleTopApplication EPhoneViewSetIdleTopApplication
EPhoneViewBeginUpdate EPhoneViewBeginUpdate
EPhoneViewEndUpdate EPhoneViewEndUpdate
-EPhoneViewSetConfrenceOptionsFlag EPhoneViewSetConfrenceOptionsFlag
EPhoneViewRemoveConferenceBubble EPhoneViewRemoveConferenceBubble
-EPhoneViewGetSoftRejectWindowGroupId EPhoneViewGetSoftRejectWindowGroupId
EPhoneViewSetTouchPaneButtons EPhoneViewSetTouchPaneButtons
-EPhoneViewSetTouchPaneVisible EPhoneViewSetTouchPaneVisible
-EPhoneViewEnableTouchButton EPhoneViewEnableTouchButton
-EPhoneViewDisableTouchButton EPhoneViewDisableTouchButton
-EPhoneResetTouchButtons EPhoneResetTouchButtons
-EPhoneViewGetIsConferenceInSelectionMode EPhoneViewGetIsConferenceInSelectionMode
-EPhoneViewIsStraightCallToVideoMailBox EPhoneViewIsStraightCallToVideoMailBox
-EPhoneViewSetDtmfDialerViewVisible EPhoneViewSetDtmfDialerViewVisible
-EPhoneViewSetRetrictedDialer EPhoneViewSetRetrictedDialer
-EPhoneViewIsConferenceInExpandedMode EPhoneViewIsConferenceInExpandedMode
-EPhoneViewIsMenuBarVisible EPhoneViewIsMenuBarVisible
EPhoneViewGetBlockingDialogStatus EPhoneViewGetBlockingDialogStatus
-EPhoneViewYesSingleItemFetch EPhoneViewYesSingleItemFetch
-EPhoneViewNoSingleItemFetch EPhoneViewNoSingleItemFetch
-EPhoneViewGetLocalizedNumberFromEntry EPhoneViewGetLocalizedNumberFromEntry
EPhoneViewIsNoteActive EPhoneViewIsNoteActive
-EPhoneViewOpenNumberEntry EPhoneViewOpenNumberEntry
EPhoneViewOpenCallHandling EPhoneViewOpenCallHandling
-EPhoneViewGetConferenceAndSingleFlag EPhoneViewGetConferenceAndSingleFlag
-EPhoneViewSetConferenceAndSingleFlag EPhoneViewSetConferenceAndSingleFlag
-EPhoneViewSetVideoCallFlag EPhoneViewSetVideoCallFlag
-EPhoneViewSetDtmfOptionsFlag EPhoneViewSetDtmfOptionsFlag
-EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery
EPhoneViewGetAudioVolumeLevel EPhoneViewGetAudioVolumeLevel
-EPhoneViewIsIdleTopApp EPhoneViewIsIdleTopApp
-EPhoneViewUpdateToolbar EPhoneViewUpdateToolbar
-EPhoneViewSetControlAndVisibility EPhoneViewSetControlAndVisibility
-EPhoneViewAllowWaitingCallHeader EPhoneViewAllowWaitingCallHeader
-EPhoneViewBeginTransEffect EPhoneViewBeginTransEffect
-EPhoneViewEndTransEffect EPhoneViewEndTransEffect
-EPhoneViewSetDialerControlVisible EPhoneViewSetDialerControlVisible
-EPhoneViewCloseSingleItemFetchDialog EPhoneViewCloseSingleItemFetchDialog
-EPhoneViewGetActivatePreviousApp EPhoneViewGetActivatePreviousApp
-EPhoneViewActivatePreviousApp EPhoneViewActivatePreviousApp
-EPhoneViewSetPointerCapture EPhoneViewSetPointerCapture
-EPhoneViewSetSendKeyDialerActivationFlag EPhoneViewSetSendKeyDialerActivationFlag
-EPhoneViewPrepareIcons EPhoneViewPrepareIcons
-EPhoneViewKeypadAudioEnabled EPhoneViewKeypadAudioEnabled
-EPhoneViewKeypadAudioDisabled EPhoneViewKeypadAudioDisabled
EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel
EPhoneViewRemoveDtmfNote EPhoneViewRemoveDtmfNote
-EPhoneViewUpdatePhoneIconToFSW EPhoneViewUpdatePhoneIconToFSW
EPhoneViewSetEikonNotifiersDisabled EPhoneViewSetEikonNotifiersDisabled
EPhoneViewCancelAllNotications EPhoneViewCancelAllNotications
-EPhoneViewSetVideoCallDTMFVisibilityFlag EPhoneViewSetVideoCallDTMFVisibilityFlag
-EPhoneViewIsKeyLockEnabled EPhoneViewIsKeyLockEnabled
EPhoneViewDisableKeyLock EPhoneViewDisableKeyLock
-EPhoneViewLoadPlugins EPhoneViewLoadPlugins
-EPhoneViewOpenVirtualKeyBoard EPhoneViewOpenVirtualKeyBoard
-EPhoneViewUpdateNoteSoftkeys EPhoneViewUpdateNoteSoftkeys
EPhoneViewSendAiwCommand EPhoneViewSendAiwCommand
-EPhoneViewShowCustomizedDialer EPhoneViewShowCustomizedDialer
-EPhoneViewHideCustomizedDialer EPhoneViewHideCustomizedDialer
-EPhoneViewGetCustomizedDialerMenuResourceId EPhoneViewGetCustomizedDialerMenuResourceId
-EPhoneViewGetCustomizedDialerCbaResourceId EPhoneViewGetCustomizedDialerCbaResourceId
EPhoneViewCipheringInfoChangePlayTone EPhoneViewCipheringInfoChangePlayTone
-EPhoneViewCreatePhoneBookServices EPhoneViewCreatePhoneBookServices
EPhoneViewDisableKeyLockWithoutNote EPhoneViewDisableKeyLockWithoutNote
EPhoneViewGetKeyLockStatus EPhoneViewGetKeyLockStatus
-EPhoneViewSetNumberEntryObserver EPhoneViewSetNumberEntryObserver
-EPhoneViewGetSingleItemFetchType EPhoneViewGetSingleItemFetchType
EPhoneViewRemoveGlobalWaitNote EPhoneViewRemoveGlobalWaitNote
EPhoneViewSetPhoneCustomization EPhoneViewSetPhoneCustomization
EPhoneViewSetViewCustomization EPhoneViewSetViewCustomization
@@ -188,10 +94,6 @@
EPhoneViewUpdateContactByString EPhoneViewUpdateContactByString
EPhoneViewAddContactByString EPhoneViewAddContactByString
EPhoneViewIsActiveNoteDissmissableByKeyEvent EPhoneViewIsActiveNoteDissmissableByKeyEvent
-EPhoneViewUpdateContextMenu EPhoneViewUpdateContextMenu
-EPhoneViewSetNoConnectedCalls EPhoneViewSetNoConnectedCalls
-EPhoneViewIsDTMFEditorVisible EPhoneViewIsDTMFEditorVisible
-EPhoneViewSetToolbarDimming EPhoneViewSetToolbarDimming
EPhoneViewEnableToolbarButton EPhoneViewEnableToolbarButton
EPhoneViewHideToolbar EPhoneViewHideToolbar
EPhoneViewShowToolbar EPhoneViewShowToolbar
--- a/phoneapp/phoneuiutils/src/tphonecmdparamcallheaderdata.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuiutils/src/tphonecmdparamcallheaderdata.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -31,13 +31,13 @@
//
EXPORT_C TPhoneCmdParamCallHeaderData::TPhoneCmdParamCallHeaderData() :
TPhoneCommandParam(),
- iLabelText( KNullDesC ),
- iShortLabelText( KNullDesC ),
+ iLabelText( NULL ),
+ iShortLabelText( NULL ),
iCallState( 0 ),
iNumberType( 0 ),
iCiphering( EFalse ),
- iCLIText( KNullDesC ),
- iCNAPText( KNullDesC ),
+ iCLIText( NULL ),
+ iCNAPText( NULL ),
iPicture( KNullDesC ),
iLine2 ( EFalse ),
iThumbnail( NULL ),
@@ -52,6 +52,18 @@
}
// ---------------------------------------------------------
+// TPhoneCmdParamCallHeaderData::~TPhoneCmdParamCallHeaderData
+// ---------------------------------------------------------
+//
+EXPORT_C TPhoneCmdParamCallHeaderData::~TPhoneCmdParamCallHeaderData()
+ {
+ delete iLabelText;
+ delete iShortLabelText;
+ delete iCLIText;
+ delete iCNAPText;
+ }
+
+// ---------------------------------------------------------
// TPhoneCmdParamCallHeaderData::SetLabelText
// Sets the call header label text
// (other items were commented in a header).
@@ -60,7 +72,8 @@
EXPORT_C void TPhoneCmdParamCallHeaderData::SetLabelText(
const TDesC& aLabelText )
{
- iLabelText = aLabelText;
+ delete iLabelText;
+ iLabelText = aLabelText.Alloc();
}
// ---------------------------------------------------------
@@ -72,7 +85,8 @@
EXPORT_C void TPhoneCmdParamCallHeaderData::SetShortLabelText(
const TDesC& aShortLabelText )
{
- iShortLabelText = aShortLabelText;
+ delete iShortLabelText;
+ iShortLabelText = aShortLabelText.Alloc();
}
// ---------------------------------------------------------
@@ -130,7 +144,8 @@
const TDesC& aCLIText,
TPhoneTextClippingDirection aDirection )
{
- iCLIText = aCLIText;
+ delete iCLIText;
+ iCLIText = aCLIText.Alloc();
iCLITextClippingDirection = aDirection;
}
@@ -144,7 +159,8 @@
const TDesC& aCNAPText,
TPhoneTextClippingDirection aDirection )
{
- iCNAPText = aCNAPText;
+ delete iCNAPText;
+ iCNAPText = aCNAPText.Alloc();
iCNAPTextClippingDirection = aDirection;
}
@@ -190,7 +206,7 @@
//
EXPORT_C const TDesC& TPhoneCmdParamCallHeaderData::LabelText() const
{
- return iLabelText;
+ return iLabelText ? *iLabelText : KNullDesC();
}
// ---------------------------------------------------------
@@ -201,7 +217,7 @@
//
EXPORT_C const TDesC& TPhoneCmdParamCallHeaderData::ShortLabelText() const
{
- return iShortLabelText;
+ return iShortLabelText ? *iShortLabelText : KNullDesC();
}
// ---------------------------------------------------------
@@ -256,7 +272,7 @@
//
EXPORT_C const TDesC& TPhoneCmdParamCallHeaderData::CLIText() const
{
- return iCLIText;
+ return iCLIText ? *iCLIText : KNullDesC();
}
// ---------------------------------------------------------
@@ -291,7 +307,7 @@
//
EXPORT_C const TDesC& TPhoneCmdParamCallHeaderData::CNAPText() const
{
- return iCNAPText;
+ return iCNAPText ? *iCNAPText : KNullDesC();
}
// ---------------------------------------------------------
--- a/phoneapp/phoneuivoipextension/inc/cphonenewcallcmdhandler.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuivoipextension/inc/cphonenewcallcmdhandler.h Fri Jul 09 15:40:55 2010 +0300
@@ -77,11 +77,6 @@
* Shows new call query.
*/
void ShowNewCallQueryL();
-
- /**
- * Starts new call.
- */
- void DoNewCallL();
/**
* Opens single item contact fetch.
--- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -188,7 +188,7 @@
TInt menuItemCount = menuPane->NumberOfItemsInPane();
for ( TInt i( 0 ); i < menuItemCount; i++ )
{
- menuItemArray.Append( menuPane->MenuItemCommandId( i ) );
+ menuItemArray.AppendL( menuPane->MenuItemCommandId( i ) );
}
// Menu items to be deleted
@@ -772,43 +772,11 @@
// -----------------------------------------------------------
//
void CPhoneCustomizationVoip::InsertTextInputModeChangeMenuItemL(
- CEikMenuPane& aMenuPane )
+ CEikMenuPane& /*aMenuPane*/ )
{
__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
"CPhoneCustomizationVoip::InsertTextInputModeChangeMenuItemL" );
-
- TInt modeChangeOptionIndex = KErrNotFound;
- if ( aMenuPane.MenuItemExists(
- EPhoneNumberAcqCmdToggleNeAlphaMode, modeChangeOptionIndex ) ||
- aMenuPane.MenuItemExists(
- EPhoneNumberAcqCmdToggleNeNumericMode, modeChangeOptionIndex ) )
- {
- __PHONELOG( EBasic, PhoneUIVoIPExtension,
- "InsertTextInputModeChangeMenuItemL, MENU ITEM ALREADY EXISTS" );
- __ASSERT_DEBUG( EFalse, Panic( EPhoneCtrlInvariant ) );
- }
-
- CEikMenuPaneItem* menuItem = NULL;
- TBool numberEntryInNumericMode = iViewCommandHandle.HandleCommandL(
- EPhoneViewIsNumberEntryNumericMode ) == EPhoneViewResponseSuccess;
- if ( numberEntryInNumericMode )
- {
- menuItem = CreateMenuPaneItemLC(
- EPhoneNumberAcqCmdToggleNeAlphaMode,
- R_PHONEUI_NUMBERACQ_OPTIONS_MENU_ITEM_ALPHA_MODE );
- }
- else
- {
- menuItem = CreateMenuPaneItemLC(
- EPhoneNumberAcqCmdToggleNeNumericMode,
- R_PHONEUI_NUMBERACQ_OPTIONS_MENU_ITEM_NUMERIC_MODE );
- }
-
- // alpha/numeric mode option is always second item in number entry menu
- const TInt KTextInputModeChangeMenuItemIndex = 1;
- aMenuPane.InsertMenuItemL(
- menuItem->iData, KTextInputModeChangeMenuItemIndex );
- CleanupStack::PopAndDestroy( menuItem );
+
}
@@ -900,7 +868,7 @@
if( callInfo.iCallState != CTelMenuExtension::ENone )
{
- aArray.Append( callInfo );
+ aArray.AppendL( callInfo );
}
}
--- a/phoneapp/phoneuivoipextension/src/cphonenewcallcmdhandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonenewcallcmdhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -118,7 +118,6 @@
break;
case EPhoneCmdNewInternetCallOk:
- DoNewCallL();
break;
case EPhoneCmdNewInternetCallSearch:
@@ -152,70 +151,6 @@
__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
"CPhoneNewCallCmdHandler::ShowNewCallQueryL" )
- if ( !FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) )
- {
- CPhoneState* phoneState =
- static_cast<CPhoneState*>( iStateMachine.State() );
-
- HBufC *text = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( text->Des() );
- // Pre-populate the query with the number entry contents, if it exists
- if ( phoneState->IsNumberEntryUsedL() )
- {
- // get the number entry contents
- TPhoneCmdParamString stringParam;
- stringParam.SetString( &ptr );
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewGetLocalizedNumberFromEntry,
- &stringParam );
- }
-
- TPhoneCmdParamQuery queryDialogParam;
- queryDialogParam.SetQueryType( EPhoneTextQueryDialog );
- queryDialogParam.SetQueryResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneVoIPNewCallQuery ) );
-
- queryDialogParam.SetDefaultCba( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneVoIPNewCallQueryEmptySoftkeys ) );
-
- queryDialogParam.SetContentCba( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneVoIPNewCallQueryNotEmptySoftkeys ) );
-
- queryDialogParam.SetDataText( &ptr );
- queryDialogParam.SetSendKeyEnabled( ETrue );
-
- // Display dialog
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewShowQuery, &queryDialogParam );
-
- CleanupStack::PopAndDestroy( text );
- }
- }
-
-
-// ---------------------------------------------------------------------------
-// CPhoneNewCallCmdHandler::DoNewCallL
-// ---------------------------------------------------------------------------
-//
-void CPhoneNewCallCmdHandler::DoNewCallL()
- {
- __LOGMETHODSTARTEND( PhoneUIVoIPExtension,
- "CPhoneNewCallCmdHandler::DoNewCallL" )
-
- // First get the string from dialog
- TPhoneCmdParamString string;
- HBufC* content = HBufC::NewLC( KPEPhoneNumberMaxLength );
- TPtr ptr( content->Des() );
- string.SetString( &ptr );
-
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewGetTextQueryContent, &string );
-
- // Dial new voip call
- StateUtils().SelectServiceAndDialL( ptr );
-
- CleanupStack::PopAndDestroy( content );
}
@@ -231,10 +166,10 @@
TPhoneCmdParamInteger integerParam;
integerParam.SetInteger( aFetchType );
-
+ /*
iViewCommandHandle.HandleCommandL(
EPhoneViewOpenSingleItemFetchDialog,
- &integerParam );
+ &integerParam );*/
}
--- a/phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -178,8 +178,7 @@
if( IsNumberEntryVisibleL() && neLength )
{
if ( IsOnScreenDialerSupported() &&
- ( IsDTMFEditorVisibleL() ||
- IsCustomizedDialerVisibleL() ) )
+ IsCustomizedDialerVisibleL() )
{
return;
}
--- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -160,66 +160,7 @@
{
__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
"CPhoneUnattendedTransferCmdHandler::ShowTransferDialerL" )
-
- CPhoneState* phoneState = static_cast<CPhoneState*>( iStateMachine.State() );
- if ( FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) )
- {
- TPhoneCmdParamCustomDialer customDialerParam;
- customDialerParam.SetDialerController( iTransferDialerController );
-
- // Set dialer to transfer mode.
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewShowCustomizedDialer,
- &customDialerParam );
-
- // Open transfer dialer
- phoneState->BeginTransEffectLC( ENumberEntryCreate );
- iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry );
- phoneState->EndTransEffect();
-
- // Update CBA to transfer dialer CBA
- TPhoneCmdParamInteger resourceId;
- resourceId.SetInteger( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( iTransferDialerController->CbaResourceId() ) );
- iViewCommandHandle.ExecuteCommandL( EPhoneViewUpdateCba,
- &resourceId );
- }
- else
- {
- HBufC *text = HBufC::NewLC( KPhoneNumberEntryBufferSize );
- TPtr ptr( text->Des() );
- // Pre-populate the query with the number entry contents, if it exists
- if ( phoneState->IsNumberEntryUsedL() )
- {
- // get the number entry contents
- TPhoneCmdParamString stringParam;
- stringParam.SetString( &ptr );
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewGetLocalizedNumberFromEntry,
- &stringParam );
- }
-
- TPhoneCmdParamQuery queryDialogParam;
- queryDialogParam.SetQueryType( EPhoneGenericTextQuery );
- queryDialogParam.SetQueryResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneVoIPTransferAddressQuery ) );
-
- queryDialogParam.SetDefaultCba( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneVoIPTransferAddressQueryEmptySoftkeys ) );
-
- queryDialogParam.SetContentCba( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( EPhoneVoIPTransferAddressQueryNotEmptySoftkeys ) );
-
- queryDialogParam.SetDataText( &ptr );
- queryDialogParam.SetSendKeyEnabled( ETrue );
-
- // Display dialog
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewShowQuery, &queryDialogParam );
-
- CleanupStack::PopAndDestroy( text );
- }
+
}
@@ -245,13 +186,6 @@
iViewCommandHandle.ExecuteCommand(
EPhoneViewGetNumberFromEntry,
&transferTarget );
-
- phoneState->CloseCustomizedDialerL();
- }
- else
- {
- iViewCommandHandle.ExecuteCommandL(
- EPhoneViewGetTextQueryContent, &transferTarget );
}
// Set transfer to address to the phoneengine
@@ -275,7 +209,6 @@
CPhoneState* phoneState =
static_cast< CPhoneState* >( iStateMachine.State() );
- phoneState->CloseCustomizedDialerL();
}
@@ -292,9 +225,9 @@
TPhoneCmdParamInteger integerParam;
integerParam.SetInteger( aFetchType );
- iViewCommandHandle.HandleCommandL(
+ /*iViewCommandHandle.HandleCommandL(
EPhoneViewOpenSingleItemFetchDialog,
- &integerParam );
+ &integerParam );*/
}
// ---------------------------------------------------------------------------
--- a/phoneengine/audiohandling/src/cpeaudiodata.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/audiohandling/src/cpeaudiodata.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -411,11 +411,16 @@
for (TInt j = 0; j < availableOutputs.Count(); j++)
{
- iPEavailableOutputs.Append(ConvertToPE(availableOutputs[j]));
- TEFLOGSTRING3( KTAINT,
- "AUD CPEAudioData::GetAvailableOutputs, index: %d, available: %d",
+ TInt err = iPEavailableOutputs.Append(ConvertToPE(availableOutputs[j]));
+ TEFLOGSTRING4( KTAINT,
+ "AUD CPEAudioData::GetAvailableOutputs, index: %d, available: %d, err: %d",
j,
- availableOutputs[j] );
+ availableOutputs[j],
+ err );
+ if(err != KErrNone)
+ {
+ // Do nothing. Here for just to suppress the compile warning.
+ }
}
return iPEavailableOutputs.Array();
--- a/phoneengine/networkhandlingstarter/inc/cnetworklistener.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/inc/cnetworklistener.h Fri Jul 09 15:40:55 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -22,14 +22,16 @@
// System includes
#include <e32base.h>
#include <nwhandlingengine.h>
+#include <qsysteminfo.h>
// User includes
// Forward declarations
class CNWSession;
-class CRepository;
class MNetworkListenerObserver;
+using namespace QtMobility;
+
/**
* Network info listener.
*/
@@ -118,15 +120,15 @@
TBool iRegistered;
/**
- * Profile API.
- */
- CRepository* iProfileApi;
-
- /**
* Observer.
*/
MNetworkListenerObserver& iObserver;
-
+
+ /**
+ * System device info API.
+ * Own.
+ */
+ QSystemDeviceInfo* iDeviceInfo;
};
#endif // CNETWORKLISTENER_H
--- a/phoneengine/networkhandlingstarter/inc/networkhandlingstarter_p.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/inc/networkhandlingstarter_p.h Fri Jul 09 15:40:55 2010 +0300
@@ -22,7 +22,6 @@
class CNetworkListener;
class HbDeviceMessageBox;
-class HbMainWindow;
/*!
\class NetworkHandlingStarterPrivate
@@ -42,25 +41,13 @@
public slots:
void LaunchCpNetworkPluginView();
-
- void ViewDone();
-
-signals:
-
- void SearchAvailableNetworks();
public: // From MNetworkListenerObserver
void ShowNote();
void RemoveNote();
-
-private:
-
- HbMainWindow * MainWindow();
-
- bool InitaliseCpNetworkPluginView();
-
+
private:
CNetworkListener* m_networkListener;
--- a/phoneengine/networkhandlingstarter/networkhandlingstarter.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/networkhandlingstarter.pro Fri Jul 09 15:40:55 2010 +0300
@@ -15,7 +15,8 @@
#
#
-CONFIG += hb
+CONFIG += hb mobility
+MOBILITY += systeminfo
TEMPLATE = app
TARGET = networkhandlingstarter
@@ -29,7 +30,6 @@
TARGET.UID3 = 0x2002E67A
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
LIBS += -lnetworkhandling
- LIBS += -lcentralrepository
LIBS += -lxqservice
LIBS += -lxqserviceutil
LIBS += -lcpframework
@@ -52,4 +52,3 @@
CONFIG += service
SERVICE.FILE = service_conf.xml
SERVICE.OPTIONS = embeddable
-
--- a/phoneengine/networkhandlingstarter/service_conf.xml Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/service_conf.xml Fri Jul 09 15:40:55 2010 +0300
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
-<service name="com.nokia.services" filepath="must-not-be-empty" >
- <description>Networkhandling services</description>
- <interface name="networkhandling" version="1.0" capabilities="">
+<service>
+ <name>networkhandlingstarter</name>
+ <filepath>No path</filepath>
+ <description>Networkhandling starter services</description>
+ <interface>
+ <name>com.nokia.symbian.IStart</name>
+ <version>1.0</version>
<description>Networkhandling starter interface</description>
</interface>
</service>
+
--- a/phoneengine/networkhandlingstarter/src/cnetworklistener.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/src/cnetworklistener.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009-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"
@@ -16,9 +16,6 @@
*/
#include <networkhandlingproxy.h>
#include <cnwsession.h>
-#include <e32property.h>
-#include <centralrepository.h>
-#include <ProfileEngineSDKCRKeys.h>
#include <BTSapDomainPSKeys.h>
#include <startupdomainpskeys.h>
@@ -31,16 +28,13 @@
// 1-minute timeout before showing soft notification
const TInt KNetworkLostTimeout = 60*1000000;
-// Offline profile, from ProfileEngineSDKCRKeys.h
-const TInt KOfflineProfileId = 5;
-
-
// ======== MEMBER FUNCTIONS ========
/*!
Constructor of CNetworkListener.
*/
-CNetworkListener::CNetworkListener(MNetworkListenerObserver& aObserver) :
+CNetworkListener::CNetworkListener( MNetworkListenerObserver& aObserver )
+ :
iRegistered(ETrue),
iObserver(aObserver)
{
@@ -59,7 +53,7 @@
//Create network handling engine session.
iSession = CreateL(*this, iInfo);
iTimer = CPeriodic::NewL(CActive::EPriorityStandard);
- iProfileApi = CRepository::NewL(KCRUidProfileEngine);
+ QT_TRYCATCH_LEAVING(iDeviceInfo = new QSystemDeviceInfo())
DPRINT << ": OUT";
}
@@ -67,7 +61,7 @@
/*!
Constructor of CNetworkListener.
*/
-CNetworkListener* CNetworkListener::NewL(MNetworkListenerObserver& aObserver)
+CNetworkListener* CNetworkListener::NewL( MNetworkListenerObserver& aObserver )
{
DPRINT << ": IN";
@@ -89,7 +83,7 @@
delete iSession;
delete iTimer;
- delete iProfileApi;
+ delete iDeviceInfo;
DPRINT << ": OUT";
}
@@ -210,12 +204,13 @@
{
DPRINT << ": IN";
- TInt profileId;
- TInt err = iProfileApi->Get(KProEngActiveProfile, profileId);
+ TInt result = KErrNone;
+ TBool isOffLineMode = EFalse;
+ QT_TRYCATCH_ERROR(result, isOffLineMode =
+ QSystemDeviceInfo::OfflineProfile == iDeviceInfo->currentProfile())
- DPRINT << ": OUT";
-
- return profileId == KOfflineProfileId && err == KErrNone;
+ DPRINT << ": OUT, result: " << result;
+ return (isOffLineMode && (KErrNone == result));
}
/*!
--- a/phoneengine/networkhandlingstarter/src/main.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/src/main.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -14,13 +14,10 @@
* Description:
*
*/
-#include <QLocale>
-#include <hbtranslator.h>
-#include <hbapplication.h>
-#include <hbview.h>
-#include <hbmainwindow.h>
+
#include <networkhandlingstarter.h>
#include <xqserviceutil.h>
+#include <hbapplication.h>
/*!
main.
@@ -28,19 +25,8 @@
int main(int argc, char **argv)
{
HbApplication app(argc, argv, Hb::NoSplash);
-
- // Load translators
- HbTranslator commonTranslator("common");
- HbTranslator control_panelTranslator("control_panel");
- HbTranslator telephone_cpTranslator("telephone_cp");
-
- HbView view;
- HbMainWindow mainWindow;
- mainWindow.addView(&view);
NetworkHandlingStarter service;
- XQServiceUtil::toBackground( true );
- int err = app.exec();
-
- return err;
+ XQServiceUtil::toBackground(true);
+ return app.exec();
}
--- a/phoneengine/networkhandlingstarter/src/networkhandlingstarter.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/src/networkhandlingstarter.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -21,8 +21,8 @@
/*!
Constructor of NetworkHandlingStarter.
*/
-NetworkHandlingStarter::NetworkHandlingStarter(QObject *parent) :
- XQServiceProvider(QLatin1String("com.nokia.services.networkhandling"), parent),
+NetworkHandlingStarter::NetworkHandlingStarter(QObject *parent) :
+ XQServiceProvider(QLatin1String("networkhandlingstarter.com.nokia.symbian.IStart"), parent),
m_privateImpl(NULL)
{
// Install plugin specific msg handler
--- a/phoneengine/networkhandlingstarter/src/networkhandlingstarter_p.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/src/networkhandlingstarter_p.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009-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"
@@ -17,11 +17,10 @@
#include <hbdevicemessagebox.h>
#include <hbaction.h>
-#include <cppluginlauncher.h>
-#include <hbinstance.h>
-#include <hbview.h>
#include <xqserviceutil.h>
-#include <cpbasesettingview.h>
+#include <xqaiwrequest.h>
+#include <xqappmgr.h>
+#include <hbtranslator.h>
#include "networkhandlingstarter_p.h"
#include "networkhandlingstarterlogging.h"
@@ -30,12 +29,15 @@
/*!
Constructor of NetworkHandlingStarterPrivate.
*/
-NetworkHandlingStarterPrivate::NetworkHandlingStarterPrivate(QObject *parent) :
- QObject(parent), m_note(NULL)
+NetworkHandlingStarterPrivate::NetworkHandlingStarterPrivate(QObject *parent)
+ :
+ QObject(parent),
+ m_networkListener(NULL),
+ m_note(NULL)
{
DPRINT << ": IN";
- QT_TRAP_THROWING(m_networkListener = CNetworkListener::NewL(*this));
+ QT_TRAP_THROWING(m_networkListener = CNetworkListener::NewL(*this))
DPRINT << ": OUT";
}
@@ -67,6 +69,8 @@
delete m_note;
m_note = NULL;
}
+ HbTranslator commonTranslator("common");
+ HbTranslator telephone_cpTranslator("telephone_cp");
m_note = new HbDeviceMessageBox(
hbTrId("txt_phone_info_network_lost_select_network"),
HbMessageBox::MessageTypeQuestion);
@@ -86,6 +90,7 @@
/*!
NetworkHandlingStarterPrivate::RemoveNote()
*/
+
void NetworkHandlingStarterPrivate::RemoveNote()
{
DPRINT << ": IN";
@@ -100,75 +105,35 @@
}
/*!
- NetworkHandlingStarterPrivate::InitaliseCpNetworkPluginView()
- */
-bool NetworkHandlingStarterPrivate::InitaliseCpNetworkPluginView()
-{
- DPRINT << ": IN";
-
- bool ok(false);
- CpBaseSettingView* view = CpPluginLauncher::launchSettingView("cpnetworkplugin");
- if (view) {
- if (QString(view->metaObject()->className()) ==
- QString("CpNetworkPluginView")) {
- QObject::connect(
- view, SIGNAL(aboutToClose()),
- this, SLOT(ViewDone()));
- QObject::connect(
- this, SIGNAL(SearchAvailableNetworks()),
- view, SLOT(SearchAvailableNetworks()));
- ok = true;
- }
- }
-
- DPRINT << ": OUT";
- return ok;
-}
-
-/*!
NetworkHandlingStarterPrivate::LaunchCpNetworkPluginView()
*/
void NetworkHandlingStarterPrivate::LaunchCpNetworkPluginView()
{
DPRINT << ": IN";
- if (InitaliseCpNetworkPluginView()) {
- DPRINT << ": Show network settings view";
- HbMainWindow *mainWnd = MainWindow();
- if (mainWnd) {
- mainWnd->show();
- XQServiceUtil::toBackground(false);
- }
- emit SearchAvailableNetworks();
- }
+ XQApplicationManager appManager;
+ QList<QVariant> args;
+ QString service;
+ QString interface;
+ QString operation;
+ QVariantHash hash;
+ QVariantMap map;
+
+ interface = "com.nokia.symbian.ICpPluginLauncher";
+ operation = "launchSettingView(QString,QVariant)";
+ args << QVariant("cpnetworkplugin.dll");
+ hash["command"] = "searchAvailableNetworks";
+ args << hash;
+
+ QScopedPointer<XQAiwRequest> request( service.isEmpty() ?
+ appManager.create(interface, operation, false):
+ appManager.create(service, interface, operation, false));
+ if (request){
+ request->setArguments(args);
+ request->send();
+ }
DPRINT << ": OUT";
}
-/*!
- NetworkHandlingStarterPrivate::ViewDone()
- */
-void NetworkHandlingStarterPrivate::ViewDone()
-{
- HbMainWindow *mainWnd = MainWindow();
- if (mainWnd) {
- mainWnd->hide();
- }
- XQServiceUtil::toBackground(true);
-}
-
-/*!
- NetworkHandlingStarterPrivate::MainWindow()
- */
-
-HbMainWindow * NetworkHandlingStarterPrivate::MainWindow()
-{
- HbMainWindow *window(NULL);
- QList<HbMainWindow*> mainWindows = hbInstance->allMainWindows();
- if (!mainWindows.isEmpty()) {
- window = mainWindows.front();
- }
- return window;
-}
-
// End of File.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_hbtranslator.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,75 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbtranslator.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbTranslator::HbTranslator
+// -----------------------------------------------------------------------------
+//
+HbTranslator::HbTranslator( ) : d(NULL)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTranslator::HbTranslator
+// -----------------------------------------------------------------------------
+//
+HbTranslator::HbTranslator(
+ const QString & file ) : d(NULL)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTranslator::HbTranslator
+// -----------------------------------------------------------------------------
+//
+HbTranslator::HbTranslator(
+ const QString & path,
+ const QString & file ) : d(NULL)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTranslator::~HbTranslator
+// -----------------------------------------------------------------------------
+//
+HbTranslator::~HbTranslator( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTranslator::loadCommon
+// -----------------------------------------------------------------------------
+//
+void HbTranslator::loadCommon( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
--- a/phoneengine/networkhandlingstarter/tsrc/mocks/mock_networkhandlingstarter_p.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_networkhandlingstarter_p.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -71,11 +71,5 @@
{
SMC_MOCK_METHOD0( void )
}
-/*!
- NetworkHandlingStarterPrivate::ViewDone()
- */
-void NetworkHandlingStarterPrivate::ViewDone()
-{
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_qsysteminfo.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,575 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <qsysteminfo.h>
+#include <QStringList>
+#include <QSize>
+#include <QFile>
+#include <QTextStream>
+#include <QLocale>
+#include <QLibraryInfo>
+#include <QApplication>
+#include <QDesktopWidget>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+QTM_BEGIN_NAMESPACE
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::QSystemStorageInfo
+// -----------------------------------------------------------------------------
+//
+QSystemStorageInfo::QSystemStorageInfo( QObject * parent )
+ :
+ QObject(parent)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::~QSystemStorageInfo
+// -----------------------------------------------------------------------------
+//
+QSystemStorageInfo::~QSystemStorageInfo( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::totalDiskSpace
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE qlonglong QSystemStorageInfo::totalDiskSpace(
+ const QString & driveVolume )
+ {
+ SMC_MOCK_METHOD1( Q_INVOKABLE qlonglong, const QString &, driveVolume )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::availableDiskSpace
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE qlonglong QSystemStorageInfo::availableDiskSpace(
+ const QString & driveVolume )
+ {
+ SMC_MOCK_METHOD1( Q_INVOKABLE qlonglong, const QString &, driveVolume )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::logicalDrives
+// -----------------------------------------------------------------------------
+//
+QStringList QSystemStorageInfo::logicalDrives( )
+ {
+ SMC_MOCK_METHOD0( QStringList )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::typeForDrive
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE QSystemStorageInfo::DriveType QSystemStorageInfo::typeForDrive(
+ const QString & driveVolume )
+ {
+ SMC_MOCK_METHOD1( Q_INVOKABLE QSystemStorageInfo::DriveType, const QString &, driveVolume )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::QSystemDeviceInfo
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::QSystemDeviceInfo ( QObject * parent )
+ :
+ QObject(parent)
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::~QSystemDeviceInfo
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::~QSystemDeviceInfo( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::inputMethodType
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::InputMethodFlags QSystemDeviceInfo::inputMethodType( )
+ {
+ SMC_MOCK_METHOD0( QSystemDeviceInfo::InputMethodFlags )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::imei
+// -----------------------------------------------------------------------------
+//
+QString QSystemDeviceInfo::imei( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::imsi
+// -----------------------------------------------------------------------------
+//
+QString QSystemDeviceInfo::imsi( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::manufacturer
+// -----------------------------------------------------------------------------
+//
+QString QSystemDeviceInfo::manufacturer( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::model
+// -----------------------------------------------------------------------------
+//
+QString QSystemDeviceInfo::model( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::productName
+// -----------------------------------------------------------------------------
+//
+QString QSystemDeviceInfo::productName( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::batteryLevel
+// -----------------------------------------------------------------------------
+//
+int QSystemDeviceInfo::batteryLevel( ) const
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::batteryStatus
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::BatteryStatus QSystemDeviceInfo::batteryStatus( )
+ {
+ SMC_MOCK_METHOD0( QSystemDeviceInfo::BatteryStatus )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::isDeviceLocked
+// -----------------------------------------------------------------------------
+//
+bool QSystemDeviceInfo::isDeviceLocked( )
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::simStatus
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::SimStatus QSystemDeviceInfo::simStatus( )
+ {
+ SMC_MOCK_METHOD0( QSystemDeviceInfo::SimStatus )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::currentProfile
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::Profile QSystemDeviceInfo::currentProfile( )
+ {
+ SMC_MOCK_METHOD0( QSystemDeviceInfo::Profile )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDeviceInfo::currentPowerState
+// -----------------------------------------------------------------------------
+//
+QSystemDeviceInfo::PowerState QSystemDeviceInfo::currentPowerState( )
+ {
+ SMC_MOCK_METHOD0( QSystemDeviceInfo::PowerState )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::QSystemInfo
+// -----------------------------------------------------------------------------
+//
+QSystemInfo::QSystemInfo( QObject * parent )
+ :
+ QObject(parent)
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::~QSystemInfo
+// -----------------------------------------------------------------------------
+//
+QSystemInfo::~QSystemInfo()
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::currentLanguage
+// -----------------------------------------------------------------------------
+//
+QString QSystemInfo::currentLanguage()
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::availableLanguages
+// -----------------------------------------------------------------------------
+//
+QStringList QSystemInfo::availableLanguages( )
+ {
+ SMC_MOCK_METHOD0( QStringList )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::currentCountryCode
+// -----------------------------------------------------------------------------
+//
+QString QSystemInfo::currentCountryCode( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::version
+// -----------------------------------------------------------------------------
+//
+QString QSystemInfo::version(
+ QSystemInfo::Version type,
+ const QString & parameter )
+ {
+ SMC_MOCK_METHOD2( QString, QSystemInfo::Version, type,
+ const QString &, parameter )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemInfo::hasFeatureSupported
+// -----------------------------------------------------------------------------
+//
+bool QSystemInfo::hasFeatureSupported(
+ QSystemInfo::Feature feature )
+ {
+ SMC_MOCK_METHOD1( bool, QSystemInfo::Feature, feature )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::QSystemNetworkInfo
+// -----------------------------------------------------------------------------
+//
+QSystemNetworkInfo::QSystemNetworkInfo( QObject * parent )
+ :
+ QObject(parent)
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::~QSystemNetworkInfo
+// -----------------------------------------------------------------------------
+//
+QSystemNetworkInfo::~QSystemNetworkInfo( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::networkStatus
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE QSystemNetworkInfo::NetworkStatus QSystemNetworkInfo::networkStatus(
+ QSystemNetworkInfo::NetworkMode mode )
+ {
+ SMC_MOCK_METHOD1( Q_INVOKABLE QSystemNetworkInfo::NetworkStatus,
+ QSystemNetworkInfo::NetworkMode, mode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::networkSignalStrength
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE int QSystemNetworkInfo::networkSignalStrength(
+ QSystemNetworkInfo::NetworkMode mode )
+ {
+ SMC_MOCK_METHOD1( Q_INVOKABLE int,
+ QSystemNetworkInfo::NetworkMode, mode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::macAddress
+// -----------------------------------------------------------------------------
+//
+QString QSystemNetworkInfo::macAddress(
+ QSystemNetworkInfo::NetworkMode mode )
+ {
+ SMC_MOCK_METHOD1( QString, QSystemNetworkInfo::NetworkMode, mode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::currentMode
+// -----------------------------------------------------------------------------
+//
+QSystemNetworkInfo::NetworkMode QSystemNetworkInfo::currentMode( )
+ {
+ SMC_MOCK_METHOD0( QSystemNetworkInfo::NetworkMode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::cellId
+// -----------------------------------------------------------------------------
+//
+int QSystemNetworkInfo::cellId( )
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::locationAreaCode
+// -----------------------------------------------------------------------------
+//
+int QSystemNetworkInfo::locationAreaCode( )
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::currentMobileCountryCode
+// -----------------------------------------------------------------------------
+//
+QString QSystemNetworkInfo::currentMobileCountryCode( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::currentMobileNetworkCode
+// -----------------------------------------------------------------------------
+//
+QString QSystemNetworkInfo::currentMobileNetworkCode( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::homeMobileCountryCode
+// -----------------------------------------------------------------------------
+//
+QString QSystemNetworkInfo::homeMobileCountryCode( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::homeMobileNetworkCode
+// -----------------------------------------------------------------------------
+//
+QString QSystemNetworkInfo::homeMobileNetworkCode( )
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::networkName
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE QString QSystemNetworkInfo::networkName(
+ QSystemNetworkInfo::NetworkMode mode )
+ {
+ SMC_MOCK_METHOD1( Q_INVOKABLE QString, QSystemNetworkInfo::NetworkMode, mode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::interfaceForMode
+// -----------------------------------------------------------------------------
+//
+QNetworkInterface QSystemNetworkInfo::interfaceForMode(
+ QSystemNetworkInfo::NetworkMode mode )
+ {
+ SMC_MOCK_METHOD1( QNetworkInterface, QSystemNetworkInfo::NetworkMode, mode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::connectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemNetworkInfo::connectNotify(
+ const char * signal )
+ {
+ SMC_MOCK_METHOD1( void, const char *, signal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemNetworkInfo::disconnectNotify
+// -----------------------------------------------------------------------------
+//
+void QSystemNetworkInfo::disconnectNotify(
+ const char * signal )
+ {
+ SMC_MOCK_METHOD1( void, const char *, signal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemScreenSaver::QSystemScreenSaver
+// -----------------------------------------------------------------------------
+//
+QSystemScreenSaver::QSystemScreenSaver ( QObject * parent )
+ :
+ QObject(parent)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemScreenSaver::~QSystemScreenSaver
+// -----------------------------------------------------------------------------
+//
+QSystemScreenSaver::~QSystemScreenSaver( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemScreenSaver::screenSaverInhibited
+// -----------------------------------------------------------------------------
+//
+bool QSystemScreenSaver::screenSaverInhibited( )
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemScreenSaver::setScreenSaverInhibit
+// -----------------------------------------------------------------------------
+//
+Q_INVOKABLE bool QSystemScreenSaver::setScreenSaverInhibit( )
+ {
+ SMC_MOCK_METHOD0( Q_INVOKABLE bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDisplayInfo::QSystemDisplayInfo
+// -----------------------------------------------------------------------------
+//
+QSystemDisplayInfo::QSystemDisplayInfo(
+ QObject * parent )
+ :
+ QObject( parent )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDisplayInfo::~QSystemDisplayInfo
+// -----------------------------------------------------------------------------
+//
+QSystemDisplayInfo::~QSystemDisplayInfo( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDisplayInfo::displayBrightness
+// -----------------------------------------------------------------------------
+//
+int QSystemDisplayInfo::displayBrightness(
+ int screen )
+ {
+ SMC_MOCK_METHOD1( int, int, screen )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSystemDisplayInfo::colorDepth
+// -----------------------------------------------------------------------------
+//
+int QSystemDisplayInfo::colorDepth(
+ int screen )
+ {
+ SMC_MOCK_METHOD1( int, int, screen )
+ }
+
+#include "moc_qsysteminfo.cpp"
+
+QTM_END_NAMESPACE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqaiwrequest.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,302 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <xqaiwrequest.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::XQAiwRequest
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest::XQAiwRequest(
+ const XQAiwInterfaceDescriptor & descriptor,
+ const QString & operation,
+ bool embedded )
+ //:
+ //QObject( /*descriptor, operation, embedded*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::XQAiwRequest
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest::XQAiwRequest(
+ const QUrl & uri,
+ const XQAiwInterfaceDescriptor & descriptor,
+ const QString & operation )
+ //:
+ //QObject( /*uri, descriptor, operation*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::XQAiwRequest
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest::XQAiwRequest(
+ const QFile & file,
+ const XQAiwInterfaceDescriptor & descriptor,
+ const QString & operation )
+ //:
+ //QObject( /*file, descriptor, operation*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::XQAiwRequest
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest::XQAiwRequest(
+ const XQSharableFile & file,
+ const XQAiwInterfaceDescriptor & descriptor,
+ const QString & operation )
+ //:
+ //QObject( /*file, descriptor, operation*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::~XQAiwRequest
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest::~XQAiwRequest( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::createAction
+// -----------------------------------------------------------------------------
+//
+QAction * XQAiwRequest::createAction( )
+ {
+ SMC_MOCK_METHOD0( QAction * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::setArguments
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::setArguments(
+ const QList<QVariant> & arguments )
+ {
+ //SMC_MOCK_METHOD1( void, const QList<QVariant> &, arguments )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::lastError
+// -----------------------------------------------------------------------------
+//
+int XQAiwRequest::lastError( ) const
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::lastErrorMessage
+// -----------------------------------------------------------------------------
+//
+const QString & XQAiwRequest::lastErrorMessage( ) const
+ {
+ SMC_MOCK_METHOD0( const QString & )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::descriptor
+// -----------------------------------------------------------------------------
+//
+const XQAiwInterfaceDescriptor & XQAiwRequest::descriptor( ) const
+ {
+ //SMC_MOCK_METHOD0( const XQAiwInterfaceDescriptor & )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::send
+// -----------------------------------------------------------------------------
+//
+bool XQAiwRequest::send( )
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::send
+// -----------------------------------------------------------------------------
+//
+bool XQAiwRequest::send(
+ QVariant & returnValue )
+ {
+ //SMC_MOCK_METHOD1( bool, QVariant &, returnValue )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::setEmbedded
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::setEmbedded(
+ bool embedded )
+ {
+ SMC_MOCK_METHOD1( void, bool, embedded )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::isEmbedded
+// -----------------------------------------------------------------------------
+//
+bool XQAiwRequest::isEmbedded( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::setOperation
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::setOperation(
+ const QString & operation )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, operation )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::operation
+// -----------------------------------------------------------------------------
+//
+const QString & XQAiwRequest::operation( ) const
+ {
+ SMC_MOCK_METHOD0( const QString & )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::setSynchronous
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::setSynchronous(
+ bool synchronous )
+ {
+ SMC_MOCK_METHOD1( void, bool, synchronous )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::isSynchronous
+// -----------------------------------------------------------------------------
+//
+bool XQAiwRequest::isSynchronous( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::setBackground
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::setBackground(
+ bool background )
+ {
+ SMC_MOCK_METHOD1( void, bool, background )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::isBackground
+// -----------------------------------------------------------------------------
+//
+bool XQAiwRequest::isBackground( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::setInfo
+// -----------------------------------------------------------------------------
+//
+void XQAiwRequest::setInfo(
+ const XQRequestInfo & info )
+ {
+ // SMC_MOCK_METHOD1( void, const XQRequestInfo &, info )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::info
+// -----------------------------------------------------------------------------
+//
+XQRequestInfo XQAiwRequest::info( ) const
+ {
+ //SMC_MOCK_METHOD0( XQRequestInfo )
+ }
+
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::results
+// -----------------------------------------------------------------------------
+//
+const QVariant & XQAiwRequest::results( ) const
+ {
+ //SMC_MOCK_METHOD0( const QVariant & )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQAiwRequest::sendExecute
+// -----------------------------------------------------------------------------
+//
+bool XQAiwRequest::sendExecute( )
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+const QMetaObject *XQAiwRequest::metaObject() const
+{
+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : NULL;
+}
+
+void *XQAiwRequest::qt_metacast(const char *_clname)
+{
+}
+
+int XQAiwRequest::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ return 0;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/networkhandlingstarter/tsrc/mocks/mock_xqappmgr.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,311 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <xqappmgr.h>
+#include <xqaiwrequest.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::XQApplicationManager
+// -----------------------------------------------------------------------------
+//
+XQApplicationManager::XQApplicationManager( )
+ //:
+ //QObject( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::~XQApplicationManager
+// -----------------------------------------------------------------------------
+//
+XQApplicationManager::~XQApplicationManager( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const QString & interface,
+ const QString & operation,
+ bool embedded )
+ {
+ SMC_MOCK_METHOD3( XQAiwRequest *, const QString &, interface,
+ const QString &, operation,
+ bool, embedded )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const XQAiwInterfaceDescriptor & implementation,
+ const QString & operation,
+ bool embedded )
+ {
+ SMC_MOCK_METHOD3( XQAiwRequest *, const XQAiwInterfaceDescriptor &, implementation,
+ const QString &, operation,
+ bool, embedded )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const QString & service,
+ const QString & interface,
+ const QString & operation,
+ bool embedded )
+ {
+ SMC_MOCK_METHOD4( XQAiwRequest *, const QString &, service,
+ const QString &, interface,
+ const QString &, operation,
+ bool, embedded )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::list
+// -----------------------------------------------------------------------------
+//
+QList <XQAiwInterfaceDescriptor > XQApplicationManager::list(
+ const QString & interface,
+ const QString & operation )
+ {
+ /* SMC_MOCK_METHOD2( QList <XQAiwInterfaceDescriptor >, const QString &, interface,
+ const QString &, operation )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::list
+// -----------------------------------------------------------------------------
+//
+QList <XQAiwInterfaceDescriptor > XQApplicationManager::list(
+ const QString & service,
+ const QString & interface,
+ const QString & operation )
+ {
+ /*SMC_MOCK_METHOD3( QList <XQAiwInterfaceDescriptor >, const QString &, service,
+ const QString &, interface,
+ const QString &, operation )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const QUrl & url,
+ bool embedded )
+ {
+ /*SMC_MOCK_METHOD2( XQAiwRequest *, const QUrl &, url,
+ bool, embedded )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const QUrl & url,
+ const XQAiwInterfaceDescriptor & implementation,
+ bool embedded )
+ {
+ /*SMC_MOCK_METHOD3( XQAiwRequest *, const QUrl &, url,
+ const XQAiwInterfaceDescriptor &, implementation,
+ bool, embedded )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const QFile & file,
+ bool embedded )
+ {
+ /*SMC_MOCK_METHOD2( XQAiwRequest *, const QFile &, file,
+ bool, embedded )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const QFile & file,
+ const XQAiwInterfaceDescriptor & implementation,
+ bool embedded )
+ {
+ /*SMC_MOCK_METHOD3( XQAiwRequest *, const QFile &, file,
+ const XQAiwInterfaceDescriptor &, implementation,
+ bool, embedded )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::list
+// -----------------------------------------------------------------------------
+//
+QList <XQAiwInterfaceDescriptor > XQApplicationManager::list(
+ const QUrl & uri )
+ {
+ //SMC_MOCK_METHOD1( QList <XQAiwInterfaceDescriptor >, const QUrl &, uri )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::list
+// -----------------------------------------------------------------------------
+//
+QList <XQAiwInterfaceDescriptor > XQApplicationManager::list(
+ const QFile & file )
+ {
+ //SMC_MOCK_METHOD1( QList <XQAiwInterfaceDescriptor >, const QFile &, file )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::list
+// -----------------------------------------------------------------------------
+//
+QList <XQAiwInterfaceDescriptor > XQApplicationManager::list(
+ const XQSharableFile & file )
+ {
+ //SMC_MOCK_METHOD1( QList <XQAiwInterfaceDescriptor >, const XQSharableFile &, file )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const XQSharableFile & file,
+ bool embedded )
+ {
+ /* SMC_MOCK_METHOD2( XQAiwRequest *, const XQSharableFile &, file,
+ bool, embedded )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::create
+// -----------------------------------------------------------------------------
+//
+XQAiwRequest * XQApplicationManager::create(
+ const XQSharableFile & file,
+ const XQAiwInterfaceDescriptor & implementation,
+ bool embedded )
+ {
+ /*SMC_MOCK_METHOD3( XQAiwRequest *, const XQSharableFile &, file,
+ const XQAiwInterfaceDescriptor &, implementation,
+ bool, embedded )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::lastError
+// -----------------------------------------------------------------------------
+//
+int XQApplicationManager::lastError( ) const
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::isRunning
+// -----------------------------------------------------------------------------
+//
+bool XQApplicationManager::isRunning(
+ const XQAiwInterfaceDescriptor & implementation ) const
+ {
+ // SMC_MOCK_METHOD1( bool, const XQAiwInterfaceDescriptor &, implementation )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::getDrmAttributes
+// -----------------------------------------------------------------------------
+//
+bool XQApplicationManager::getDrmAttributes(
+ const QFile & file,
+ const QList<int> & attributeNames,
+ QVariantList & attributeValues )
+ {
+ /* SMC_MOCK_METHOD3( bool, const QFile &, file,
+ const QList<int> &, attributeNames,
+ QVariantList &, attributeValues )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::getDrmAttributes
+// -----------------------------------------------------------------------------
+//
+bool XQApplicationManager::getDrmAttributes(
+ const XQSharableFile & file,
+ const QList<int> & attributeNames,
+ QVariantList & attributeValues )
+ {
+ /* SMC_MOCK_METHOD3( bool, const XQSharableFile &, file,
+ const QList<int> &, attributeNames,
+ QVariantList &, attributeValues )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQApplicationManager::status
+// -----------------------------------------------------------------------------
+//
+XQApplicationManager::ServiceStatus XQApplicationManager::status(
+ const XQAiwInterfaceDescriptor & implementation )
+ {
+ // SMC_MOCK_METHOD1( XQApplicationManager::ServiceStatus, const XQAiwInterfaceDescriptor &, implementation )
+ }
+
+const QMetaObject *XQApplicationManager::metaObject() const
+{
+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : NULL;
+}
+
+void *XQApplicationManager::qt_metacast(const char *_clname)
+{
+}
+
+int XQApplicationManager::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ return 0;
+}
--- a/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/src/ut_cnetworklistener.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/src/ut_cnetworklistener.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -57,6 +57,9 @@
m_networkListener = CNetworkListener::NewL(*this);
+ QT_TRAP_THROWING(SmcDefaultValue<QSystemDeviceInfo::Profile>::SetL(
+ QSystemDeviceInfo::NormalProfile))
+
QVERIFY(verify());
}
@@ -68,6 +71,8 @@
delete m_networkListener;
m_networkListener = 0;
+ SmcDefaultValue<QSystemDeviceInfo::Profile>::Reset();
+
reset();
}
@@ -141,7 +146,7 @@
TAny* pointer(NULL);
m_networkListener->NWLostDelayCallBack(pointer);
- CNetworkListener* networklistener = CNetworkListener::NewL(*this);;
+ CNetworkListener* networklistener = CNetworkListener::NewL(*this);
m_networkListener->NWLostDelayCallBack( networklistener );
delete networklistener;
}
--- a/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/ut_cnetworklistener.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_cnetworklistener/ut_cnetworklistener.pro Fri Jul 09 15:40:55 2010 +0300
@@ -15,14 +15,16 @@
#
#
-CONFIG += qtestlib hb
+CONFIG += qtestlib hb mobility
+MOBILITY += systeminfo
TEMPLATE = app
TARGET =
INCLUDEPATH += ./inc
INCLUDEPATH += ../../inc
INCLUDEPATH += ../common
-DEFINES += QT_NO_DEBUG_STREAM BUILD_NETWORKHANDLINGSTARTER
+DEFINES += QT_NO_DEBUG_STREAM
+DEFINES += BUILD_NETWORKHANDLINGSTARTER QT_BUILD_SYSINFO_LIB QT_MAKEDLL
QT -= gui
QT += testlib
@@ -43,6 +45,7 @@
SOURCES += ../../src/cnetworklistener.cpp
# mocks needed for testing
+HEADERS += /epoc32/include/mw/qsysteminfo.h
SOURCES += ../mocks/mock_cnwsession.cpp
SOURCES += ../mocks/mock_centralrepository.cpp
-
+SOURCES += ../mocks/mock_qsysteminfo.cpp
--- a/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/inc/ut_networkhandlingstarter_p.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/inc/ut_networkhandlingstarter_p.h Fri Jul 09 15:40:55 2010 +0300
@@ -20,7 +20,7 @@
#include <QtTest/QtTest>
#include <mockservice.h>
-#include <hbmainwindow.h>
+#include <xqaiwrequest.h>
class NetworkHandlingStarterPrivate;
@@ -38,17 +38,15 @@
void init();
void cleanup();
- void t_LaunchNetworksettingsPlugin();
- void t_ViewDone();
void t_ShowNote();
void t_RemoveNote();
+ void t_LaunchNetworksettingsPlugin();
private:
NetworkHandlingStarterPrivate *m_NetworkHandlingStarterPrivate;
- HbMainWindow m_HbMainWindow;
- QList<HbMainWindow *> m_MainWindowList;
+ XQAiwRequest *m_XQAiwRequest;
};
--- a/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/src/ut_networkhandlingstarter_p.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/src/ut_networkhandlingstarter_p.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -22,9 +22,10 @@
ut_networkhandlingstarter_p::ut_networkhandlingstarter_p
*/
ut_networkhandlingstarter_p::ut_networkhandlingstarter_p()
- : m_NetworkHandlingStarterPrivate(0)
+ : m_NetworkHandlingStarterPrivate(0),
+ m_XQAiwRequest(NULL)
{
- SmcDefaultValue< QList<HbMainWindow *> >::SetL(m_MainWindowList);
+
}
/*!
@@ -53,9 +54,7 @@
void ut_networkhandlingstarter_p::cleanup()
{
delete m_NetworkHandlingStarterPrivate;
- m_NetworkHandlingStarterPrivate = 0;
- m_MainWindowList.clear();
-
+ m_NetworkHandlingStarterPrivate = 0;
reset();
}
@@ -65,25 +64,13 @@
void ut_networkhandlingstarter_p::t_LaunchNetworksettingsPlugin()
{
m_NetworkHandlingStarterPrivate->LaunchCpNetworkPluginView();
-
- m_MainWindowList.append(&m_HbMainWindow);
- expect("HbInstance::allMainWindows").returns(m_MainWindowList).times(2);
+ XQAiwInterfaceDescriptor descriptor;
+ m_XQAiwRequest = new XQAiwRequest(descriptor, "test", false);
+ SmcDefaultValue<XQAiwRequest *>::SetL(m_XQAiwRequest);
m_NetworkHandlingStarterPrivate->LaunchCpNetworkPluginView();
}
/*!
- ut_networkhandlingstarter_p::t_ViewDone
- */
-void ut_networkhandlingstarter_p::t_ViewDone()
-{
- m_NetworkHandlingStarterPrivate->ViewDone();
-
- m_MainWindowList.append(&m_HbMainWindow);
- expect("HbInstance::allMainWindows").returns(m_MainWindowList);
- m_NetworkHandlingStarterPrivate->ViewDone();
-}
-
-/*!
ut_networkhandlingstarter_p::t_ShowNote
*/
void ut_networkhandlingstarter_p::t_ShowNote()
--- a/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/ut_networkhandlingstarter_p.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/ut_networkhandlingstarter_p/ut_networkhandlingstarter_p.pro Fri Jul 09 15:40:55 2010 +0300
@@ -45,7 +45,6 @@
# mocks needed for testing
SOURCES += ../mocks/mock_cnetworklistener.cpp
-SOURCES += ../mocks/mock_cppluginlauncher.cpp
SOURCES += ../mocks/mock_hbdevicemessagebox.cpp
SOURCES += ../mocks/mock_hbaction.cpp
SOURCES += ../mocks/mock_hbinstance.cpp
@@ -53,4 +52,7 @@
SOURCES += ../mocks/mock_qgraphicsview.cpp
SOURCES += ../mocks/mock_qabstractscrollarea.cpp
SOURCES += ../mocks/mock_qframe.cpp
+SOURCES += ../mocks/mock_xqappmgr.cpp
+SOURCES += ../mocks/mock_xqaiwrequest.cpp
+SOURCES += ../mocks/mock_hbtranslator.cpp
Binary file phoneengine/phonemodel/conf/ci_s60telephony.confml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_101F87E3.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_101f87e3.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828B1.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828B2.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828B8.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828F8.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828b1.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828b2.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828b8.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828f8.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102830B6.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102830b6.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_2001B2E6.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_2001b2e6.crml has changed
--- a/phoneengine/phonemodel/phonemodel.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phonemodel/phonemodel.pro Fri Jul 09 15:40:55 2010 +0300
@@ -32,7 +32,8 @@
$$OS_LAYER_GLIB_SYSTEMINCLUDE
INCLUDEPATH += ../../inc \
../inc \
- ../phoneservices/inc
+ ../phoneservices/inc \
+ /epoc32/include/mw/QtGui
engineDefFiles = \
"$${LITERAL_HASH}ifdef WINSCW" \
@@ -76,6 +77,7 @@
-lmediatorclient \
-lestor \
-lxqservice \
+ -lxqserviceutil \
-llibglib \
-lpsetwrapper \
-lpsuinotes
@@ -177,6 +179,7 @@
BLD_INF_RULES.prj_exports += \
"$${LITERAL_HASH}include <platform_paths.hrh>" \
"./rom/phonengengine.iby CORE_APP_LAYER_IBY_EXPORT_PATH(phonengengine.iby)"
+BLD_INF_RULES.prj_exports += "./conf/ci_s60telephony.confml APP_LAYER_CONFML(ci_s60telephony.confml)"
BLD_INF_RULES.prj_exports += "./conf/s60telephony.confml APP_LAYER_CONFML(s60telephony.confml)"
BLD_INF_RULES.prj_exports += "./conf/s60telephony_japan.confml CONFML_EXPORT_PATH(s60telephony_japan.confml,japan)"
BLD_INF_RULES.prj_exports += "./conf/s60telephony_101f87e3.crml APP_LAYER_CRML(s60telephony_101f87e3.crml)"
--- a/phoneengine/phonemodel/src/cpephonemodel.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phonemodel/src/cpephonemodel.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -39,6 +39,7 @@
#include <mpecontacthandling.h>
#include <mpeloghandling.h>
#include <xqservicerequest.h>
+#include <xqappmgr.h>
#include "phoneservices.h"
// CONSTANTS
@@ -1435,17 +1436,30 @@
case CPEPhoneModel::EPENetworkHandling:
{
TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 18.1" );
- XQServiceRequest request("com.nokia.services.networkhandling","start()");
- bool res = request.send();
- if (!res) {
- int error = request.latestError();
- TEFLOGSTRING2(
- KTAOBJECT,
- "CPEPhoneModel::StepL 18.2 error %d",
- error );
+ continueStepping = EFalse;
+ QString service("networkhandlingstarter");
+ QString interface("com.nokia.symbian.IStart");
+ QString operation("start()");
+ XQApplicationManager appManager;
+
+ QScopedPointer<XQAiwRequest> request(
+ appManager.create(service, interface, operation, false));
+ if (request == NULL) {
+ TEFLOGSTRING(KTAOBJECT,
+ "CPEPhoneModel::StepL 18.2 error, service not found");
+ break;
}
- TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 18.2" );
- continueStepping = EFalse;
+ XQRequestInfo info;
+ info.setForeground(false);
+ request->setInfo(info);
+ request->setSynchronous(false);
+ if (!request->send()) {
+ int error = request->lastError();
+ TEFLOGSTRING2(KTAOBJECT,
+ "CPEPhoneModel::StepL 18.3 error %d", error);
+ break;
+ }
+ TEFLOGSTRING(KTAOBJECT, "CPEPhoneModel::StepL: 18.4");
break;
}
--- a/phoneengine/phoneservices/inc/dialservice.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/inc/dialservice.h Fri Jul 09 15:40:55 2010 +0300
@@ -27,7 +27,8 @@
* args << QString("0501234567"); // number or address
* // add contactId and serviceId when needed by operation
* request->setArguments(args);
-* if (request->send()) {
+* QVariant retValue;
+* if (request->send(retValue)) {
* //error
* }
*
@@ -81,7 +82,7 @@
Phone Application. It is intended to be used via Qt Highway.
*/
- void dialVideo(const QString& number);
+ int dialVideo(const QString& number);
/*!
\fn dial(const QString& number)
@@ -91,7 +92,7 @@
Caller's name is shown according to the given Phonebook contact
identifier.
*/
- void dialVideo(const QString& number, int contactId);
+ int dialVideo(const QString& number, int contactId);
/*!
\fn dialVoip(const QString& address)
@@ -99,7 +100,7 @@
This method makes a voip call dial command to
Phone Application. It is intended to be used via Qt Highway.
*/
- void dialVoip(const QString& address);
+ int dialVoip(const QString& address);
/*!
\fn dialVoip(const QString& address, int contactId)
@@ -110,7 +111,7 @@
identifier.
*/
- void dialVoip(const QString& address, int contactId);
+ int dialVoip(const QString& address, int contactId);
/*!
\fn dialVoipService(const QString& address, int contactId)
@@ -119,7 +120,7 @@
Phone Application. It is intended to be used via Qt Highway.
Call is made by given service (id).
*/
- void dialVoipService(const QString& address, int serviceId);
+ int dialVoipService(const QString& address, int serviceId);
/*!
\fn dialVoipService(const QString& address, int serviceId, int contactId)
@@ -130,7 +131,7 @@
Caller's name is shown according to the given Phonebook contact
identifier.
*/
- void dialVoipService(const QString& address, int serviceId, int contactId);
+ int dialVoipService(const QString& address, int serviceId, int contactId);
private:
@@ -154,6 +155,14 @@
Returns a string that has japan specific configuration modifications made
*/
QString japanPrefixModifications(const QString &number) Q_REQUIRED_RESULT;
+
+
+ /*!
+ \fn bool hasCapability()
+
+ Checks if the client has the required capabilities
+ */
+ bool hasCapability();
private:
--- a/phoneengine/phoneservices/inc/dialservicedepricated.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/inc/dialservicedepricated.h Fri Jul 09 15:40:55 2010 +0300
@@ -26,6 +26,8 @@
#include "mpecallcontrolif.h"
#include "mpecallsettersif.h"
+// FORWARD DECLARATIONS
+class XQSettingsManager;
class DialServiceDepricated : public XQServiceProvider
{
Q_OBJECT
@@ -34,124 +36,59 @@
~DialServiceDepricated();
public slots:
- /*!
- \fn dial(const QString& number)
-
- This method makes a cellular switched dial command to
- Phone Application. It is intended to be used via Qt Highway.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dial(QString)");
- snd << "0501234567";
- */
+
+ //deprecated
int dial(const QString& number);
- /*!
- \fn dial(const QString& number)
-
- This method makes a cellular switched dial command to
- Phone Application. It is intended to be used via Qt Highway.
- Caller's name is shown according to the given Phonebook contact
- identifier.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dial(QString,int)");
- snd << "0501234567" << 123456;
- */
+ //deprecated
int dial(const QString& number, int contactId);
- /*!
- \fn dialVideo(const QString& number)
-
- This method makes a video call dial command to
- Phone Application. It is intended to be used via Qt Highway.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dial(QString)");
- snd << "0501234567";
- */
+ //deprecated
void dialVideo(const QString& number);
- /*!
- \fn dial(const QString& number)
-
- This method makes a video call dial command to
- Phone Application. It is intended to be used via Qt Highway.
- Caller's name is shown according to the given Phonebook contact
- identifier.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dial(QString,int)");
- snd << "0501234567" << 123456;
- */
+ //deprecated
void dialVideo(const QString& number, int contactId);
- /*!
- \fn dialVoip(const QString& address)
-
- This method makes a voip call dial command to
- Phone Application. It is intended to be used via Qt Highway.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dialVoip(QString)");
- snd << "address@domain";
- */
+ //deprecated
void dialVoip(const QString& address);
- /*!
- \fn dialVoip(const QString& address, int contactId)
-
- This method makes a voip call dial command to
- Phone Application. It is intended to be used via Qt Highway.
- Caller's name is shown according to the given Phonebook contact
- identifier.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dialVoip(QString,int)");
- snd << "address@domain" << 123456;
- */
+ //deprecated
void dialVoip(const QString& address, int contactId);
- /*!
- \fn dialVoipService(const QString& address, int contactId)
-
- This method makes a voip call dial command to
- Phone Application. It is intended to be used via Qt Highway.
- Call is made by given service (id).
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dialVoipService(QString,int)");
- snd << "address@domain" << 123;
- */
+ //deprecated
void dialVoipService(const QString& address, int serviceId);
- /*!
- \fn dialVoipService(const QString& address, int serviceId, int contactId)
-
- This method makes a voip call dial command to
- Phone Application. It is intended to be used via Qt Highway.
- Call is made by given service (id).
- Caller's name is shown according to the given Phonebook contact
- identifier.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","dialVoipService(QString,int,int)");
- snd << "address@domain" << 123 << 12345;
- */
+ //deprecated
void dialVoipService(const QString& address, int serviceId, int contactId);
private:
+
+ /*!
+ \fn QString modifyPhoneNumber(QString& number)
+
+ Returns a modified phone number string. Strips white spaces, makes prefix changes etc.
+ */
+ QString modifyPhoneNumber(const QString &number) Q_REQUIRED_RESULT;
+
/*!
\fn QString simplified(QString& number)
Returns a string that has whitespaces, '(', ')', '-', '[', and ']' chars removed
*/
static QString simplified(const QString &number) Q_REQUIRED_RESULT;
+
+ /*!
+ \fn QString japanPrefixModifications(QString& number)
+
+ Returns a string that has japan specific configuration modifications made
+ */
+ QString japanPrefixModifications(const QString &number) Q_REQUIRED_RESULT;
private:
- MPECallControlIF &m_call;
- MPECallSettersIF &m_parameters;
+ MPECallControlIF &m_call;
+ MPECallSettersIF &m_parameters;
+ XQSettingsManager *m_settingsManager;
};
#endif // DIALERSERVICEDEPRICATED_H
--- a/phoneengine/phoneservices/inc/dtmfservice.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/inc/dtmfservice.h Fri Jul 09 15:40:55 2010 +0300
@@ -60,19 +60,29 @@
If character doesn't match any supported DTMF tone
it is ignored.
*/
- void playDTMFTone(const QChar& keyToPlay);
+ int playDTMFTone(const QChar& keyToPlay);
/*!
\fn stopDTMFPlay()
This method stops playing DTMF tone if it is currently played.
*/
- void stopDTMFPlay();
+ int stopDTMFPlay();
+
+
+private:
+
+ /*!
+ \fn bool hasCapability()
+
+ Checks if the client has the required capabilities
+ */
+ bool hasCapability();
private:
MPECallControlIF &m_call;
- MPECallSettersIF &m_parameters;
+ MPECallSettersIF &m_parameters;
};
#endif // DTMFSERVICE_H
--- a/phoneengine/phoneservices/inc/dtmfservicedepricated.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/inc/dtmfservicedepricated.h Fri Jul 09 15:40:55 2010 +0300
@@ -38,29 +38,19 @@
public slots:
/*!
- \fn playDTMFTone(const QChar& keyToPlay)
-
- This method plays DTMF tone matching given character.
- If character doesn't match any supported DTMF tone
- it is ignored.
-
- Usage example:
- XQServiceRequest snd("com.nokia.services.telephony","playDTMFTone(QChar)");
- snd << "5";
+ deprecated
*/
void playDTMFTone(const QChar& keyToPlay);
/*!
- \fn stopDTMFPlay()
-
- This method stops playing DTMF tone if it is currently played.
+ deprecated
*/
void stopDTMFPlay();
private:
MPECallControlIF &m_call;
- MPECallSettersIF &m_parameters;
+ MPECallSettersIF &m_parameters;
};
#endif // DTMFSERVICE_H
--- a/phoneengine/phoneservices/src/dialservice.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/src/dialservice.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -1,5 +1,5 @@
/*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 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"
@@ -21,16 +21,16 @@
#include <featmgr.h>
#include <settingsinternalcrkeys.h>
#include <xqsettingsmanager.h>
+#include <e32capability.h>
#include "dialservice.h"
#include "qtphonelog.h"
// CONSTANTS
-const int MaxPrefixStringLength = 10;
-const XQSettingsKey dialPrefixMode(XQSettingsKey::TargetCentralRepository, KCRUidNetworkSettings.iUid, KSettingsDialPrefixChangeMode);
-const XQSettingsKey dialPrefixString(XQSettingsKey::TargetCentralRepository, KCRUidNetworkSettings.iUid, KSettingsDialPrefixText);
+const XQSettingsKey dialPrefixMode(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixChangeMode);
+const XQSettingsKey dialPrefixString(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixText);
-DialService::DialService(MPECallControlIF &call, MPECallSettersIF ¶meters, QObject* parent) :
- XQServiceProvider(QLatin1String("com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters), m_settingsManager(0)
+DialService::DialService(MPECallControlIF &call, MPECallSettersIF ¶meters, QObject* parent) :
+ XQServiceProvider(QLatin1String("phoneui.com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters), m_settingsManager(0)
{
publishAll();
m_settingsManager = new XQSettingsManager(this);
@@ -44,6 +44,9 @@
int DialService::dial(const QString& number)
{
PHONE_DEBUG2("DialService::dial number:", number);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
QString phoneNumber = modifyPhoneNumber(number);
TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
@@ -54,80 +57,102 @@
int DialService::dial(const QString& number, int contactId)
{
PHONE_DEBUG4("DialService::dial number:", number, "contactId:", contactId);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
QString phoneNumber = modifyPhoneNumber(number);
TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeCSVoice);
m_parameters.SetContactId2 (contactId);
- return m_call.HandleDialServiceCall ();
+ return m_call.HandleDialServiceCall ();
}
-void DialService::dialVideo(const QString& number)
+int DialService::dialVideo(const QString& number)
{
PHONE_DEBUG2("DialService::dialVideo number:", number);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
QString phoneNumber = modifyPhoneNumber(number);
TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeVideo);
- m_call.HandleDialServiceCall ();
+ return m_call.HandleDialServiceCall ();
}
-void DialService::dialVideo(const QString& number, int contactId)
+int DialService::dialVideo(const QString& number, int contactId)
{
PHONE_DEBUG4("DialService::dialVideo number:", number, "contactId:", contactId);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
QString phoneNumber = modifyPhoneNumber(number);
TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeVideo);
m_parameters.SetContactId2 (contactId);
- m_call.HandleDialServiceCall ();
+ return m_call.HandleDialServiceCall ();
}
-void DialService::dialVoip(const QString& address)
+int DialService::dialVoip(const QString& address)
{
PHONE_DEBUG2("DialService::dialVoip number:", address);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(address.utf16 ()));
m_parameters.SetPhoneNumber(numberPtr);
m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
- m_call.HandleDialServiceCall();
+ return m_call.HandleDialServiceCall();
}
-void DialService::dialVoip(const QString& address, int contactId)
+int DialService::dialVoip(const QString& address, int contactId)
{
PHONE_DEBUG4("DialService::dialVoip number:", address, "contactId:", contactId);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
m_parameters.SetPhoneNumber(numberPtr);
m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
m_parameters.SetContactId2(contactId);
- m_call.HandleDialServiceCall();
+ return m_call.HandleDialServiceCall();
}
-void DialService::dialVoipService(const QString& address, int serviceId)
+int DialService::dialVoipService(const QString& address, int serviceId)
{
PHONE_DEBUG4("DialService::dialVoipService number:", address, "serviceId:", serviceId);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
m_parameters.SetPhoneNumber(numberPtr);
m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
m_parameters.SetServiceIdCommand(serviceId);
- m_call.HandleDialServiceCall();
+ return m_call.HandleDialServiceCall();
}
-void DialService::dialVoipService(
+int DialService::dialVoipService(
const QString& address, int serviceId, int contactId)
{
PHONE_DEBUG2("DialService::dialVoipService number:", address);
PHONE_DEBUG2("DialService::dialVoipService serviceId:", serviceId);
PHONE_DEBUG2("DialService::dialVoipService contactId:", contactId);
+ if (!hasCapability()) {
+ return KErrPermissionDenied;
+ }
TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
m_parameters.SetPhoneNumber(numberPtr);
m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
m_parameters.SetServiceIdCommand(serviceId);
m_parameters.SetContactId2(contactId);
- m_call.HandleDialServiceCall();
+ return m_call.HandleDialServiceCall();
}
QString DialService::modifyPhoneNumber(const QString &number)
{
+ PHONE_DEBUG2("DialService::modifyPhoneNumber number:", number);
QString modifiedNumber = simplified(number);
modifiedNumber = japanPrefixModifications(modifiedNumber);
@@ -143,26 +168,48 @@
}
QString DialService::japanPrefixModifications(const QString &number)
-{
+{
+ PHONE_DEBUG2("DialService::japanPrefixModifications number:", number);
bool checkPrefix = FeatureManager::FeatureSupported(KFeatureIdJapanPrefixChange);
if(checkPrefix == false) {
// prefix change setting is off so don't play with the number
return number;
}
-
+
QString modifiedNumber = number;
-
+
int prefixMode = m_settingsManager->readItemValue(dialPrefixMode, XQSettingsManager::TypeInt).toInt();
+ PHONE_DEBUG2("DialService::japanPrefixModifications prefixMode:", prefixMode);
+
if((m_settingsManager->error() == XQSettingsManager::NoError) && (prefixMode > 0)) {
// No error fetching value and setting is on
QString prefixString = m_settingsManager->readItemValue(dialPrefixString, XQSettingsManager::TypeString).toString();
+ PHONE_DEBUG2("DialService::japanPrefixModifications prefixString:", prefixString);
if(m_settingsManager->error() == XQSettingsManager::NoError) {
if(modifiedNumber.startsWith("+")) {
- modifiedNumber = modifiedNumber.replace(0, prefixString.length(), prefixString);
- }
+ modifiedNumber = modifiedNumber.remove(0, 1);
+ modifiedNumber = modifiedNumber.insert(0, prefixString);
+ }
}
}
-
+
+ PHONE_DEBUG2("DialService::japanPrefixModifications modifiedNumber:", modifiedNumber);
return modifiedNumber;
}
+
+bool DialService::hasCapability()
+{
+ XQRequestInfo req = requestInfo();
+ QSet<int> caps = req.clientCapabilities();
+
+ if (!caps.contains(ECapabilityNetworkServices)) {
+ PHONE_TRACE1("NetworkServices capability missing");
+ return false;
+ }
+ if (!caps.contains(ECapabilityNetworkControl)) {
+ PHONE_TRACE1("NetworkControl capability missing");
+ return false;
+ }
+ return true;
+}
--- a/phoneengine/phoneservices/src/dialservicedepricated.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/src/dialservicedepricated.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -18,14 +18,22 @@
#include <xqserviceutil.h>
#include <e32base.h>
#include <qregexp.h>
+#include <featmgr.h>
+#include <settingsinternalcrkeys.h>
+#include <xqsettingsmanager.h>
#include "dialservicedepricated.h"
#include "qtphonelog.h"
+// CONSTANTS
+const XQSettingsKey dialPrefixMode(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixChangeMode);
+const XQSettingsKey dialPrefixString(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixText);
DialServiceDepricated::DialServiceDepricated(MPECallControlIF &call, MPECallSettersIF ¶meters, QObject* parent) :
- XQServiceProvider(QLatin1String("com.nokia.services.telephony"), parent), m_call (call), m_parameters (parameters)
+ XQServiceProvider(QLatin1String("com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters)
{
publishAll();
+ m_settingsManager = new XQSettingsManager(this);
+ Q_ASSERT(m_settingsManager != 0);
}
DialServiceDepricated::~DialServiceDepricated()
@@ -35,8 +43,8 @@
int DialServiceDepricated::dial(const QString& number)
{
PHONE_DEBUG2("DialServiceDepricated::dial number:", number);
- QString simplifiedNumber = simplified(number);
- TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(simplifiedNumber.utf16()));
+ QString phoneNumber = modifyPhoneNumber(number);
+ TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeCSVoice);
return m_call.HandleDialServiceCall ();
@@ -45,8 +53,8 @@
int DialServiceDepricated::dial(const QString& number, int contactId)
{
PHONE_DEBUG4("DialServiceDepricated::dial number:", number, "contactId:", contactId);
- QString simplifiedNumber = simplified(number);
- TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(simplifiedNumber.utf16()));
+ QString phoneNumber = modifyPhoneNumber(number);
+ TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeCSVoice);
m_parameters.SetContactId2 (contactId);
@@ -56,8 +64,8 @@
void DialServiceDepricated::dialVideo(const QString& number)
{
PHONE_DEBUG2("DialServiceDepricated::dialVideo number:", number);
- QString simplifiedNumber = simplified(number);
- TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(simplifiedNumber.utf16()));
+ QString phoneNumber = modifyPhoneNumber(number);
+ TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeVideo);
m_call.HandleDialServiceCall ();
@@ -66,8 +74,8 @@
void DialServiceDepricated::dialVideo(const QString& number, int contactId)
{
PHONE_DEBUG4("DialServiceDepricated::dialVideo number:", number, "contactId:", contactId);
- QString simplifiedNumber = simplified(number);
- TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(simplifiedNumber.utf16()));
+ QString phoneNumber = modifyPhoneNumber(number);
+ TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
m_parameters.SetPhoneNumber (numberPtr);
m_parameters.SetCallTypeCommand (EPECallTypeVideo);
m_parameters.SetContactId2 (contactId);
@@ -117,6 +125,15 @@
m_call.HandleDialServiceCall();
}
+QString DialServiceDepricated::modifyPhoneNumber(const QString &number)
+{
+ PHONE_DEBUG2("DialService::modifyPhoneNumber number:", number);
+ QString modifiedNumber = simplified(number);
+ modifiedNumber = japanPrefixModifications(modifiedNumber);
+
+ return modifiedNumber;
+}
+
QString DialServiceDepricated::simplified(const QString &number)
{
QString simplifiedNumber = number;
@@ -124,3 +141,34 @@
simplifiedNumber.remove(rx);
return simplifiedNumber;
}
+
+QString DialServiceDepricated::japanPrefixModifications(const QString &number)
+{
+ PHONE_DEBUG2("DialService::japanPrefixModifications number:", number);
+ bool checkPrefix = FeatureManager::FeatureSupported(KFeatureIdJapanPrefixChange);
+ if(checkPrefix == false) {
+ // prefix change setting is off so don't play with the number
+ return number;
+ }
+
+ QString modifiedNumber = number;
+
+ int prefixMode = m_settingsManager->readItemValue(dialPrefixMode, XQSettingsManager::TypeInt).toInt();
+ PHONE_DEBUG2("DialService::japanPrefixModifications prefixMode:", prefixMode);
+
+ if((m_settingsManager->error() == XQSettingsManager::NoError) && (prefixMode > 0)) {
+ // No error fetching value and setting is on
+ QString prefixString = m_settingsManager->readItemValue(dialPrefixString, XQSettingsManager::TypeString).toString();
+ PHONE_DEBUG2("DialService::japanPrefixModifications prefixString:", prefixString);
+
+ if(m_settingsManager->error() == XQSettingsManager::NoError) {
+ if(modifiedNumber.startsWith("+")) {
+ modifiedNumber = modifiedNumber.remove(0, 1);
+ modifiedNumber = modifiedNumber.insert(0, prefixString);
+ }
+ }
+ }
+
+ PHONE_DEBUG2("DialService::japanPrefixModifications modifiedNumber:", modifiedNumber);
+ return modifiedNumber;
+}
--- a/phoneengine/phoneservices/src/dtmfservice.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/src/dtmfservice.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -26,7 +26,7 @@
QObject* parent)
:
XQServiceProvider(
- QLatin1String("com.nokia.symbian.IDtmfPlay"), parent),
+ QLatin1String("phoneui.com.nokia.symbian.IDtmfPlay"), parent),
m_call(call),
m_parameters(parameters)
{
@@ -37,15 +37,34 @@
{
}
-void DTMFService::playDTMFTone(const QChar& keyToPlay)
+int DTMFService::playDTMFTone(const QChar& keyToPlay)
{
- PHONE_DEBUG2("DTMFService::playDTMFTone keyToPlay:", keyToPlay);
+ PHONE_TRACE2("keyToPlay:", keyToPlay);
+ if (!hasCapability()) {
+ return;
+ }
m_parameters.SetKeyCode(keyToPlay.unicode());
- TRAP_IGNORE( m_call.HandlePlayDTMFL() );
+ TRAPD(ret, m_call.HandlePlayDTMFL() );
+ return ret;
}
-void DTMFService::stopDTMFPlay()
+int DTMFService::stopDTMFPlay()
{
- PHONE_DEBUG("DTMFService::stopDTMFPlay");
- m_call.HandleEndDTMF();
+ PHONE_TRACE;
+ if (!hasCapability()) {
+ return;
+ }
+ return m_call.HandleEndDTMF();
}
+
+bool DTMFService::hasCapability()
+{
+ XQRequestInfo req = requestInfo();
+ QSet<int> caps = req.clientCapabilities();
+ if (!caps.contains(ECapabilityNetworkServices)) {
+ PHONE_TRACE1("NetworkServices capability missing");
+ return false;
+ }
+ return true;
+}
+
--- a/phoneengine/phoneservices/src/dtmfservicedepricated.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/src/dtmfservicedepricated.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -26,7 +26,7 @@
QObject* parent)
:
XQServiceProvider(
- QLatin1String("com.nokia.services.telephony.dtmf"), parent),
+ QLatin1String("com.nokia.symbian.IDtmfPlay"), parent),
m_call(call),
m_parameters(parameters)
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phoneservices/tsrc/urischemeservicetestapp/main.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,33 @@
+/*!
+* 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:
+*
+*/
+
+#include <HbApplication>
+#include <HbMainWindow>
+#include "urischemeservicetestappview.h"
+
+int main(int argc, char *argv[])
+{
+ HbApplication app(argc, argv);
+
+ HbMainWindow window;
+ UriSchemeServiceTestAppView *view =
+ new UriSchemeServiceTestAppView(window);
+ window.addView(view);
+ window.show();
+
+ return app.exec();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phoneservices/tsrc/urischemeservicetestapp/rom/urischemeservicetestapp.iby Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* 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:
+*
+*/
+#ifndef __URISCHEMESERVICETESTAPP_IBY__
+#define __URISCHEMESERVICETESTAPP_IBY__
+
+file=ABI_DIR\UREL\urischemeservicetestapp.exe PROGRAMS_DIR\urischemeservicetestapp.exe
+data=DATAZ_\private\10003a3f\import\apps\urischemeservicetestapp_reg.rsc \private\10003a3f\import\apps\urischemeservicetestapp_reg.rsc
+data=DATAZ_\resource\apps\urischemeservicetestapp.rsc \resource\apps\urischemeservicetestapp.rsc
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phoneservices/tsrc/urischemeservicetestapp/urischemerservicetestapp_hw.pkg Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,41 @@
+;
+; 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:
+;
+
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"urischemeservicetestapp"},(0xee4b29ef),1,0,0
+
+; Localised Vendor name
+%{"Vendor"}
+
+; Unique Vendor name
+:"Vendor"
+
+; Manual PKG pre-rules from PRO files
+; Default dependency to Qt libraries
+(0x2001E61C), 4, 6, 3, {"Qt"}
+; Default HW/platform dependencies
+[0x101F7961],0,0,0,{"S60ProductID"}
+[0x102032BE],0,0,0,{"S60ProductID"}
+[0x102752AE],0,0,0,{"S60ProductID"}
+[0x1028315F],0,0,0,{"S60ProductID"}
+
+; Executable and default resource files
+"/epoc32/release/armv5/urel/urischemeservicetestapp.exe" - "c:\sys\bin\urischemeservicetestapp.exe"
+"/epoc32/data/z/resource/apps/urischemeservicetestapp.rsc" - "c:\resource\apps\urischemeservicetestapp.rsc"
+"/epoc32/data/z/private/10003a3f/import/apps/urischemeservicetestapp_reg.rsc" - "c:\private\10003a3f\import\apps\urischemeservicetestapp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phoneservices/tsrc/urischemeservicetestapp/urischemeservicetestapp.pro Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,39 @@
+#
+# 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:
+#
+#
+
+TEMPLATE = app
+CONFIG += hb
+TARGET = urischemeservicetestapp
+DEPENDPATH += .
+
+INCLUDEPATH += .
+
+symbian {
+ TARGET.CAPABILITY = ALL -TCB
+ TARGET.UID3 = 0xee4b29ef
+
+ HEADERS += urischemeservicetestappview.h
+
+ SOURCES += main.cpp \
+ urischemeservicetestappview.cpp
+
+ BLD_INF_RULES.prj_exports += \
+ "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "./rom/urischemeservicetestapp.iby CORE_APP_LAYER_IBY_EXPORT_PATH(urischemeservicetestapp.iby)"
+
+ LIBS += -lphoneservices -lxqservice -lxqserviceutil
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phoneservices/tsrc/urischemeservicetestapp/urischemeservicetestappview.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,243 @@
+/*!
+* 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:
+*
+*/
+
+#include <QtGui>
+#include <QGraphicsLinearLayout>
+#include <QUrl>
+#include <HbAction>
+#include <HbLabel>
+#include <HbMainWindow>
+#include <HbPushButton>
+#include <HbLineEdit>
+#include <HbNotificationDialog>
+#include <HbCheckBox>
+#include <hbinputeditorinterface.h>
+#include <xqservicerequest.h>
+#include <xqappmgr.h>
+#include "urischemeservicetestappview.h"
+
+const int KMultitapTimeInMs = 800;
+const int KNumOfTelMultitapCharacters = 4;
+const int KNumOfCtiMultitapCharacters = 2;
+const QString KTelUriSchemePrefix = "tel:";
+const QString KCtiUriSchemePrefix = "cti:";
+
+UriSchemeServiceTestAppView::UriSchemeServiceTestAppView(
+ HbMainWindow& mainWindow )
+ :
+ m_mainWindow(mainWindow),
+ m_lineEdit(NULL),
+ m_telUriCheckBox(NULL),
+ m_ctiUriCheckBox(NULL),
+ m_uriLabel(NULL),
+ m_multitapIndex(0),
+ m_multitapCount(0)
+{
+ setTitle("URI Scheme Test App");
+
+ m_extraChar.insert(Qt::Key_Comma, ',');
+ m_extraChar.insert(Qt::Key_Slash, '/');
+ m_extraChar.insert(Qt::Key_Asterisk, '*');
+ m_extraChar.insert(Qt::Key_NumberSign, '#');
+ m_extraChar.insert(Qt::Key_P, 'p');
+ m_extraChar.insert(Qt::Key_W, 'w');
+
+ QGraphicsLinearLayout *mainLayout =
+ new QGraphicsLinearLayout(Qt::Vertical, this);
+
+ // create URI scheme selection check boxes
+ m_telUriCheckBox = new HbCheckBox(this);
+ m_telUriCheckBox->setText("TEL URI Scheme");
+ m_telUriCheckBox->setChecked(true);
+ connect(
+ m_telUriCheckBox, SIGNAL(stateChanged(int)),
+ this, SLOT(setupTelUriConfiguration(int)));
+ mainLayout->addItem(m_telUriCheckBox);
+ m_ctiUriCheckBox = new HbCheckBox(this);
+ m_ctiUriCheckBox->setText("CTI URI Scheme");
+ connect(
+ m_ctiUriCheckBox, SIGNAL(stateChanged(int)),
+ this, SLOT(setupCtiUriConfiguration(int)));
+ mainLayout->addItem(m_ctiUriCheckBox);
+
+ // create URI input field
+ QGraphicsLinearLayout *uriEditLayout =
+ new QGraphicsLinearLayout(Qt::Horizontal);
+ m_uriLabel = new HbLabel(this);
+ uriEditLayout->addItem(m_uriLabel);
+ m_lineEdit = new HbLineEdit(this);
+ HbEditorInterface editorInterface(m_lineEdit);
+ editorInterface.setMode(HbInputModeNumeric);
+ HbAction *specialInputAction = new HbAction(QString("INP"), this);
+ editorInterface.addAction(specialInputAction);
+ connect(
+ specialInputAction, SIGNAL(triggered(bool)),
+ this, SLOT(inputSpecialCharacter(bool)));
+ m_lineEdit->setInputMethodHints(
+ Qt::ImhPreferNumbers|Qt::ImhNoPredictiveText);
+ uriEditLayout->addItem(m_lineEdit);
+ mainLayout->addItem(uriEditLayout);
+
+ // create Call & Clear buttons
+ HbPushButton *callButton = new HbPushButton(this);
+ callButton->setText("Call");
+ mainLayout->addItem(callButton);
+ connect(
+ callButton, SIGNAL(clicked(bool)),
+ this, SLOT(makeCall(bool)));
+ HbPushButton *clearButton = new HbPushButton(this);
+ clearButton->setText("Clear");
+ mainLayout->addItem(clearButton);
+ connect(
+ clearButton, SIGNAL(clicked(bool)),
+ this, SLOT(clearInputField(bool)));
+
+ setLayout(mainLayout);
+
+ setupTelUriConfiguration(Qt::Checked);
+}
+
+
+UriSchemeServiceTestAppView::~UriSchemeServiceTestAppView()
+{
+
+}
+
+
+void UriSchemeServiceTestAppView::makeCall(bool checked)
+{
+ Q_UNUSED(checked)
+
+ QString uriToCall = "";
+ uriToCall += m_uriLabel->plainText();
+ uriToCall += m_lineEdit->text();
+ QUrl callUri(uriToCall);
+
+ HbNotificationDialog *notifDialog = new HbNotificationDialog();
+ notifDialog->setDismissPolicy(HbPopup::TapAnywhere);
+ notifDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+
+ XQApplicationManager aiwManager;
+ QScopedPointer<XQAiwRequest> request(aiwManager.create(callUri));
+ if (request) {
+ request->setSynchronous(true);
+ request->setEmbedded(false);
+ request->setBackground(true);
+
+ QList<QVariant> args;
+ args << callUri.toString();
+ request->setArguments(args);
+
+ QVariant uriHandled = false;
+ bool requestOk = request->send(uriHandled);
+ if (uriHandled.toBool()) {
+ notifDialog->setText("URI call accepted");
+ } else {
+ /* URI is not handled in the following cases:
+ * 1. URI is invalid or not supported and parsing has failed.
+ * 2. User has canceled the call request.
+ * 3. Phone has rejected call request with parsed phone number.*/
+ notifDialog->setText("URI call rejected");
+ }
+ } else {
+ notifDialog->setText("Unknown scheme");
+ }
+ notifDialog->show();
+}
+
+
+void UriSchemeServiceTestAppView::clearInputField(bool checked)
+{
+ Q_UNUSED(checked)
+
+ m_lineEdit->setText("");
+}
+
+
+void UriSchemeServiceTestAppView::inputSpecialCharacter(bool checked)
+{
+ Q_UNUSED(checked)
+
+ QString textBeforeTapCharInsertion = m_lineEdit->text();
+
+ QString tapCharacter = "";
+ if (m_multitapTimer.elapsed() <= KMultitapTimeInMs) {
+ m_multitapIndex = ++m_multitapIndex % m_multitapCount;
+ textBeforeTapCharInsertion.chop(1);
+ } else {
+ m_multitapIndex = 0;
+ }
+
+ int key = m_multitapCharacters.at(m_multitapIndex);
+ tapCharacter = m_extraChar.value(key);
+
+ QString textAfterTapCharInsertion =
+ textBeforeTapCharInsertion + tapCharacter;
+ m_lineEdit->setText(textAfterTapCharInsertion);
+
+ m_multitapTimer.start();
+}
+
+
+void UriSchemeServiceTestAppView::setupTelUriConfiguration(int state)
+{
+ if (Qt::Checked == state) {
+ m_uriLabel->setPlainText(KTelUriSchemePrefix);
+
+ disconnect(
+ m_ctiUriCheckBox, SIGNAL(stateChanged(int)),
+ this, SLOT(setupCtiUriConfiguration(int)));
+ m_ctiUriCheckBox->setChecked(false);
+ connect(
+ m_ctiUriCheckBox, SIGNAL(stateChanged(int)),
+ this, SLOT(setupCtiUriConfiguration(int)));
+
+ m_multitapIndex = 0;
+ m_multitapCount = KNumOfTelMultitapCharacters;
+ m_multitapCharacters.clear();
+ m_multitapCharacters.append(Qt::Key_Asterisk);
+ m_multitapCharacters.append(Qt::Key_NumberSign);
+ m_multitapCharacters.append(Qt::Key_P);
+ m_multitapCharacters.append(Qt::Key_W);
+ } else {
+ m_uriLabel->setPlainText("");
+ }
+}
+
+
+void UriSchemeServiceTestAppView::setupCtiUriConfiguration(int state)
+{
+ if (Qt::Checked == state) {
+ m_uriLabel->setPlainText(KCtiUriSchemePrefix);
+
+ disconnect(
+ m_telUriCheckBox, SIGNAL(stateChanged(int)),
+ this, SLOT(setupTelUriConfiguration(int)));
+ m_telUriCheckBox->setChecked(false);
+ connect(
+ m_telUriCheckBox, SIGNAL(stateChanged(int)),
+ this, SLOT(setupTelUriConfiguration(int)));
+
+ m_multitapIndex = 0;
+ m_multitapCount = KNumOfCtiMultitapCharacters;
+ m_multitapCharacters.clear();
+ m_multitapCharacters.append(Qt::Key_Comma);
+ m_multitapCharacters.append(Qt::Key_Slash);
+ } else {
+ m_uriLabel->setPlainText("");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phoneservices/tsrc/urischemeservicetestapp/urischemeservicetestappview.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,59 @@
+/*!
+* 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:
+*
+*/
+
+#ifndef URISCHEMESERVICETESTAPPVIEW_H
+#define URISCHEMESERVICETESTAPPVIEW_H
+
+#include <QTime>
+#include <QMap>
+#include <HbView>
+
+class HbMainWindow;
+class HbLineEdit;
+class HbCheckBox;
+class HbLabel;
+
+class UriSchemeServiceTestAppView : public HbView
+{
+ Q_OBJECT
+
+public:
+ UriSchemeServiceTestAppView(HbMainWindow& mainWindow);
+ ~UriSchemeServiceTestAppView();
+
+private slots:
+ void makeCall(bool checked = false);
+ void clearInputField(bool checked = false);
+ void inputSpecialCharacter(bool checked);
+ void setupTelUriConfiguration(int state);
+ void setupCtiUriConfiguration(int state);
+
+private:
+ HbMainWindow& m_mainWindow;
+ HbLineEdit *m_lineEdit;
+ HbCheckBox *m_telUriCheckBox;
+ HbCheckBox *m_ctiUriCheckBox;
+ HbLabel *m_uriLabel;
+
+ QTime m_multitapTimer;
+ int m_multitapIndex;
+ int m_multitapCount;
+ QMap<int, QChar> m_extraChar;
+ QList<int> m_multitapCharacters;
+};
+
+#endif // URISCHEMESERVICETESTAPPVIEW_H
--- a/phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -18,8 +18,20 @@
#include <QtTest/QtTest>
//#include <hbglobal_p.h>
+#include <featmgr.h>
+#include <settingsinternalcrkeys.h>
+#include <xqsettingsmanager.h>
#include "dialservice.h"
+bool m_featureManagerReturnValue;
+int m_featureManagerRequestedFeatureSupport;
+
+TBool FeatureManager::FeatureSupported(TInt aFeature)
+{
+ m_featureManagerRequestedFeatureSupport = aFeature;
+ return m_featureManagerReturnValue;
+}
+
class TestDialService : public QObject, public MPECallControlIF, public MPECallSettersIF
{
Q_OBJECT
@@ -47,6 +59,7 @@
void testDial ();
void testDial2 ();
void testDial3();
+ void testDialWithJapanPrefixOn();
void testDialVideo ();
void testDialVideo2 ();
void testDialVoip();
@@ -102,6 +115,8 @@
m_handleEndDTMFCalled = false;
m_handlePlayDTMFLCalled = false;
m_setKeyCodeCalled = false;
+ m_featureManagerReturnValue = false;
+ m_featureManagerRequestedFeatureSupport = -1;
keyValue = -1;
m_DialService = new DialService (*this, *this, this);
}
@@ -193,6 +208,24 @@
QCOMPARE(_number, QString("+3580501234567"));
}
+void TestDialService::testDialWithJapanPrefixOn()
+{
+ XQSettingsKey dialPrefixMode(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixChangeMode);
+ XQSettingsKey dialPrefixString(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixText);
+ XQSettingsManager setManager;
+ int err = setManager.writeItemValue(dialPrefixString, QString("00"));
+ qDebug() << err;
+ qDebug() << setManager.error();
+ setManager.writeItemValue(dialPrefixMode, 1);
+ m_featureManagerReturnValue = true;
+
+ m_DialService->dial(QString("+358501234567"));
+ QString number((QChar*)m_phoneNumber.Ptr(), m_phoneNumber.Length());
+ QCOMPARE(m_featureManagerRequestedFeatureSupport, KFeatureIdJapanPrefixChange);
+ QVERIFY(m_setPhoneNumberCalled == true);
+ QCOMPARE(number, QString("00358501234567"));
+}
+
void TestDialService::testDialVideo()
{
m_DialService->dialVideo(QString("0501234567"));
--- a/phoneengine/phoneservices/tsrc/ut_phoneservices/ut_phoneservices.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_phoneservices/ut_phoneservices.pro Fri Jul 09 15:40:55 2010 +0300
@@ -45,10 +45,6 @@
HEADERS += ../../inc/phoneservices.h
HEADERS += ../../inc/dialservice.h
HEADERS += ../../inc/dtmfservice.h
-HEADERS += ../../inc/dialservicedepricated.h
-HEADERS += ../../inc/dtmfservicedepricated.h
HEADERS += ../../inc/urischemehandlerservice.h
SOURCES += ../../src/phoneservices.cpp
-SOURCES += ../../src/dialservicedepricated.cpp
-SOURCES += ../../src/dtmfservicedepricated.cpp
SOURCES += unit_tests.cpp
--- a/phoneplugins/csplugin/inc/cspcall.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspcall.h Fri Jul 09 15:40:55 2010 +0300
@@ -777,6 +777,12 @@
*/
HBufC* iUserToUserInformation;
+ /**
+ * Allocate CallInfo into heap since it could be
+ * too big fit to stack.
+ */
+ RMobileCall::TMobileCallInfoV3 iEtelCallInfo;
+
friend class UT_CSPCall;
friend class MT_CConvergedCallProvider;
--- a/phoneplugins/csplugin/inc/cspconferencecall.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/inc/cspconferencecall.h Fri Jul 09 15:40:55 2010 +0300
@@ -311,6 +311,11 @@
*/
TName iAddedCallName;
+ /**
+ * Allocate CallInfo into heap since it could be
+ * too big fit to stack.
+ */
+ RMobileCall::TMobileCallInfoV3 iEtelCallInfo;
};
-#endif // CSPCONFERENCECALL_H
\ No newline at end of file
+#endif // CSPCONFERENCECALL_H
--- a/phoneplugins/csplugin/src/cspcall.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/src/cspcall.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -1011,12 +1011,11 @@
CSPLOGSTRING(CSPREQIN, "CSPCall::IsCallForwarded <");
TBool ret( EFalse );
TInt err( KErrNone );
- RMobileCall::TMobileCallInfoV3 callInfo;
- RMobileCall::TMobileCallInfoV3Pckg pck( callInfo );
+ RMobileCall::TMobileCallInfoV3Pckg pck( iEtelCallInfo );
err = iCall.GetMobileCallInfo( pck );
if (err == KErrNone )
{
- ret = callInfo.iForwarded;
+ ret = iEtelCallInfo.iForwarded;
}
CSPLOGSTRING2(CSPREQIN,
@@ -1390,18 +1389,15 @@
// TSY does not send notification so number must be fetched.
if ( IsMobileOriginated() )
{
- RMobileCall::TMobileCallInfoV3 callInfo;
- RMobileCall::TMobileCallInfoV3Pckg callInfoPckg( callInfo );
-
- GetMobileCallInfo( callInfoPckg );
- callInfo = callInfoPckg();
-
- if ( callInfo.iRemoteParty.iRemoteNumber.iTelNumber.Length() )
- {
+ RMobileCall::TMobileCallInfoV3Pckg callInfoPckg( iEtelCallInfo );
+ GetMobileCallInfo( callInfoPckg );
+ if ( iEtelCallInfo.iRemoteParty.iRemoteNumber.iTelNumber.Length() )
+ {
NotifyRemotePartyInfoChanged( KNullDesC(),
- callInfo.iRemoteParty.iRemoteNumber.iTelNumber);
+ iEtelCallInfo.iRemoteParty.iRemoteNumber.iTelNumber);
}
}
+
}
@@ -1766,41 +1762,40 @@
CSPLOGSTRING2(CSPINT, "CSPCall::ExitCodeError < this: %x",
this );
TInt callError;
- RMobileCall::TMobileCallInfoV3 callInfo;
- RMobileCall::TMobileCallInfoV3Pckg pck( callInfo );
+ RMobileCall::TMobileCallInfoV3Pckg pck( iEtelCallInfo );
TInt getErr = iCall.GetMobileCallInfo( pck );
// Is there value in higher 16 bits
- if ( KErrNone == getErr && (callInfo.iExitCode & 0xFFFF0000) )
+ if ( KErrNone == getErr && (iEtelCallInfo.iExitCode & 0xFFFF0000) )
{
CSPLOGSTRING2(CSPINT, "CSPCall::ExitCodeError callInfo.iExitCode %d",
- callInfo.iExitCode );
- callError = ( callInfo.iExitCode >> KTimesToSplitValue );
+ iEtelCallInfo.iExitCode );
+ callError = ( iEtelCallInfo.iExitCode >> KTimesToSplitValue );
if ( callError > KErrEtelGsmBase )
// Not in valid exteded range
{
// Ignore invalid extented code
- if ( ( callInfo.iExitCode & 0x0000FFFF ) == KErrNone )
+ if ( ( iEtelCallInfo.iExitCode & 0x0000FFFF ) == KErrNone )
// core error is zero
{
callError = KErrNone;
}
else
{
- callError = ( ( callInfo.iExitCode & 0x0000FFFF )
+ callError = ( ( iEtelCallInfo.iExitCode & 0x0000FFFF )
| 0xFFFF0000 );
}
}
}
// Higher and lower 16 bits are zero
- else if ( !( callInfo.iExitCode & 0xFFFFFFFF ) )
+ else if ( !( iEtelCallInfo.iExitCode & 0xFFFFFFFF ) )
{
callError = KErrNone;
}
else
{
// No extended error, expand value to full range
- callError = ( callInfo.iExitCode | 0xFFFF0000 );
+ callError = ( iEtelCallInfo.iExitCode | 0xFFFF0000 );
}
CSPLOGSTRING2(CSPINT, "CSPCall::ExitCodeError > err: %d", callError);
--- a/phoneplugins/csplugin/src/cspconferencecall.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/src/cspconferencecall.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -469,8 +469,7 @@
aCallArray.Reset();
TInt err( KErrNone );
- RMobileCall::TMobileCallInfoV3 callInfo;
- RMobileCall::TMobileCallInfoV3Pckg callInfoPck( callInfo );
+ RMobileCall::TMobileCallInfoV3Pckg callInfoPck( iEtelCallInfo );
TInt callCount = CallCount();
CSPCall* call;
@@ -483,7 +482,7 @@
if ( KErrNone == err )
{
// Find call by call name
- call = iCallInfo.FindCall( callInfo.iCallName);
+ call = iCallInfo.FindCall( iEtelCallInfo.iCallName);
if ( call )
{
err = aCallArray.Append( call );
@@ -495,6 +494,7 @@
}
CSPLOGSTRING2( CSPERROR, "CSPConferenceCall::GetCallArray err: %d", err );
}
+
CSPLOGSTRING( CSPREQOUT, "CSPConferenceCall::GetCallArray end");
return err;
@@ -508,7 +508,7 @@
{
if ( iObservers.Find( &aObserver ) == KErrNotFound )
{
- iObservers.Append( &aObserver );
+ iObservers.AppendL( &aObserver );
}
}
--- a/phoneplugins/csplugin/src/cspdtmfprovider.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/src/cspdtmfprovider.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -156,7 +156,7 @@
{
if ( iObservers.Find( &aObserver ) == KErrNotFound )
{
- iObservers.Append( &aObserver );
+ iObservers.AppendL( &aObserver );
}
}
--- a/phoneplugins/csplugin/src/cspforwardprovider.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/src/cspforwardprovider.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -97,7 +97,7 @@
{
if ( iObservers.Find( &aObserver ) == KErrNotFound )
{
- iObservers.Append( &aObserver );
+ iObservers.AppendL( &aObserver );
}
}
--- a/phoneplugins/csplugin/src/csptransferprovider.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/csplugin/src/csptransferprovider.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -182,7 +182,7 @@
{
if ( iObservers.Find( &aObserver ) == KErrNotFound )
{
- iObservers.Append( &aObserver );
+ iObservers.AppendL( &aObserver );
}
}
--- a/phoneplugins/dialerwidgetplugin/dialerwidgetplugin.pri Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/dialerwidgetplugin.pri Fri Jul 09 15:40:55 2010 +0300
@@ -38,10 +38,8 @@
qtplugins.path = $$PLUGIN_SUBDIR
qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
- message(Remove "contains(MOBILITY, serviceframework)" after the QtSF refactorig is done!)
-
!contains(MOBILITY, serviceframework):qtplugins.sources += resource/$${TARGET}.manifest
- contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.s60xml z:$$qtplugins.path/$${TARGET}.xml"
+ contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.xml z:$$qtplugins.path/$${TARGET}.xml"
for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)"
}
\ No newline at end of file
--- a/phoneplugins/dialerwidgetplugin/dialerwidgetplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/dialerwidgetplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -12,9 +12,13 @@
CONFIG += plugin \
hb \
mobility
+HB += hbfeedback
MOBILITY = serviceframework
+
win32:PLUGIN_SUBDIR = /hsresources/import/widgetregistry/20022F44
symbian:PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F44
+TARGET_DIR = /private/20022F35/import/widgetregistry/20022F7E
+
LIBS += -lhswidgetmodel
DEPENDPATH += ./inc \
./src
@@ -35,6 +39,12 @@
BLD_INF_RULES.prj_exports += \
"$${LITERAL_HASH}include <platform_paths.hrh>" \
"./rom/dialerwidgetplugin.iby CORE_APP_LAYER_IBY_EXPORT_PATH(dialerwidgetplugin.iby)"
+
+ TARGET_DIR = /private/20022F35/import/widgetregistry/20022F44
+ widgetResources.path = $${TARGET_DIR}
+ widgetResources.sources += resource/$${TARGET}.xml
+ widgetResources.sources += resource/$${TARGET}.manifest
+ DEPLOYMENT += widgetResources
}
OUTPUT_DIR = $$PWD/bin
SOURCE_DIR = $$PWD/inc
@@ -52,6 +62,4 @@
plugin:!isEmpty(PLUGIN_SUBDIR):DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR
include(dialerwidgetplugin.pri)
exportResources(./resource/*.manifest, $$PLUGIN_SUBDIR)
-exportResources(./resource/*.svg, $$PLUGIN_SUBDIR)
-exportResources(./resource/*.png, $$PLUGIN_SUBDIR)
RESOURCES += dialerwidgetpluging.qrc
--- a/phoneplugins/dialerwidgetplugin/inc/dialerwidget.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/inc/dialerwidget.h Fri Jul 09 15:40:55 2010 +0300
@@ -67,7 +67,7 @@
void error();
protected:
- void mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) }
+ void mousePressEvent(QGraphicsSceneMouseEvent *event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
StartResult onStart();
StopResult onStop();
--- a/phoneplugins/dialerwidgetplugin/resource/dialerwidgetplugin.manifest Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/resource/dialerwidgetplugin.manifest Fri Jul 09 15:40:55 2010 +0300
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<widgetprovider>
- <widget library="dialerwidgetplugin"
- uri="dialerwidgetplugin"
- title="txt_long_caption_dialer"
- iconuri="qtg_graf_hs_dialer.svg"
- description="txt_dial_dblist_val_dialer_enable_access_to_recent"/>
-</widgetprovider>
+<hswidgetmanifest>
+ <uri>dialerwidgetplugin</uri>
+ <title>txt_long_caption_dialer</title>
+ <description>txt_dial_dblist_val_dialer_enable_access_to_recent</description>
+ <icon>qtg_large_dialer</icon>
+ <previewimage>qtg_large_dialer</previewimage>
+ <hidden>false</hidden>
+ <servicexml>dialerwidgetplugin.xml</servicexml>
+ <translationfile>dialer</translationfile>
+</hswidgetmanifest>
--- a/phoneplugins/dialerwidgetplugin/resource/dialerwidgetplugin.s60xml Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
- <name>dialerwidgetplugin</name>
- <filepath>dialerwidgetplugin</filepath>
- <description>Dialer widget</description>
- <interface>
- <name>com.nokia.symbian.IHomeScreenWidget</name>
- <version>1.0</version>
- <description>The dialer widget displays dialing menu</description>
- <capabilities></capabilities>
- <customproperty key="iconuri">qtg_graf_hs_dialer.svg</customproperty>
- <customproperty key="title">Dialer</customproperty>
- </interface>
-</service>
--- a/phoneplugins/dialerwidgetplugin/resource/dialerwidgetplugin.xml Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/resource/dialerwidgetplugin.xml Fri Jul 09 15:40:55 2010 +0300
@@ -8,7 +8,5 @@
<version>1.0</version>
<description>The dialer widget displays dialing menu</description>
<capabilities></capabilities>
- <customproperty key="iconuri">qtg_graf_hs_dialer.svg</customproperty>
- <customproperty key="title">Dialer</customproperty>
</interface>
</service>
--- a/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -22,6 +22,7 @@
#include <HbIconItem>
#include <HbTextItem>
#include <HbTouchArea>
+#include <HbInstantFeedback>
#include "dialerwidgetengine.h"
#include "dialerwidget.h"
#include "qtphonelog.h"
@@ -38,8 +39,8 @@
namespace
{
- const char KDialerWidgetIcon[] = ":/icons/resource/qtg_graf_hs_dialer";
- const char KMissedCallShortcutBadge[] = ":/icons/resource/qtg_fr_shortcut_badge_bg";
+ const char KDialerWidgetIcon[] = "qtg_graf_hs_dialer_normal";
+ const char KMissedCallShortcutBadge[] = "qtg_fr_shortcut_badge_bg";
const char KDialerWidgetWidgetml[] = ":/data/resource/dialerwidget.widgetml";
const char KDialerWidgetCss[] = ":/data/resource/dialerwidget.css";
}
@@ -194,6 +195,13 @@
}
}
+void DialerWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+ PHONE_TRACE;
+ Q_UNUSED(event)
+ HbInstantFeedback::play(HbFeedback::Basic);
+}
+
/*!
\fn void DialerWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
@@ -201,7 +209,8 @@
\sa startDialer()
*/
void DialerWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
-{
+{
+ PHONE_TRACE;
Q_UNUSED(event);
startDialer();
}
@@ -229,7 +238,7 @@
// Background
if (!m_background) {
HbFrameDrawer *drawer = new HbFrameDrawer(
- KDialerWidgetIcon, HbFrameDrawer::OnePiece);
+ KDialerWidgetIcon, HbFrameDrawer::OnePiece);
m_background = new HbFrameItem(drawer, this);
style()->setItemName(m_background, /*QLatin1String(*/"background"/*)*/);
m_background->moveBy(0,10);
@@ -239,7 +248,7 @@
// Badge background
if (!m_badgeBackground) {
HbFrameDrawer *badgedrawer = new HbFrameDrawer(
- KMissedCallShortcutBadge, HbFrameDrawer::ThreePiecesHorizontal);
+ KMissedCallShortcutBadge, HbFrameDrawer::ThreePiecesHorizontal);
m_badgeBackground = new HbFrameItem(badgedrawer, this);
style()->setItemName(m_background, QLatin1String("badgeBackground"));
m_badgeBackground->resize(20,20);
--- a/phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h Fri Jul 09 15:40:55 2010 +0300
@@ -133,19 +133,15 @@
private:
Q_DISABLE_COPY(InfoWidget)
- // Engine for widget, owned
+ // Guarded objects, owned
QScopedPointer<InfoWidgetEngine> m_engine;
-
- // Widget preference store, owned
QScopedPointer<InfoWidgetPreferences> m_preferences;
-
- // Layout manager for widget, owned
QScopedPointer<InfoWidgetLayoutManager> m_layoutManager;
// Translators, owned
QList<QTranslator *> m_translators;
- // Current widget layout, not owned
+ // Widget main layout, not owned
QGraphicsLinearLayout *m_layout;
// Currently animating item(s), not owned
--- a/phoneplugins/infowidgetplugin/infowidget/inc/infowidgetengine.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/inc/infowidgetengine.h Fri Jul 09 15:40:55 2010 +0300
@@ -33,7 +33,6 @@
Q_OBJECT
public:
-
enum HandlerEntity {
NotDefined = 0,
NetworkHandler,
--- a/phoneplugins/infowidgetplugin/infowidget/inc/infowidgetlayoutmanager.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/inc/infowidgetlayoutmanager.h Fri Jul 09 15:40:55 2010 +0300
@@ -91,17 +91,13 @@
DisplayRole currentDisplayRole();
QList<LayoutItemRole> currentWidgetRoles();
- QGraphicsLayout* layoutInfoDisplay();
- QGraphicsLayout* layoutSettingsDialog();
+ QGraphicsWidget* layoutInfoDisplay();
+ QGraphicsWidget* layoutSettingsDialog();
const QList<InfoWidgetLayoutManager::LayoutItemRole> widgetRoles(
DisplayRole displayRole) const;
- bool loadWidgets(const DisplayRole displayRole,
- const QList<LayoutItemRole> &displayWidgets,
- QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap);
- bool reloadWidgets(const DisplayRole displayRole);
-
+ bool loadWidgets(const DisplayRole displayRole);
QGraphicsWidget* loadWidget(InfoWidgetDocumentLoader &loader,
DisplayRole displayRole,
LayoutItemRole widgetRole);
@@ -119,21 +115,24 @@
bool deleteLater = false);
void destroyWidgets();
- int layoutRows() const;
- void setLayoutRows(int rows);
-
qreal layoutRowHeight();
bool textFitsToRect(QString text, QFont font, QRectF rect) const;
+protected:
+ bool loadWidgets(const DisplayRole displayRole,
+ const QList<LayoutItemRole> &displayWidgets,
+ QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap);
+
+
private:
QMap<LayoutItemRole, QGraphicsWidget *> m_widgets;
QMap<LayoutItemRole, QGraphicsWidget *> m_infoDisplayWidgets;
QMap<LayoutItemRole, QGraphicsWidget *> m_settingsDialogWidgets;
QMap<LayoutItemRole, QObject *> m_objects;
- InfoWidgetDocumentLoader *m_documentLoader;
+ QScopedPointer<InfoWidgetDocumentLoader> m_documentLoader;
+
DisplayRole m_displayRole;
- int m_layoutRows;
qreal m_cachedLayoutRowHeight;
};
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidget.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidget.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -47,8 +47,6 @@
Implements HomeScreen specific slots and
graphical representation of the
Operator Info widget.
-
- Derived from HbWidget.
*/
@@ -81,7 +79,6 @@
// Localization file loading
installTranslator(TS_FILE_OPERATOR_WIDGET);
- installTranslator(TS_FILE_COMMON);
// Create layout & child-widget manager
m_layoutManager.reset(new InfoWidgetLayoutManager);
@@ -214,7 +211,6 @@
void InfoWidget::timerEvent(QTimerEvent *event)
{
Q_UNUSED(event);
-
if (m_animationState == AnimationStarting) {
// Execute delayed start of marquee animation
if (m_animatingItem) {
@@ -299,8 +295,6 @@
m_backgroundFrameItem->resize(requiredSize);
}
}
-
- DPRINT << ": returning size: " << requiredSize;
return requiredSize;
}
@@ -321,38 +315,23 @@
void InfoWidget::updateItemsVisibility()
{
DPRINT;
- int layoutRows = 0;
-
- // Update layout according to item visibility settings
if (m_preferences->preference(InfoWidgetPreferences::DisplaySpn).compare(
- DISPLAY_SETTING_ON) == 0) {
- layoutRows++;
- } else {
+ DISPLAY_SETTING_OFF) == 0) {
m_layoutManager->removeWidget(InfoWidgetLayoutManager::RoleSpnMarqueeItem);
m_layoutManager->removeWidget(InfoWidgetLayoutManager::RoleSpnIcon);
}
-
+
if (m_preferences->preference(InfoWidgetPreferences::DisplayMcn).compare(
- DISPLAY_SETTING_ON) == 0) {
- layoutRows++;
- } else {
+ DISPLAY_SETTING_OFF) == 0) {
m_layoutManager->removeWidget(InfoWidgetLayoutManager::RoleMcnMarqueeItem);
m_layoutManager->removeWidget(InfoWidgetLayoutManager::RoleMcnIcon);
}
if (m_preferences->preference(InfoWidgetPreferences::DisplaySatText).compare(
- DISPLAY_SETTING_ON) == 0) {
- layoutRows++;
- } else {
+ DISPLAY_SETTING_OFF) == 0) {
m_layoutManager->removeWidget(InfoWidgetLayoutManager::RoleSatMarqueeItem);
m_layoutManager->removeWidget(InfoWidgetLayoutManager::RoleSatTextIcon);
}
-
- if (m_animatingItems.count() == 0) {
- m_animatingItem = NULL;
- }
-
- m_layoutManager->setLayoutRows(layoutRows);
}
/*!
@@ -361,17 +340,12 @@
void InfoWidget::layoutInfoDisplay()
{
DPRINT;
- QGraphicsLayout *infoDisplayLayout =
+ QGraphicsWidget *infoDisplay =
m_layoutManager->layoutInfoDisplay();
-
- if (!m_layout->count()) {
- QGraphicsWidget *contentWidget =
- m_layoutManager->contentWidget();
- if (contentWidget) {
- // Add content widget to main layout
- m_layout->addItem(contentWidget);
+ if ((!m_layout->count()) && infoDisplay) {
+ m_layout->addItem(infoDisplay);
}
- }
+
updateItemsVisibility();
endChanges();
}
@@ -383,24 +357,17 @@
{
DPRINT;
startChanges();
-
- m_layoutManager->reloadWidgets(InfoWidgetLayoutManager::SettingsDialog);
- QGraphicsLayout *settingDialogLayout =
- m_layoutManager->layoutSettingsDialog();
-
- if (settingDialogLayout) {
- HbDialog *settingsDialog = qobject_cast<HbDialog *>(
- m_layoutManager->getWidget(InfoWidgetLayoutManager::
- RoleSettingsDialog));
+ HbDialog *settingsDialog =
+ qobject_cast<HbDialog *>(
+ m_layoutManager->layoutSettingsDialog());
- if (settingsDialog) {
- initializeSettingsDialogItems();
- settingsDialog->setDismissPolicy(HbDialog::NoDismiss);
- settingsDialog->setTimeout(HbDialog::NoTimeout);
- settingsDialog->open(this,
- SLOT(settingsDialogClosed(HbAction *)));
- }
- }
+ if (settingsDialog) {
+ initializeSettingsDialogItems();
+ settingsDialog->setDismissPolicy(HbDialog::NoDismiss);
+ settingsDialog->setTimeout(HbDialog::NoTimeout);
+ settingsDialog->open(this,
+ SLOT(settingsDialogClosed(HbAction *)));
+ }
}
/*!
@@ -459,7 +426,6 @@
DPRINT;
HbMarqueeItem *marqueeItem = qobject_cast<HbMarqueeItem *>(
m_layoutManager->getWidget(itemRole));
-
if (marqueeItem) {
marqueeItem->setText(text);
marqueeItem->setTextColor( HbColorScheme::color(
@@ -797,7 +763,6 @@
void InfoWidget::settingsEditingFinished()
{
DPRINT;
-
if (m_preferences->validate()) {
// Signal HS framework to store Meta-object
@@ -809,7 +774,7 @@
// Visible item configuration changed, reload
// widgets. Restores deleted items.
- m_layoutManager->reloadWidgets(
+ m_layoutManager->loadWidgets(
InfoWidgetLayoutManager::InfoDisplay);
m_layoutManager->removeWidget(
InfoWidgetLayoutManager::RoleSettingsDialog,
@@ -834,7 +799,7 @@
DPRINT;
m_preferences->restorePreferences();
- m_layoutManager->reloadWidgets(
+ m_layoutManager->loadWidgets(
InfoWidgetLayoutManager::InfoDisplay);
m_layoutManager->removeWidget(
InfoWidgetLayoutManager::RoleSettingsDialog,
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidgetengine.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidgetengine.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -30,7 +30,7 @@
/*!
- InfoWidgetEngine::InfoWidgetEngine
+ Constructor.
*/
InfoWidgetEngine::InfoWidgetEngine(QObject *parent):
QObject(parent),
@@ -63,7 +63,7 @@
}
/*!
- InfoWidgetEngine::~InfoWidgetEngine
+ Destructor.
*/
InfoWidgetEngine::~InfoWidgetEngine()
{
@@ -71,8 +71,6 @@
}
/*!
- InfoWidgetEngine::modelData
-
Getter for model data.
*/
const InfoWidgetEngine::ModelData& InfoWidgetEngine::modelData() const
@@ -82,12 +80,11 @@
}
/*!
- InfoWidgetEngine::updateNetworkDataToModel
-
Updates Network Handler's network data to model.
*/
void InfoWidgetEngine::updateNetworkDataToModel()
{
+ DPRINT;
if (m_networkHandler->isOnline()) {
DPRINT << ": online, update data";
m_modelData.setServiceProviderName(
@@ -110,15 +107,10 @@
m_modelData.setMcnName("");
m_modelData.setHomeZoneTextTag("");
}
-
emit modelChanged();
-
- DPRINT << ": OUT";
}
/*!
- InfoWidgetEngine::updateSatDataToModel
-
Updates SAT handler's SAT data to model.
*/
void InfoWidgetEngine::updateSatDataToModel()
@@ -133,7 +125,7 @@
}
/*!
- InfoWidgetEngine::updateLineDataToModel
+ Updates line handler's data to model.
*/
void InfoWidgetEngine::updateLineDataToModel()
{
@@ -141,7 +133,7 @@
}
/*!
- InfoWidgetEngine::handleNetworkError
+ Network error handler.
*/
void InfoWidgetEngine::handleNetworkError(
int operation, int errorCode)
@@ -151,7 +143,7 @@
}
/*!
- InfoWidgetEngine::handleSatError
+ SAT error handler.
*/
void InfoWidgetEngine::handleSatError(
int operation, int errorCode)
@@ -161,7 +153,7 @@
}
/*!
- InfoWidgetEngine::handleLineError
+ Line error handler.
*/
void InfoWidgetEngine::handleLineError(
int operation, int errorCode)
@@ -182,7 +174,6 @@
} else {
m_networkHandler->disableMcn();
}
-
if (options.testFlag(InfoWidgetPreferences::DisplaySatText)){
m_satHandler->connect(true);
} else {
@@ -191,8 +182,6 @@
}
/*!
- InfoWidgetEngine::suspend
-
Called when widget is deactivated
and widget should suspend all
possible activities
@@ -204,8 +193,6 @@
}
/*!
- InfoWidgetEngine::preferenceChanged
-
Called when widget is activated
and widget can resume activities
*/
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidgetlayoutmanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidgetlayoutmanager.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -90,25 +90,10 @@
: QObject(parent),
m_documentLoader(NULL),
m_displayRole(InfoDisplay),
- m_layoutRows(0),
m_cachedLayoutRowHeight(0.0)
{
DPRINT;
- // Fill supported layout item roles for info display
- QList<LayoutItemRole> displayWidgetRoles = widgetRoles(InfoDisplay);
-
- // Try to load all widgets in list by widget role
- bool loadResult = loadWidgets(InfoDisplay,
- displayWidgetRoles,
- m_infoDisplayWidgets);
-
- // Fill supported layout item roles for settings display
- displayWidgetRoles = widgetRoles(SettingsDialog);
-
- // Try to load all widgets in list by widget role
- loadResult = loadWidgets(SettingsDialog,
- displayWidgetRoles,
- m_settingsDialogWidgets);
+ m_documentLoader.reset(new InfoWidgetDocumentLoader);
}
/*!
@@ -117,9 +102,6 @@
InfoWidgetLayoutManager::~InfoWidgetLayoutManager()
{
DPRINT;
- if (m_documentLoader) {
- delete m_documentLoader;
- }
}
/*!
@@ -154,24 +136,6 @@
}
/*!
- Returns count of layout rows.
-*/
-int InfoWidgetLayoutManager::layoutRows() const
-{
- DPRINT;
- return m_layoutRows;
-}
-
-/*!
- Set count of layout rows.
-*/
-void InfoWidgetLayoutManager::setLayoutRows(int rows)
-{
- DPRINT;
- m_layoutRows = rows;
-}
-
-/*!
Read row height from style.
*/
qreal InfoWidgetLayoutManager::layoutRowHeight()
@@ -183,7 +147,7 @@
m_cachedLayoutRowHeight);
DPRINT << ": row height from style: " << m_cachedLayoutRowHeight;
if (!ok) {
- DWARNING << ": Error, paremeters reading failed!!";
+ DWARNING << ": Error, paremeters reading failed!";
}
}
return m_cachedLayoutRowHeight;
@@ -195,6 +159,7 @@
bool InfoWidgetLayoutManager::textFitsToRect(QString text,
QFont font, QRectF rect) const
{
+ DPRINT;
bool fits(true);
if (!rect.isEmpty()) {
QFontMetricsF metrics(font);
@@ -226,10 +191,10 @@
QList<HbMarqueeItem *> items;
QList<LayoutItemRole> marqueeItemRoles;
- marqueeItemRoles.append(RoleSpnMarqueeItem);
- marqueeItemRoles.append(RoleMcnMarqueeItem);
- marqueeItemRoles.append(RoleSatMarqueeItem);
-
+ marqueeItemRoles.append(RoleSpnMarqueeItem);
+ marqueeItemRoles.append(RoleMcnMarqueeItem);
+ marqueeItemRoles.append(RoleSatMarqueeItem);
+
foreach (LayoutItemRole role, marqueeItemRoles) {
QGraphicsWidget *widget = getWidget(role);
if (widget) {
@@ -249,8 +214,7 @@
*/
QGraphicsWidget* InfoWidgetLayoutManager::getWidget(LayoutItemRole itemRole)
{
- QGraphicsWidget *widget = m_widgets.value(itemRole);
- return widget;
+ return m_widgets.value(itemRole);
}
/*!
@@ -258,8 +222,7 @@
*/
QObject* InfoWidgetLayoutManager::getObject(LayoutItemRole itemRole)
{
- QObject *object = m_objects.value(itemRole);
- return object;
+ return m_objects.value(itemRole);
}
/*!
@@ -277,7 +240,6 @@
widget->deleteLater();
}
}
-
m_widgets.remove(itemRole);
m_infoDisplayWidgets.remove(itemRole);
m_settingsDialogWidgets.remove(itemRole);
@@ -286,48 +248,41 @@
/*!
Returns info display layout.
*/
-QGraphicsLayout* InfoWidgetLayoutManager::layoutInfoDisplay()
+QGraphicsWidget* InfoWidgetLayoutManager::layoutInfoDisplay()
{
DPRINT;
m_displayRole = InfoDisplay;
+
+ loadWidgets(InfoWidgetLayoutManager::InfoDisplay);
m_widgets = m_infoDisplayWidgets;
-
- QGraphicsLayout *activeLayout(NULL);
- QGraphicsWidget *content = getWidget(RoleContent);
- if (content) {
- DPRINT << ": content found, getting layout";
- activeLayout = content->layout();
- }
- return activeLayout;
+
+ QGraphicsWidget *infoDisplay = getWidget(RoleContent);
+ Q_ASSERT(infoDisplay);
+ return infoDisplay;
}
/*!
Returns settings dialog layout.
*/
-QGraphicsLayout* InfoWidgetLayoutManager::layoutSettingsDialog()
+QGraphicsWidget* InfoWidgetLayoutManager::layoutSettingsDialog()
{
DPRINT;
m_displayRole = SettingsDialog;
+ loadWidgets(InfoWidgetLayoutManager::SettingsDialog);
m_widgets = m_settingsDialogWidgets;
- QGraphicsLayout *activeLayout(NULL);
- QGraphicsWidget *dialog = getWidget(RoleSettingsDialog);
- if (dialog) {
- activeLayout = dialog->layout();
-
- HbAction *okAction = qobject_cast<HbAction *>(
- getObject(RoleOkAction));
- if (okAction) {
- dialog->addAction(okAction);
- }
-
- HbAction *cancelAction = qobject_cast<HbAction *>(
- getObject(RoleCancelAction));
- if (cancelAction) {
- dialog->addAction(cancelAction);
- }
+ QGraphicsWidget *dialog = getWidget(RoleSettingsDialog);
+ Q_ASSERT(dialog);
+
+ HbAction *okAction = qobject_cast<HbAction *>(
+ getObject(RoleOkAction));
+ HbAction *cancelAction = qobject_cast<HbAction *>(
+ getObject(RoleCancelAction));
+ if (okAction && cancelAction) {
+ dialog->addAction(okAction);
+ dialog->addAction(cancelAction);
}
- return activeLayout;
+ return dialog;
}
/*!
@@ -343,11 +298,6 @@
// Cleanup previously loaded content in case of any data
widgetMap.clear();
- if (!m_documentLoader) {
- m_documentLoader = new InfoWidgetDocumentLoader;
- }
- Q_ASSERT(m_documentLoader);
-
bool loaded = true;
if (displayRole != SettingsDialog) {
m_documentLoader->load(INFOWIDGET_DOCML_FILE, &loaded);
@@ -359,7 +309,6 @@
"InfoWidgetLayoutManager",
"Invalid docml file");
-
foreach (LayoutItemRole role, displayWidgets) {
QGraphicsWidget *widget =
loadWidget(*m_documentLoader, displayRole, role);
@@ -394,15 +343,14 @@
}
/*!
- Restores widgets from layout document.
- Called when layout items have been deleted
- and items should be shown again.
+ Loads or restores widgets from layout document.
+ Called when layout items haven't been loaded yet, or
+ have been deleted and items should be shown again.
*/
-bool InfoWidgetLayoutManager::reloadWidgets(const DisplayRole displayRole)
+bool InfoWidgetLayoutManager::loadWidgets(const DisplayRole displayRole)
{
QList<LayoutItemRole> displayWidgetRoles = widgetRoles(displayRole);
bool loadResult(false);
-
switch (displayRole) {
case InfoDisplay:
loadResult = loadWidgets(displayRole,
@@ -483,8 +431,7 @@
break;
}
- QGraphicsWidget *widget = qobject_cast<QGraphicsWidget *>(
- loader.findWidget(widgetName));
+ QGraphicsWidget *widget = loader.findWidget(widgetName);
return widget;
}
@@ -518,7 +465,7 @@
break;
}
- QObject *object = qobject_cast<QObject *>(loader.findObject(objectName));
+ QObject *object = loader.findObject(objectName);
if (!object) {
DWARNING << ": ERROR, object not found!";
}
@@ -535,7 +482,6 @@
QList<LayoutItemRole> widgetRoles;
switch (displayRole) {
case InfoDisplay:
- // Fill supported layout item roles for info display
widgetRoles.append(RoleContent);
widgetRoles.append(RoleSpnIcon);
widgetRoles.append(RoleSpnMarqueeItem);
@@ -545,7 +491,6 @@
widgetRoles.append(RoleSatMarqueeItem);
break;
case SettingsDialog:
- // Fill supported layout item roles for settings display
widgetRoles.append(RoleSettingsDialog);
widgetRoles.append(RoleSettingsContainer);
widgetRoles.append(RoleSpnCheckBox);
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -65,14 +65,9 @@
DPRINT;
bool success(false);
if (!m_nwSession) {
- try {
- QT_TRAP_THROWING(m_nwSession.reset(
- CreateL(*this, m_nwInfo)));
- } catch (const std::exception& ex) {
- DCRITICAL << ": exception " << ex.what();
- }
-
- if (!m_nwSession.isNull()) {
+ QT_TRAP_THROWING(m_nwSession.reset(
+ CreateL(*this, m_nwInfo)));
+ if (m_nwSession) {
DPRINT << ": session created";
success = true;
}
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidgetsathandler_p.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidgetsathandler_p.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -135,7 +135,7 @@
&& !m_idleTxt.isEmpty()){
m_idleResult = RSatService::ESATIdleSuccess;
}else{
- // Got empty string, could be permanent problem as well
+ // Got empty string, could be permanent problem as well?
m_idleResult = RSatService::ESATIdleMeUnableToProcessCmd;
}
}
--- a/phoneplugins/infowidgetplugin/infowidgetplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidgetplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -26,8 +26,7 @@
RCC_DIR = rcc
symbian: {
-LIBS += -lhswidgetmodel \
- -lxqsettingsmanager \
+LIBS += -lxqsettingsmanager \
-lnetworkhandling \
-lsatclient
}
--- a/phoneplugins/infowidgetplugin/resource/infowidgetplugin.manifest Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/resource/infowidgetplugin.manifest Fri Jul 09 15:40:55 2010 +0300
@@ -6,4 +6,5 @@
<icon></icon>
<hidden>false</hidden>
<servicexml>infowidgetplugin.xml</servicexml>
+ <translationfile>operator_widget</translationfile>
</hswidgetmanifest>
--- a/phoneplugins/infowidgetplugin/resource/settingsdialog.docml Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/resource/settingsdialog.docml Fri Jul 09 15:40:55 2010 +0300
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="1.1">
<object name="sd:okAction" type="HbAction">
- <string name="role" value="HbWidget::addAction"/>
<string locid="txt_common_button_ok" name="text" value="Ok"/>
</object>
<object name="sd:cancelAction" type="HbAction">
- <string name="role" value="HbWidget::addAction"/>
<string locid="txt_common_button_cancel" name="text" value="Cancel"/>
</object>
<widget name="sd:settingsDialog" type="HbDialog">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbinstance.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,104 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "hbinstance.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbInstance::instance
+// -----------------------------------------------------------------------------
+//
+HbInstance * HbInstance::instance( )
+ {
+ SMC_MOCK_METHOD0( HbInstance * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::allMainWindows
+// -----------------------------------------------------------------------------
+//
+QList <HbMainWindow * > HbInstance::allMainWindows( ) const
+ {
+ SMC_MOCK_METHOD0( QList <HbMainWindow * > )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::style
+// -----------------------------------------------------------------------------
+//
+HbStyle * HbInstance::style( ) const
+ {
+ SMC_MOCK_METHOD0( HbStyle * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::theme
+// -----------------------------------------------------------------------------
+//
+HbTheme * HbInstance::theme( ) const
+ {
+ SMC_MOCK_METHOD0( HbTheme * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::addLibraryPath
+// -----------------------------------------------------------------------------
+//
+void HbInstance::addLibraryPath(
+ const QString & path )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, path )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::removeLibraryPath
+// -----------------------------------------------------------------------------
+//
+void HbInstance::removeLibraryPath(
+ const QString & path )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, path )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::libraryPaths
+// -----------------------------------------------------------------------------
+//
+QStringList HbInstance::libraryPaths( ) const
+ {
+ SMC_MOCK_METHOD0( QStringList )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbInstance::setLibraryPaths
+// -----------------------------------------------------------------------------
+//
+void HbInstance::setLibraryPaths(
+ const QStringList & paths )
+ {
+ SMC_MOCK_METHOD1( void, const QStringList &, paths )
+ }
+
+
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidgetlayoutmanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_infowidgetlayoutmanager.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -16,6 +16,8 @@
*/
#include <QDebug>
#include <QObject>
+#include <QGraphicsWidget>
+#include <QList>
#include <smcmockclassincludes.h>
#include "infowidgetlayoutmanager.h"
@@ -68,9 +70,9 @@
// InfoWidgetLayoutManager::layoutInfoDisplay
// -----------------------------------------------------------------------------
//
-QGraphicsLayout * InfoWidgetLayoutManager::layoutInfoDisplay( )
+QGraphicsWidget * InfoWidgetLayoutManager::layoutInfoDisplay( )
{
- SMC_MOCK_METHOD0( QGraphicsLayout * )
+ SMC_MOCK_METHOD0( QGraphicsWidget * )
}
@@ -78,9 +80,9 @@
// InfoWidgetLayoutManager::layoutSettingsDialog
// -----------------------------------------------------------------------------
//
-QGraphicsLayout * InfoWidgetLayoutManager::layoutSettingsDialog( )
+QGraphicsWidget * InfoWidgetLayoutManager::layoutSettingsDialog( )
{
- SMC_MOCK_METHOD0( QGraphicsLayout * )
+ SMC_MOCK_METHOD0( QGraphicsWidget * )
}
@@ -101,22 +103,7 @@
// InfoWidgetLayoutManager::loadWidgets
// -----------------------------------------------------------------------------
//
-bool InfoWidgetLayoutManager::loadWidgets(
- const DisplayRole displayRole,
- const QList<LayoutItemRole> &displayWidgets,
- QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap)
- {
- typedef QMap <LayoutItemRole, QGraphicsWidget *> & TYPE3;
- SMC_MOCK_METHOD3( bool, const DisplayRole, displayRole,
- const QList<LayoutItemRole> &, displayWidgets,
- TYPE3, widgetMap )
- }
-
-// -----------------------------------------------------------------------------
-// InfoWidgetLayoutManager::reloadWidgets
-// -----------------------------------------------------------------------------
-//
-bool InfoWidgetLayoutManager::reloadWidgets(
+bool InfoWidgetLayoutManager::loadWidgets(
const DisplayRole displayRole )
{
SMC_MOCK_METHOD1( bool, const DisplayRole, displayRole )
@@ -219,27 +206,6 @@
// -----------------------------------------------------------------------------
-// InfoWidgetLayoutManager::layoutRows
-// -----------------------------------------------------------------------------
-//
-int InfoWidgetLayoutManager::layoutRows( ) const
- {
- SMC_MOCK_METHOD0( int )
- }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetLayoutManager::setLayoutRows
-// -----------------------------------------------------------------------------
-//
-void InfoWidgetLayoutManager::setLayoutRows(
- int rows )
- {
- SMC_MOCK_METHOD1( void, int, rows )
- }
-
-
-// -----------------------------------------------------------------------------
// InfoWidgetLayoutManager::layoutRowHeight
// -----------------------------------------------------------------------------
//
@@ -265,6 +231,21 @@
// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::loadWidgets
+// -----------------------------------------------------------------------------
+//
+bool InfoWidgetLayoutManager::loadWidgets(
+ const DisplayRole displayRole,
+ const QList<LayoutItemRole> & displayWidgets,
+ QMap <LayoutItemRole,QGraphicsWidget *> & widgetMap )
+ {
+ //SMC_MOCK_METHOD3( bool, const DisplayRole, displayRole,
+ // const QList<LayoutItemRole> &, displayWidgets,
+ // QMap<LayoutItemRole,QGraphicsWidget *> &, widgetMap )
+ }
+
+
+// -----------------------------------------------------------------------------
// InfoWidgetDocumentLoader::createObject
// -----------------------------------------------------------------------------
//
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -41,13 +41,15 @@
const QString KSatText("satdisplaytesttext");
-// Stub
+// Stubbed functions
void QGraphicsWidget::resize(
const QSizeF & size )
{
Q_UNUSED(size);
}
-
+void QGraphicsWidget::updateGeometry()
+{
+}
/*!
UT_InfoWidget::UT_InfoWidget
@@ -387,6 +389,8 @@
.returns(true);
EXPECT(InfoWidgetLayoutManager::contentWidget)
.returns(contentWidget);
+ EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+ .returns(contentWidget);
m_infoWidget->onInitialize();
@@ -397,6 +401,8 @@
.returns(false);
EXPECT(InfoWidgetLayoutManager::contentWidget)
.returns(contentWidget);
+ EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+ .returns(contentWidget);
m_infoWidget->onInitialize();
}
@@ -539,8 +545,6 @@
EXPECT(InfoWidgetPreferences::preference)
.with(InfoWidgetPreferences::DisplaySatText)
.returns(KPreferenceOn);
- EXPECT(InfoWidgetLayoutManager::setLayoutRows)
- .with(3);
m_infoWidget->updateItemsVisibility();
QVERIFY(verify());
@@ -550,9 +554,8 @@
void UT_InfoWidget::t_layoutInfoDisplay()
{
QGraphicsWidget *contentWidget = NULL;
- EXPECT(InfoWidgetLayoutManager::contentWidget)
+ EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
.returns(contentWidget);
-
m_infoWidget->layoutInfoDisplay();
QVERIFY(verify());
@@ -560,6 +563,9 @@
void UT_InfoWidget::t_layoutSettingsDialog()
{
+ QGraphicsWidget *contentWidget = NULL;
+ EXPECT(InfoWidgetLayoutManager::layoutSettingsDialog)
+ .returns(contentWidget);
m_infoWidget->layoutSettingsDialog();
QVERIFY(verify());
@@ -620,7 +626,7 @@
const QSizeF KPreferredSize(134, 160);
const QSizeF KDefaultSizeInfoDisplay(200, 100);
const QSizeF KDefaultSizeSettingsDisplay(230, 220);
- QGraphicsWidget *contentWidget = NULL;
+ QScopedPointer<QGraphicsWidget> contentWidget(NULL);
// Test: initial size after construction
Qt::SizeHint sizeHint = Qt::PreferredSize;
@@ -628,19 +634,18 @@
QVERIFY(KDefaultSizeInfoDisplay == m_infoWidget->sizeHint(
sizeHint, constraint));
- EXPECT(InfoWidgetLayoutManager::contentWidget)
- .returns(contentWidget);
-
+ EXPECT(InfoWidgetLayoutManager::layoutInfoDisplay)
+ .returns(contentWidget.data());
// Test: size after onInitialize is called
// and current display is InfoDisplay
m_infoWidget->onInitialize();
QVERIFY(verify());
- contentWidget = new QGraphicsWidget;
+ contentWidget.reset(new QGraphicsWidget);
contentWidget->setMinimumSize(KMinimumSize);
- EXPECT(InfoWidgetLayoutManager::contentWidget).
- returns(contentWidget);
+ EXPECT(InfoWidgetLayoutManager::contentWidget)
+ .returns(contentWidget.data());
EXPECT(InfoWidgetPreferences::visibleItemCount).
returns(1);
@@ -649,9 +654,6 @@
QVERIFY(KDefaultSizeInfoDisplay != m_infoWidget->sizeHint(sizeHint, constraint));
QVERIFY(verify());
-
- delete contentWidget;
- contentWidget = NULL;
}
/*!
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h Fri Jul 09 15:40:55 2010 +0300
@@ -33,18 +33,14 @@
~UT_InfoWidgetLayoutManager();
private:
- void fillDisplayContainers();
void fillCurrentWidgetsContainer();
- void fillParams(const QString & fileName, bool * ok);
-
+
private slots:
void init();
void cleanup();
void t_currentDisplayRole();
void t_currentWidgetRoles();
- void t_layoutRows();
- void t_setLayoutRows();
void t_rowHeight();
void t_layoutInfoDisplay();
void t_layoutSettingsDialog();
@@ -54,7 +50,6 @@
void t_loadObject();
void t_getWidget();
void t_contentWidget();
- void t_reloadWidgets();
void t_removeWidget();
void t_destroyWidgets();
void t_textFitsToRect();
@@ -68,14 +63,6 @@
InfoWidgetDocumentLoader *m_documentLoader;
QPointer<QGraphicsWidget> m_graphicsWidgetPtr;
-
- bool loadResultInfoWidgetDocml;
- bool loadResultSettingsDialogDocml;
-
- QObjectList objectListInfoDisplayWidgets;
- QObjectList objectListSettingsDialogWidgets;
-
-
};
#endif // UT_INFOWIDGETLAYOUTMANAGER_H
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -52,6 +52,7 @@
UT_InfoWidgetLayoutManager::~UT_InfoWidgetLayoutManager()
{
delete m_layoutManager;
+ delete m_documentLoader;
delete m_graphicsWidgetPtr;
}
@@ -62,25 +63,14 @@
void UT_InfoWidgetLayoutManager::init()
{
initialize();
- bool loadResultInfoWidgetDocml = true;
- bool loadResultSettingsDialogDocml = true;
-
- QObjectList objectListInfoDisplayWidgets;
- QObjectList objectListSettingsDialogWidgets;
-
- EXPECT(HbDocumentLoader::load)
- .with(KInfoWidgetDocmlFile, loadResultInfoWidgetDocml)
- .returns(&objectListInfoDisplayWidgets);
- EXPECT(HbDocumentLoader::load)
- .with(KSettingsDialogDocmlFile, loadResultSettingsDialogDocml)
- .returns(&objectListSettingsDialogWidgets);
+
m_layoutManager = new InfoWidgetLayoutManager();
-
m_documentLoader = new InfoWidgetDocumentLoader;
QVERIFY(verify());
}
+
/*!
UT_InfoWidgetLayoutManager::cleanup
*/
@@ -95,34 +85,6 @@
m_documentLoader = NULL;
}
-/*!
- UT_InfoWidgetLayoutManager::fillDisplayContainers
- */
-void UT_InfoWidgetLayoutManager::fillDisplayContainers()
-{
- InfoWidgetLayoutManager::LayoutItemRole currentRole;
-
- QList<InfoWidgetLayoutManager::LayoutItemRole> infoDisplayWidgetRoles =
- m_layoutManager->widgetRoles(InfoWidgetLayoutManager::InfoDisplay);
- foreach (currentRole, infoDisplayWidgetRoles) {
- m_layoutManager->m_infoDisplayWidgets.insert(currentRole, m_graphicsWidgetPtr.data());
- }
-
- QList<InfoWidgetLayoutManager::LayoutItemRole> settingsDisplayWidgetRoles =
- m_layoutManager->widgetRoles(InfoWidgetLayoutManager::SettingsDialog);
- foreach (currentRole, settingsDisplayWidgetRoles) {
- m_layoutManager->m_settingsDialogWidgets.insert(currentRole, m_graphicsWidgetPtr.data());
- }
-}
-
-/*!
- UT_InfoWidgetLayoutManager::fillParams
- */
-void UT_InfoWidgetLayoutManager::fillParams(const QString & fileName,
- bool * ok){
- Q_UNUSED(fileName)
- *ok = true;
-}
/*!
UT_InfoWidgetLayoutManager::fillCurrentWidgetsContainer
@@ -138,6 +100,7 @@
}
}
+
/*!
UT_InfoWidgetLayoutManager::t_currentDisplayRole
*/
@@ -160,12 +123,18 @@
m_layoutManager->currentWidgetRoles();
QVERIFY(roles.count() == 0);
- // Fill display container data
- fillDisplayContainers();
+ QObjectList objectList;
+ QGraphicsWidget widget;
- QGraphicsLayout *activeLayout;
- activeLayout= m_layoutManager->layoutInfoDisplay();
- QVERIFY(!activeLayout);
+ bool loaded = true;
+ EXPECT(HbDocumentLoader::load)
+ .with(KInfoWidgetDocmlFile, loaded)
+ .returns(&objectList);
+ EXPECT(HbDocumentLoader::findWidget).times(KNumOfInfoDisplayRoles).returns(&widget);
+
+ QGraphicsWidget *activeWidget = m_layoutManager->layoutInfoDisplay();
+
+ QVERIFY(activeWidget);
roles = m_layoutManager->currentWidgetRoles();
@@ -187,38 +156,27 @@
InfoWidgetLayoutManager::RoleSatTextIcon));
}
- activeLayout= m_layoutManager->layoutSettingsDialog();
- QVERIFY(!activeLayout);
+ EXPECT(HbDocumentLoader::load)
+ .with(KSettingsDialogDocmlFile, loaded)
+ .returns(&objectList);
+ EXPECT(HbDocumentLoader::findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
+
+ QObject action;
+ EXPECT(HbDocumentLoader::findObject).times(2).returns(&action);
+
+ activeWidget = m_layoutManager->layoutSettingsDialog();
+
+ QVERIFY(activeWidget);
roles = m_layoutManager->currentWidgetRoles();
- int dVar = roles.count();
+
QVERIFY(roles.count() == KNumOfSettingsDisplayRoles);
}
/*!
- UT_InfoWidgetLayoutManager::t_layoutRows
- */
-void UT_InfoWidgetLayoutManager::t_layoutRows()
-{
- int rows = m_layoutManager->layoutRows();
- QVERIFY(0 == rows);
-}
-
-
-/*!
- UT_InfoWidgetLayoutManager::t_setLayoutRows
- */
-void UT_InfoWidgetLayoutManager::t_setLayoutRows()
-{
- const int KLayoutRows = 1;
- m_layoutManager->setLayoutRows(KLayoutRows);
- QVERIFY(KLayoutRows == m_layoutManager->layoutRows());
-}
-
-/*!
- UT_InfoWidgetLayoutManager::t_setLayoutRows
+ UT_InfoWidgetLayoutManager::t_rowHeight
*/
void UT_InfoWidgetLayoutManager::t_rowHeight()
{
@@ -233,12 +191,22 @@
QVERIFY(verify());
}
+
/*!
UT_InfoWidgetLayoutManager::t_layoutInfoDisplay
*/
void UT_InfoWidgetLayoutManager::t_layoutInfoDisplay()
{
- QVERIFY(!m_layoutManager->layoutInfoDisplay());
+ QObjectList objectList;
+ QGraphicsWidget widget;
+
+ bool loaded = true;
+ EXPECT(HbDocumentLoader::load)
+ .with(KInfoWidgetDocmlFile, loaded)
+ .returns(&objectList);
+ EXPECT(HbDocumentLoader::findWidget).times(KNumOfInfoDisplayRoles).returns(&widget);
+
+ QVERIFY(m_layoutManager->layoutInfoDisplay());
}
@@ -247,9 +215,21 @@
*/
void UT_InfoWidgetLayoutManager::t_layoutSettingsDialog()
{
- QVERIFY(!m_layoutManager->layoutSettingsDialog());
+ QObjectList objectList;
+ QGraphicsWidget widget;
+
+ bool loaded = true;
+ EXPECT(HbDocumentLoader::load)
+ .with(KSettingsDialogDocmlFile, loaded)
+ .returns(&objectList);
+ EXPECT(HbDocumentLoader::findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
+ QObject action;
+ EXPECT(HbDocumentLoader::findObject).times(2).returns(&action);
+
+ QVERIFY(m_layoutManager->layoutSettingsDialog());
}
+
/*!
UT_InfoWidgetLayoutManager::t_widgetRoles
*/
@@ -293,24 +273,27 @@
}
}
+
/*!
UT_InfoWidgetLayoutManager::t_loadWidgets
*/
void UT_InfoWidgetLayoutManager::t_loadWidgets()
{
- QObjectList list = QObjectList();
+ QObjectList objectList;
+ QGraphicsWidget widget;
+ bool loaded = true;
EXPECT(HbDocumentLoader::load)
- .willOnce(invoke(this, &fillParams)).returns(list);
-
- const QList<InfoWidgetLayoutManager::LayoutItemRole> settingDisplayRoles =
- m_layoutManager->widgetRoles(InfoWidgetLayoutManager::SettingsDialog);
- bool loadResult = m_layoutManager->loadWidgets(InfoWidgetLayoutManager::SettingsDialog,
- settingDisplayRoles,
- m_layoutManager->m_infoDisplayWidgets);
-
- QVERIFY(!loadResult);
+ .with(KSettingsDialogDocmlFile, loaded)
+ .returns(&objectList);
+ QObject action;
+ EXPECT(HbDocumentLoader::findObject).times(2).returns(&action);
+ EXPECT(HbDocumentLoader::findWidget).times(KNumOfSettingsDisplayRoles).returns(&widget);
+ bool loadResult = m_layoutManager->loadWidgets(InfoWidgetLayoutManager::SettingsDialog);
+
+ QVERIFY(loadResult);
}
+
/*!
UT_InfoWidgetLayoutManager::t_loadWidget
*/
@@ -352,6 +335,7 @@
QVERIFY(!currentWidget);
}
+
/*!
UT_InfoWidgetLayoutManager::t_loadObject
*/
@@ -383,7 +367,6 @@
}
-
/*!
UT_InfoWidgetLayoutManager::t_getWidget
*/
@@ -396,6 +379,7 @@
QVERIFY(!m_layoutManager->getWidget(InfoWidgetLayoutManager::RoleLastEnum));
}
+
/*!
UT_InfoWidgetLayoutManager::t_removeWidget
*/
@@ -421,29 +405,6 @@
QVERIFY(m_layoutManager->contentWidget());
}
-/*!
- UT_InfoWidgetLayoutManager::t_reloadWidgets
- */
-void UT_InfoWidgetLayoutManager::t_reloadWidgets()
-{
- bool loadResultIw = true;
- bool loadResultSd = true;
-
- QObjectList objectListId;
- QObjectList objectListSd;
-
- EXPECT(HbDocumentLoader::load)
- .with(KInfoWidgetDocmlFile, loadResultIw)
- .returns(&objectListId);
- QVERIFY(!m_layoutManager->reloadWidgets(InfoWidgetLayoutManager::InfoDisplay));
-
- EXPECT(HbDocumentLoader::load)
- .with(KSettingsDialogDocmlFile, loadResultSd)
- .returns(&objectListSd);
- QVERIFY(!m_layoutManager->reloadWidgets(InfoWidgetLayoutManager::SettingsDialog));
-
- QVERIFY(verify());
-}
/*!
UT_InfoWidgetLayoutManager::t_destroyWidgets
@@ -461,16 +422,17 @@
QVERIFY(verify());
}
+
/*!
UT_InfoWidgetLayoutManager::t_textFitsToRect
*/
void UT_InfoWidgetLayoutManager::t_textFitsToRect()
{
- QString text;
+ QString text = "testtesttesttest";
QFont font;
bool fits(false);
- QRectF testRect;
+ QRectF testRect(0,0,0,0);
// Currently not possible to use with .pro definition
// QFontMetrics to be properly mocked
@@ -478,14 +440,13 @@
// Test 1: use valid text and rect to which text fits
//text = "testtesttesttest";
//testRect = QRectF(QPointF(0,0), QSizeF(200,100));
- //fits = m_layoutManager->textFitsToRect(text, font, testRect);
- //QVERIFY(fits);
+ fits = m_layoutManager->textFitsToRect(text, font, testRect);
+ QVERIFY(fits);
QVERIFY(verify());
}
-
/*!
UT_InfoWidgetLayoutManager::t_marqueeItems
*/
@@ -523,10 +484,7 @@
object = m_documentLoader->createObject(KMargueeItemClassName, QString());
QVERIFY(object);
delete object;
-
- //For destructor coverage
- delete m_layoutManager->m_documentLoader;
- m_layoutManager->m_documentLoader = NULL;
+
}
QTEST_MAIN_S60(UT_InfoWidgetLayoutManager)
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/ut_infowidgetlayoutmanager.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetlayoutmanager/ut_infowidgetlayoutmanager.pro Fri Jul 09 15:40:55 2010 +0300
@@ -43,5 +43,6 @@
SOURCES += ../mocks/mock_hbdocumentloader.cpp
SOURCES += ../mocks/mock_hbmarqueeitem.cpp
SOURCES += ../mocks/mock_hbstyle.cpp
+SOURCES += ../mocks/mock_hbinstance.cpp
#SOURCES += ../mocks/mock_qfontmetrics.cpp
RESOURCES = ../../infowidgetplugin.qrc
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -32,7 +32,7 @@
};
-#define EXPECT_NO_EXCEPTION(statements) \
+#define EXPECT_EXCEPTION(statements) \
{ \
bool exceptionDetected = false; \
try { \
@@ -40,7 +40,7 @@
} catch (...) { \
exceptionDetected = true; \
} \
- QVERIFY(false == exceptionDetected); \
+ QVERIFY(true == exceptionDetected); \
}
const QString KHomeZoneTextTag("HomeZoneText0"); // max length 13
@@ -394,7 +394,7 @@
EXPECT(CreateL)
.willOnce(invokeWithoutArguments(this, &doLeaveL));
- EXPECT_NO_EXCEPTION(InfoWidgetNetworkHandler * p = new InfoWidgetNetworkHandler(););
+ EXPECT_EXCEPTION(InfoWidgetNetworkHandler * p = new InfoWidgetNetworkHandler(););
}
QTEST_MAIN_S60(UT_InfoWidgetNetworkHandler)
--- a/phoneplugins/phoneindicatorplugin/inc/phoneindicatorinterface.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/phoneindicatorplugin/inc/phoneindicatorinterface.h Fri Jul 09 15:40:55 2010 +0300
@@ -20,6 +20,7 @@
#include <QObject>
#include <QString>
+#include <QScopedPointer>
#include <QVariant>
#include <hbindicatorinterface.h>
#include "phoneindicators.h"
--- a/phoneplugins/phoneindicatorplugin/inc/phoneindicatorservicesendertask.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/phoneindicatorplugin/inc/phoneindicatorservicesendertask.h Fri Jul 09 15:40:55 2010 +0300
@@ -22,15 +22,18 @@
#include <QRunnable>
#include "phoneindicators.h"
+class XQAiwRequest;
+
class PhoneIndicatorServiceSenderTask : public QRunnable
{
public:
PhoneIndicatorServiceSenderTask(Interaction interaction);
- ~PhoneIndicatorServiceSenderTask(){}
+ ~PhoneIndicatorServiceSenderTask();
void run();
private:
Interaction m_interaction;
+ XQAiwRequest* m_request;
};
#endif /* PHONEINDICATORSERVICESENDERTASK_H_ */
--- a/phoneplugins/phoneindicatorplugin/src/phoneindicatorinterface.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/phoneindicatorplugin/src/phoneindicatorinterface.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -43,8 +43,12 @@
switch (m_interaction) {
case OpenMissedCallView: //fallthrough
case OpenCallUi: //fallthrough
- case OpenDiverSettingsView:
- QThreadPool::globalInstance()->start(new PhoneIndicatorServiceSenderTask(m_interaction));
+ case OpenDiverSettingsView: {
+ // Launch services on the client side
+ QVariantMap data;
+ data.insert(QLatin1String("interaction"), m_interaction);
+ emit userActivated(data);
+ }
break;
case Deactivate:
emit deactivate();
--- a/phoneplugins/phoneindicatorplugin/src/phoneindicatorservicesendertask.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/phoneindicatorplugin/src/phoneindicatorservicesendertask.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -14,7 +14,6 @@
* Description:
*
*/
-
#include "phoneindicatorservicesendertask.h"
#include <xqaiwrequest.h>
@@ -23,10 +22,15 @@
PhoneIndicatorServiceSenderTask::PhoneIndicatorServiceSenderTask(Interaction interaction):
- m_interaction(interaction)
+ m_interaction(interaction), m_request(0)
{
}
+PhoneIndicatorServiceSenderTask::~PhoneIndicatorServiceSenderTask()
+{
+ delete m_request;
+}
+
void PhoneIndicatorServiceSenderTask::run()
{
XQApplicationManager appManager;
@@ -64,12 +68,14 @@
default:
break;
}
- QScopedPointer<XQAiwRequest> request( service.isEmpty() ?
+
+ delete m_request;
+ m_request = service.isEmpty() ?
appManager.create( interface, operation, false):
- appManager.create(service, interface, operation, false));
- if ( request == NULL ){
+ appManager.create(service, interface, operation, false);
+ if ( m_request == NULL ){
return;
}
- request->setArguments(args);
- request->send();
+ m_request->setArguments(args);
+ m_request->send();
}
--- a/phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -30,7 +30,8 @@
LIBS += -lcpframework \
-lpsetwrapper \
- -lcptelephonyutils
+ -lcptelephonyutils \
+ -lpsuinotes
# Input
HEADERS += inc/cpbarringplugin.h inc/cpbarringplugingroup.h
--- a/phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugingroup.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugingroup.h Fri Jul 09 15:40:55 2010 +0300
@@ -23,7 +23,7 @@
class PSetWrapper;
class QModelIndex;
-class CpPhoneNotes;
+class PsUiNotes;
class QValidator;
class HbDataFormModel;
@@ -118,7 +118,7 @@
QQueue<CpSettingFormItemData *> m_barringRequestQueue;
bool m_barringStatusRequestOngoing;
int m_activeNoteId;
- CpPhoneNotes* m_phoneNotes;
+ PsUiNotes* m_phoneNotes;
QValidator *m_barringPasswordValidator;
bool m_delayedBarringActivationNote;
CpSettingFormItemData* m_clickedBarringItem; // Not own.
--- a/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -23,9 +23,9 @@
#include <cpitemdatahelper.h>
#include <psetwrapper.h>
#include <psetcallbarringwrapper.h>
+#include <psuinotes.h>
#include "cpbarringplugingroup.h"
#include "cpplugincommon.h"
-#include "cpphonenotes.h"
#include "cppluginlogging.h"
const int KMaxPasswordLength = 4;
@@ -72,7 +72,7 @@
createBarringItems();
- m_phoneNotes = CpPhoneNotes::instance();
+ m_phoneNotes = PsUiNotes::instance();
QRegExp regExpression("\\d{4}");
m_barringPasswordValidator = new QRegExpValidator(regExpression, this);
@@ -272,7 +272,6 @@
value.setValue(barringType);
barringItem->setContentWidgetData("barringType", value);
- appendChild(barringItem.data());
DPRINT << ": OUT";
return barringItem.take();
}
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -18,10 +18,10 @@
#include <HbDataFormModel>
#include <HbCheckBox>
#include <psetwrapper.h>
+#include <psuinotes.h>
#include "ut_barringplugingroup.h"
#include "qtestmains60.h"
#include "cpitemdatahelper.h"
-#include "cpphonenotes.h"
#define private friend class UT_CpBarringPluginGroup; private
#include "cpbarringplugingroup.h"
@@ -172,8 +172,8 @@
void UT_CpBarringPluginGroup::t_itemShownBarringStatusRequestOngoing()
{
EXPECT(PSetCallBarringWrapper::barringStatus);
- EXPECT(CpPhoneNotes::noteShowing).returns(true);
- EXPECT(CpPhoneNotes::showGlobalProgressNote).times(0);
+ EXPECT(PsUiNotes::noteShowing).returns(true);
+ EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
m_barringpluginGroup->itemShown(m_dataFormModel->indexFromItem(item));
@@ -203,7 +203,7 @@
// simulate barring enable request
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -226,8 +226,8 @@
*/
void UT_CpBarringPluginGroup::t_barringStatusRequestCompletedWithAnError()
{
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showGlobalErrorNote);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showGlobalErrorNote);
EXPECT(CpItemDataHelper::addConnection).times(0);
QList<unsigned char> basicServiceGroupIds;
@@ -267,7 +267,7 @@
EXPECT(PSetCallBarringWrapper::barringStatus)
.with(ServiceGroupVoice,
PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming);
- EXPECT(CpPhoneNotes::showGlobalProgressNote)
+ EXPECT(PsUiNotes::showGlobalProgressNote)
.willOnce(invoke(setNoteIdentifier));
EXPECT(CpItemDataHelper::addConnection).times(6);
@@ -324,10 +324,10 @@
{
// request completed succesfully -case
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -346,12 +346,12 @@
HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
item->setContentWidgetData("checkState", QVariant(Qt::Checked));
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
EXPECT(CpItemDataHelper::removeConnection);
EXPECT(CpItemDataHelper::addConnection);
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showGlobalErrorNote);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showGlobalErrorNote);
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -368,15 +368,15 @@
// request completed successfully and dependent barring setting needs
// status inquiry
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
// some other (outgoing) barring is enabled, status inquiery for that
// should be done.
item = m_barringpluginGroup->childAt(1);
item->setContentWidgetData("checkState", QVariant(Qt::Checked));
EXPECT(PSetCallBarringWrapper::barringStatus);
- EXPECT(CpPhoneNotes::cancelNote).times(0);
- EXPECT(CpPhoneNotes::showGlobalNote).times(0);
+ EXPECT(PsUiNotes::cancelNote).times(0);
+ EXPECT(PsUiNotes::showGlobalNote).times(0);
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -407,10 +407,10 @@
EXPECT(CpItemDataHelper::widgetFromModelIndex)
.with<const QModelIndex &>(modelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
// completion of unknown barring type should not lead to updating
EXPECT(PSetCallBarringWrapper::barringStatus).times(0);
emit simulateCheckStateChange(Qt::Checked);
@@ -440,7 +440,7 @@
QList<unsigned char> basicServiceGroupIds;
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -483,7 +483,7 @@
QList<unsigned char> basicServiceGroupIds;
EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -527,7 +527,7 @@
QList<unsigned char> basicServiceGroupIds;
EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -577,7 +577,7 @@
QList<unsigned char> basicServiceGroupIds;
EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -615,7 +615,7 @@
QList<unsigned char> basicServiceGroupIds;
EXPECT(CpItemDataHelper::widgetFromModelIndex).with(modelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
emit simulateCheckStateChange(Qt::Checked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -643,10 +643,10 @@
{
// request completed succesfully -case
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
emit simulateCheckStateChange(Qt::Unchecked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
KCurrentPassword, true);
@@ -663,12 +663,12 @@
HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
item->setContentWidgetData("checkState", QVariant(Qt::Unchecked));
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
EXPECT(CpItemDataHelper::removeConnection);
EXPECT(CpItemDataHelper::addConnection);
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showGlobalErrorNote);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showGlobalErrorNote);
emit simulateCheckStateChange(Qt::Unchecked);
m_barringpluginGroup->completeBarringStateChangeRequestHandling(
@@ -690,16 +690,16 @@
void UT_CpBarringPluginGroup::t_barringPasswordChangeRequestCompleted()
{
// request completed with no error
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
m_barringpluginGroup->barringPasswordChangeRequestCompleted(0);
QVERIFY(verify());
// request completed with an error
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showGlobalErrorNote);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showGlobalErrorNote);
m_barringpluginGroup->barringPasswordChangeRequestCompleted(-1);
@@ -714,12 +714,12 @@
{
// barring enable request case
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
EXPECT(PSetCallBarringWrapper::enableBarring)
.with(ServiceGroupVoice,
PSetCallBarringWrapper::BarringTypeAllOutgoing, KCurrentPassword);
- EXPECT(CpPhoneNotes::showGlobalProgressNote);
+ EXPECT(PsUiNotes::showGlobalProgressNote);
HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
item->setContentWidgetData("checkState", QVariant(Qt::Checked));
@@ -731,12 +731,12 @@
// barring disable request case
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
EXPECT(PSetCallBarringWrapper::disableBarring)
.with(ServiceGroupVoice,
PSetCallBarringWrapper::BarringTypeAllOutgoing, KCurrentPassword);
- EXPECT(CpPhoneNotes::showGlobalProgressNote);
+ EXPECT(PsUiNotes::showGlobalProgressNote);
item = m_barringpluginGroup->childAt(0);
item->setContentWidgetData("checkState", QVariant(Qt::Unchecked));
@@ -748,12 +748,12 @@
// cancel pressed while querying barring password
EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setPasswordParamsCancel));
EXPECT(CpItemDataHelper::removeConnection);
EXPECT(CpItemDataHelper::addConnection);
EXPECT(PSetCallBarringWrapper::disableBarring).times(0);
- EXPECT(CpPhoneNotes::showGlobalProgressNote).times(0);
+ EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
item = m_barringpluginGroup->childAt(0);
item->setContentWidgetData("checkState", QVariant(Qt::Unchecked));
@@ -765,7 +765,7 @@
// barring item not found case
EXPECT(PSetCallBarringWrapper::enableBarring).times(0);
- EXPECT(CpPhoneNotes::showGlobalProgressNote).times(0);
+ EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
emit simulateCheckStateChange(Qt::Checked);
@@ -783,16 +783,16 @@
m_barringpluginGroup, SLOT(changeBarringPasswordRequested()));
// cancel from current password query
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setPasswordParamsCancel));
emit simulateEditPasswordButtonClicked(false);
m_barringpluginGroup->changeBarringPasswordPhasesHandling("", false);
QVERIFY(verify());
// cancel from new password query
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setPasswordParamsCancel));
emit simulateEditPasswordButtonClicked(false);
m_barringpluginGroup->changeBarringPasswordPhasesHandling(
@@ -802,11 +802,11 @@
QVERIFY(verify());
// cancel from verify new password query
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setNewAndVerifiedPasswordParams));
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setPasswordParamsCancel));
emit simulateEditPasswordButtonClicked(false);
m_barringpluginGroup->changeBarringPasswordPhasesHandling(
@@ -818,11 +818,11 @@
QVERIFY(verify());
// all data successfully queried
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setCurrentPasswordParams));
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setNewAndVerifiedPasswordParams));
- EXPECT(CpPhoneNotes::showPasswordQueryDialog)
+ EXPECT(PsUiNotes::showPasswordQueryDialog)
.willOnce(invoke(setNewAndVerifiedPasswordParams));
EXPECT(PSetCallBarringWrapper::changeBarringPassword)
.with(KCurrentPassword, KNewAndVerifiedPassword, KNewAndVerifiedPassword);
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro Fri Jul 09 15:40:55 2010 +0300
@@ -26,7 +26,7 @@
INCLUDEPATH += ../../../inc
INCLUDEPATH += ../../../cptelephonyutils/inc
DEFINES += BUILD_CPTELEPHONYUTILS BUILD_BARRINGPLUGIN \
- BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER
+ BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
DEFINES += QT_NO_DEBUG_STREAM
QT -= gui
@@ -51,9 +51,9 @@
# code to be tested
HEADERS += ../../inc/cpbarringplugin.h \
../../inc/cpbarringplugingroup.h \
- ../../../cptelephonyutils/inc/cpphonenotes.h \
../../../cptelephonyutils/inc/cpplugincommon.h \
/epoc32/include/platform/mw/psetwrapper.h \
+ /epoc32/include/platform/mw/psuinotes.h \
/epoc32/include/platform/mw/psetcliwrapper.h \
/epoc32/include/platform/mw/sssettingswrapper.h \
/epoc32/include/platform/mw/psetcallwaitingwrapper.h \
@@ -67,7 +67,7 @@
SOURCES += ../../../tsrc/mocks/mock_cpbarringplugin.cpp
SOURCES += ../../../tsrc/mocks/mock_psetcallbarringwrapper.cpp
SOURCES += ../../../tsrc/mocks/mock_psetwrapper.cpp
-SOURCES += ../../../tsrc/mocks/mock_cpphonenotes.cpp
+SOURCES += ../../../tsrc/mocks/mock_psuinotes.cpp
SOURCES += ../../../tsrc/mocks/mock_cpplugincommon.cpp
SOURCES += ../../../tsrc/mocks/mock_cpitemdatahelper.cpp
SOURCES += ../../../tsrc/mocks/mock_hbcheckbox.cpp
--- a/phonesettings/cpphonesettingsplugins/callsplugin/callsplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/callsplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -30,7 +30,8 @@
LIBS += -lcpframework \
-lpsetwrapper \
-lsssettingswrapper \
- -lcptelephonyutils
+ -lcptelephonyutils \
+ -lpsuinotes
# Input
SOURCES += src/cpcallsplugingroup.cpp \
--- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -18,7 +18,7 @@
#include "cpcallsplugingroup.h"
#include "cpplugincommon.h"
#include "cppluginlogging.h"
-#include "cpphonenotes.h"
+#include <psuinotes.h>
#include <hbdataformmodel.h>
#include <hbdataformmodelitem.h>
#include <hbdataformviewitem.h>
@@ -75,7 +75,7 @@
m_ssSettingsWrapper = new SsSettingsWrapper;
DPRINT << "SsSettingsWrapper created";
- CpPhoneNotes *phoneNotes = CpPhoneNotes::instance();
+ PsUiNotes *phoneNotes = PsUiNotes::instance();
QObject::connect(
this,
SIGNAL(showGlobalProgressNote(int &, const QString&)),
@@ -170,7 +170,6 @@
"additionalText", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
}
- appendChild( m_DataItemShowCallDuration );
DPRINT << ": OUT";
}
@@ -205,7 +204,6 @@
"maxRows", QVariant(5));
m_DataItemSoftRejectTextEditor->setContentWidgetData(
"minRows", QVariant(1));
- appendChild( m_DataItemSoftRejectTextEditor );
DPRINT << ": OUT";
}
@@ -232,7 +230,6 @@
list << cliSettingMapIterator.value();
};
m_DataItemCLI->setContentWidgetData("items", QVariant(list));
- appendChild(m_DataItemCLI);
DPRINT << ": OUT";
}
@@ -270,7 +267,6 @@
m_OwnVideoInReceivedCall->setContentWidgetData(
QString("currentIndex"), indexValue);
- appendChild( m_OwnVideoInReceivedCall );
DPRINT << ": OUT";
}
@@ -292,7 +288,6 @@
m_DataItemCallWaiting->setContentWidgetData(
"additionalText", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_check_status")));
- appendChild(m_DataItemCallWaiting);
DPRINT << ": OUT";
}
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -23,7 +23,7 @@
#include "psetwrapper.h"
#include "sssettingswrapper.h"
#include "cpplugincommon.h"
-#include "cpphonenotes.h"
+#include <psuinotes.h>
/*!
Dummy CPsetContainer class
@@ -104,7 +104,7 @@
EXPECT(CpSettingsWrapper::isOngoingCall).returns(bOngoing);
EXPECT(CpSettingsWrapper::showCallDuration).returns(bDuration);
- EXPECT(CpPhoneNotes::showGlobalNote);
+ EXPECT(PsUiNotes::showGlobalNote);
m_callspluginGroup->showCallDurationStateChanged();
bDuration = false;
@@ -168,23 +168,23 @@
*/
void UT_CpCallsPluginGroup::t_handleCallWaitingChanged()
{
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
m_callspluginGroup->handleCallWaitingChanged(
PSetCallWaitingWrapper::ActivateCallWaiting , 0);
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
m_callspluginGroup->handleCallWaitingChanged(
PSetCallWaitingWrapper::DeactivateCallWaiting, 0);
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
m_callspluginGroup->handleCallWaitingChanged(
PSetCallWaitingWrapper::CheckCallWaitingStatus, 0);
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
m_callspluginGroup->handleCallWaitingChanged(
PSetCallWaitingWrapper::DeactivateCallWaiting , -1);
@@ -196,21 +196,21 @@
*/
void UT_CpCallsPluginGroup::t_handleCallWaitingRequesting()
{
- EXPECT(CpPhoneNotes::cancelNote);
+ EXPECT(PsUiNotes::cancelNote);
m_callspluginGroup->handleCallWaitingRequesting( false, true );
- EXPECT(CpPhoneNotes::showGlobalProgressNote);
+ EXPECT(PsUiNotes::showGlobalProgressNote);
m_callspluginGroup->handleCallWaitingRequesting( true, false );
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showGlobalProgressNote);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showGlobalProgressNote);
// m_callspluginGroup->handleCallWaitingRequesting( true, true );
// QVERIFY(verify());
reset();
- EXPECT(CpPhoneNotes::cancelNote).times(0);
- EXPECT(CpPhoneNotes::showGlobalProgressNote).times(0);
+ EXPECT(PsUiNotes::cancelNote).times(0);
+ EXPECT(PsUiNotes::showGlobalProgressNote).times(0);
m_callspluginGroup->handleCallWaitingRequesting( false, false );
QVERIFY(verify());
@@ -221,8 +221,8 @@
*/
void UT_CpCallsPluginGroup::t_handleCallWaitingError()
{
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showGlobalErrorNote);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showGlobalErrorNote);
m_callspluginGroup->handleCallWaitingError( -1 );
QVERIFY(verify());
@@ -247,11 +247,11 @@
{
QList<unsigned char> basicServiceGroupIds;
- EXPECT(CpPhoneNotes::cancelNote);
+ EXPECT(PsUiNotes::cancelNote);
m_callspluginGroup->handleCallWaitingGetStatus(
PSetCallWaitingWrapper::StatusNotProvisioned, basicServiceGroupIds);
- EXPECT(CpPhoneNotes::cancelNote);
+ EXPECT(PsUiNotes::cancelNote);
m_callspluginGroup->handleCallWaitingGetStatus(
PSetCallWaitingWrapper::StatusActive, basicServiceGroupIds);
QVERIFY(verify());
@@ -264,8 +264,8 @@
{
QList<unsigned char> basicServiceGroupIds;
- EXPECT(CpPhoneNotes::cancelNote);
- EXPECT(CpPhoneNotes::showNotificationDialog);
+ EXPECT(PsUiNotes::cancelNote);
+ EXPECT(PsUiNotes::showNotificationDialog);
m_callspluginGroup->handleCallWaitingGetStatus(
PSetCallWaitingWrapper::StatusNotProvisioned, basicServiceGroupIds);
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro Fri Jul 09 15:40:55 2010 +0300
@@ -28,7 +28,8 @@
INCLUDEPATH += /sf/mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper/src
-DEFINES += BUILD_CALLSPLUGIN BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER
+DEFINES += BUILD_CALLSPLUGIN BUILD_CPTELEPHONYUTILS \
+ BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
QT -= gui
QT += testlib
@@ -50,9 +51,9 @@
# code to be tested
HEADERS += ../../src/cpcallsplugin.h \
../../src/cpcallsplugingroup.h \
- ../../../cptelephonyutils/inc/cpphonenotes.h \
../../../cptelephonyutils/inc/cpplugincommon.h \
/epoc32/include/platform/mw/psetwrapper.h \
+ /epoc32/include/platform/mw/psuinotes.h \
/epoc32/include/platform/mw/psetcliwrapper.h \
/epoc32/include/platform/mw/sssettingswrapper.h \
/epoc32/include/platform/mw/psetcallwaitingwrapper.h \
@@ -64,7 +65,7 @@
# mocks needed for testing
SOURCES += ../../../tsrc/mocks/mock_cpcallsplugin.cpp \
- ../../../tsrc/mocks/mock_cpphonenotes.cpp \
+ ../../../tsrc/mocks/mock_psuinotes.cpp \
../../../tsrc/mocks/mock_cpplugincommon.cpp \
../../../tsrc/mocks/mock_psetcalldivertingwrapper.cpp \
../../../tsrc/mocks/mock_psetcallwaitingwrapper.cpp \
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/cpnetworkplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/cpnetworkplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -29,7 +29,8 @@
LIBS += -lcpframework \
-lpsetwrapper \
- -lcptelephonyutils
+ -lcptelephonyutils \
+ -lpsuinotes
symbian*::LIBS += -lcmmanager
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -79,17 +79,23 @@
*/
CpBaseSettingView *CpNetworkPlugin::createSettingView(const QVariant &hint) const
{
- Q_UNUSED(hint)
DPRINT << ": IN";
CpItemDataHelper *itemDataHelper(NULL);
QScopedPointer<CpSettingFormEntryItemDataImpl<CpNetworkPluginView> >
- data( new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
+ data(new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
*itemDataHelper,
hbTrId("txt_cp_dblist_mobile_network"),
m_networkStatus->statusText()));
CpBaseSettingView *view = data->createSettingView();
+ CpNetworkPluginView *networkPluginView = qobject_cast<CpNetworkPluginView*>(view);
+ QVariantHash hash = hint.value<QVariantHash>();
+ if ((hash.value("command").toString().compare("searchAvailableNetworks",Qt::CaseInsensitive) == 0) &&
+ networkPluginView){
+ networkPluginView->searchAvailableNetworks();
+ }
+
DPRINT << ": OUT";
return view;
}
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -25,11 +25,11 @@
#include <hblabel.h>
#include <cpsettingformitemdata.h>
#include <psetwrapper.h>
+#include <psuinotes.h>
#include "cpnetworkpluginform.h"
#include "cpplugincommon.h"
#include "cppluginlogging.h"
-#include "cpphonenotes.h"
#include "cellulardatasettings.h"
/*!
@@ -52,7 +52,7 @@
m_psetNetworkWrapper = &pSetWrapperGuard->networkWrapper();
mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings);
connectToNetworkWrapper(*m_psetNetworkWrapper);
- connectToPhoneNotes(*CpPhoneNotes::instance());
+ connectToPhoneNotes(*PsUiNotes::instance());
QScopedPointer<HbDataFormModel> model(new HbDataFormModel);
QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper);
@@ -601,12 +601,12 @@
if (type != PSetNetworkWrapper::RequestNone) {
QObject::connect(
- CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()),
+ PsUiNotes::instance(), SIGNAL(progressNoteCanceled()),
this, SLOT(userCancel()));
emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_cp_info_updating"));
} else {
QObject::disconnect(
- CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()),
+ PsUiNotes::instance(), SIGNAL(progressNoteCanceled()),
this, SLOT(userCancel()));
emit cancelNote(m_activeProgressNoteId);
m_activeProgressNoteId = 0;
@@ -625,12 +625,12 @@
if (ongoing) {
QObject::connect(
- CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()),
+ PsUiNotes::instance(), SIGNAL(progressNoteCanceled()),
this, SLOT(userCancel()));
emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_common_info_requesting"));
} else {
QObject::disconnect(
- CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()),
+ PsUiNotes::instance(), SIGNAL(progressNoteCanceled()),
this, SLOT(userCancel()));
emit cancelNote(m_activeProgressNoteId);
m_activeProgressNoteId = 0;
@@ -892,7 +892,7 @@
/*!
CpNetworkPluginForm::connectToPhoneNotes
*/
-void CpNetworkPluginForm::connectToPhoneNotes(CpPhoneNotes ¬es)
+void CpNetworkPluginForm::connectToPhoneNotes(PsUiNotes ¬es)
{
QObject::connect(
this,
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h Fri Jul 09 15:40:55 2010 +0300
@@ -30,7 +30,7 @@
class HbListWidget;
class PSetNetworkWrapper;
class CpSettingFormItemData;
-class CpPhoneNotes;
+class PsUiNotes;
class CellularDataSettings;
class CpNetworkPluginForm : public HbDataForm
@@ -90,7 +90,7 @@
QString networkName(PSetNetworkWrapper::NetworkInfo &info);
void connectToNetworkWrapper(PSetNetworkWrapper &wrapper);
- void connectToPhoneNotes(CpPhoneNotes ¬es);
+ void connectToPhoneNotes(PsUiNotes ¬es);
QString primaryIconForNetwork(const PSetNetworkWrapper::NetworkInfo &info);
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginview.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginview.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -41,12 +41,12 @@
}
/*!
- Slot called by QtHighway service when network
- is lost.
+ searchAvailableNetworks.
*/
-void CpNetworkPluginView::SearchAvailableNetworks()
+void CpNetworkPluginView::searchAvailableNetworks()
{
DPRINT;
+
m_networkSettingsForm->searchAvailableNetworks();
}
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginview.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginview.h Fri Jul 09 15:40:55 2010 +0300
@@ -29,9 +29,7 @@
public:
explicit CpNetworkPluginView(QGraphicsItem *parent = 0);
virtual ~CpNetworkPluginView();
-
-public slots:
- void SearchAvailableNetworks();
+ void searchAvailableNetworks();
private:
CpNetworkPluginForm* m_networkSettingsForm;
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro Fri Jul 09 15:40:55 2010 +0300
@@ -25,7 +25,8 @@
INCLUDEPATH += .
INCLUDEPATH += ../../../inc
INCLUDEPATH += ../../../cptelephonyutils/inc
-DEFINES += BUILD_NETWORKPLUGIN BUILD_PSETWRAPPER BUILD_CPTELEPHONYUTILS
+DEFINES += BUILD_NETWORKPLUGIN BUILD_PSETWRAPPER \
+ BUILD_CPTELEPHONYUTILS BUILD_PSUINOTES
QT -= gui
QT += testlib
@@ -47,9 +48,9 @@
../../src/cpnetworkpluginform.h \
../../src/cellulardatasettings.h \
../../../cptelephonyutils/inc/cpplugincommon.h \
- ../../../cptelephonyutils/inc/cpphonenotes.h \
../../../cptelephonyutils/inc/cpphonelocalisation.h \
/epoc32/include/platform/mw/psetwrapper.h \
+ /epoc32/include/platform/mw/psuinotes.h \
/epoc32/include/platform/mw/psetcliwrapper.h \
/epoc32/include/platform/mw/psetcallwaitingwrapper.h \
/epoc32/include/platform/mw/psetcalldivertingwrapper.h \
@@ -60,7 +61,7 @@
../../../tsrc/mocks/mock_psetwrapper.cpp \
../../../tsrc/mocks/mock_psetnetworkwrapper.cpp \
../../../tsrc/mocks/mock_cpplugincommon.cpp \
- ../../../tsrc/mocks/mock_cpphonenotes.cpp \
+ ../../../tsrc/mocks/mock_psuinotes.cpp \
../../../tsrc/mocks/mock_cpphonelocalisation.cpp \
../../../tsrc/mocks/mock_hbdialog.cpp \
../../../tsrc/mocks/mock_hbwidget.cpp \
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro Fri Jul 09 15:40:55 2010 +0300
@@ -22,7 +22,7 @@
INCLUDEPATH += .
INCLUDEPATH +=../../../inc
INCLUDEPATH +=../../../cptelephonyutils/inc
-DEFINES += BUILD_NETWORKPLUGIN BUILD_CPTELEPHONYUTILS
+DEFINES += BUILD_NETWORKPLUGIN BUILD_CPTELEPHONYUTILS QT_BUILD_SYSINFO_LIB QT_MAKEDLL
MOBILITY += systeminfo
QT -= gui
@@ -43,7 +43,8 @@
SOURCES += ut_cpnetworkstatus.cpp
# code to be tested
-HEADERS += ../../src/cpnetworkstatus.h
+HEADERS += ../../src/cpnetworkstatus.h \
+ /epoc32/include/mw/qsysteminfo.h
SOURCES += ../../src/cpnetworkstatus.cpp
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def Fri Jul 09 15:40:55 2010 +0300
@@ -1,84 +1,55 @@
EXPORTS
- ?metaObject@CpPhoneNotes@@UBEPBUQMetaObject@@XZ @ 1 NONAME ; struct QMetaObject const * CpPhoneNotes::metaObject(void) const
- ?qt_metacast@CpPhoneLocalisation@@UAEPAXPBD@Z @ 2 NONAME ; void * CpPhoneLocalisation::qt_metacast(char const *)
- ?handleProgressNoteCanceled@CpPhoneNotes@@AAEXXZ @ 3 NONAME ; void CpPhoneNotes::handleProgressNoteCanceled(void)
- ?showGlobalErrorNote@CpPhoneNotes@@QAEXAAHH@Z @ 4 NONAME ; void CpPhoneNotes::showGlobalErrorNote(int &, int)
- ??1CpSettingsWrapper@@UAE@XZ @ 5 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(void)
- ?installTranslator@CpPhoneLocalisation@@QAE_NW4TranslationFileId@1@@Z @ 6 NONAME ; bool CpPhoneLocalisation::installTranslator(enum CpPhoneLocalisation::TranslationFileId)
- ?passwordTextChanged@CpPhoneNotes@@AAEXXZ @ 7 NONAME ; void CpPhoneNotes::passwordTextChanged(void)
- ?instance@CpPhoneNotes@@SAPAV1@XZ @ 8 NONAME ; class CpPhoneNotes * CpPhoneNotes::instance(void)
+ ?qt_metacast@CpPhoneLocalisation@@UAEPAXPBD@Z @ 1 NONAME ; void * CpPhoneLocalisation::qt_metacast(char const *)
+ ?qt_metacast@CpSettingsWrapper@@UAEPAXPBD@Z @ 2 NONAME ; void * CpSettingsWrapper::qt_metacast(char const *)
+ ??1CpSettingsWrapper@@UAE@XZ @ 3 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(void)
+ ?getStaticMetaObject@Tools@@SAABUQMetaObject@@XZ @ 4 NONAME ; struct QMetaObject const & Tools::getStaticMetaObject(void)
+ ?installTranslator@CpPhoneLocalisation@@QAE_NW4TranslationFileId@1@@Z @ 5 NONAME ; bool CpPhoneLocalisation::installTranslator(enum CpPhoneLocalisation::TranslationFileId)
+ ?metaObject@CpPhoneLocalisation@@UBEPBUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const * CpPhoneLocalisation::metaObject(void) const
+ ?forbiddenIconSupported@CpSettingsWrapper@@QBE_NXZ @ 7 NONAME ; bool CpSettingsWrapper::forbiddenIconSupported(void) const
+ ?tr@CpPhoneLocalisation@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString CpPhoneLocalisation::tr(char const *, char const *)
?trUtf8@CpPhoneLocalisation@@SA?AVQString@@PBD0H@Z @ 9 NONAME ; class QString CpPhoneLocalisation::trUtf8(char const *, char const *, int)
?tr@CpPhoneLocalisation@@SA?AVQString@@PBD0H@Z @ 10 NONAME ; class QString CpPhoneLocalisation::tr(char const *, char const *, int)
?readPubSubValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 11 NONAME ; class QVariant CpSettingsWrapper::readPubSubValue(long, unsigned long) const
- ?formatPhoneNumber@CpPhoneNotes@@ABE?AVQString@@V2@@Z @ 12 NONAME ; class QString CpPhoneNotes::formatPhoneNumber(class QString) const
- ?metaObject@Tools@@UBEPBUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const * Tools::metaObject(void) const
- ?readSoftRejectText@CpSettingsWrapper@@QAEXAAVQString@@AA_N@Z @ 14 NONAME ; void CpSettingsWrapper::readSoftRejectText(class QString &, bool &)
- ?getStaticMetaObject@CpSettingsWrapper@@SAABUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const & CpSettingsWrapper::getStaticMetaObject(void)
- ?metaObject@CpSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 16 NONAME ; struct QMetaObject const * CpSettingsWrapper::metaObject(void) const
- ?errorCodeTextMapping@Tools@@SA_NHAAVQString@@@Z @ 17 NONAME ; bool Tools::errorCodeTextMapping(int, class QString &)
- ?isPhoneOffline@CpSettingsWrapper@@QBE_NXZ @ 18 NONAME ; bool CpSettingsWrapper::isPhoneOffline(void) const
- ?qt_metacall@CpPhoneLocalisation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 19 NONAME ; int CpPhoneLocalisation::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?writeVtVideoSending@CpSettingsWrapper@@QAEHH@Z @ 20 NONAME ; int CpSettingsWrapper::writeVtVideoSending(int)
- ?trUtf8@CpPhoneNotes@@SA?AVQString@@PBD0H@Z @ 21 NONAME ; class QString CpPhoneNotes::trUtf8(char const *, char const *, int)
- ?readCenrepString@CpSettingsWrapper@@ABE?AVQString@@JK@Z @ 22 NONAME ; class QString CpSettingsWrapper::readCenrepString(long, unsigned long) const
- ?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 23 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacall@CpPhoneNotes@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 24 NONAME ; int CpPhoneNotes::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?tr@CpPhoneNotes@@SA?AVQString@@PBD0@Z @ 25 NONAME ; class QString CpPhoneNotes::tr(char const *, char const *)
- ?getStaticMetaObject@CpPhoneNotes@@SAABUQMetaObject@@XZ @ 26 NONAME ; struct QMetaObject const & CpPhoneNotes::getStaticMetaObject(void)
- ?trUtf8@CpPhoneLocalisation@@SA?AVQString@@PBD0@Z @ 27 NONAME ; class QString CpPhoneLocalisation::trUtf8(char const *, char const *)
- ?staticMetaObject@CpPhoneLocalisation@@2UQMetaObject@@B @ 28 NONAME ; struct QMetaObject const CpPhoneLocalisation::staticMetaObject
- ?showNotificationDialog@CpPhoneNotes@@QAEXABVQString@@@Z @ 29 NONAME ; void CpPhoneNotes::showNotificationDialog(class QString const &)
- ?qt_metacall@CpSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int CpSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??0CpPhoneLocalisation@@QAE@PAVQObject@@@Z @ 31 NONAME ; CpPhoneLocalisation::CpPhoneLocalisation(class QObject *)
- ?showCallDivertDetails@CpPhoneNotes@@QAEXABVPSCallDivertingStatus@@@Z @ 32 NONAME ; void CpPhoneNotes::showCallDivertDetails(class PSCallDivertingStatus const &)
- ??_ECpPhoneLocalisation@@UAE@I@Z @ 33 NONAME ; CpPhoneLocalisation::~CpPhoneLocalisation(unsigned int)
- ?numberGroupingSupported@CpSettingsWrapper@@QBE_NXZ @ 34 NONAME ; bool CpSettingsWrapper::numberGroupingSupported(void) const
- ?launchNextNoteIfReady@CpPhoneNotes@@AAEXXZ @ 35 NONAME ; void CpPhoneNotes::launchNextNoteIfReady(void)
- ?tr@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 36 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *)
- ?isFeatureCallWaitingDistiquishNotProvisionedEnabled@CpSettingsWrapper@@QAE_NXZ @ 37 NONAME ; bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
- ?cancelNote@CpPhoneNotes@@QAEXH@Z @ 38 NONAME ; void CpPhoneNotes::cancelNote(int)
- ?writeCenrepValue@CpSettingsWrapper@@ABEHJKABVQVariant@@@Z @ 39 NONAME ; int CpSettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const
- ?staticMetaObject@Tools@@2UQMetaObject@@B @ 40 NONAME ; struct QMetaObject const Tools::staticMetaObject
- ?readVtVideoSending@CpSettingsWrapper@@QAEHXZ @ 41 NONAME ; int CpSettingsWrapper::readVtVideoSending(void)
- ?staticMetaObject@CpSettingsWrapper@@2UQMetaObject@@B @ 42 NONAME ; struct QMetaObject const CpSettingsWrapper::staticMetaObject
- ?activeNoteAboutToClose@CpPhoneNotes@@AAEXXZ @ 43 NONAME ; void CpPhoneNotes::activeNoteAboutToClose(void)
- ??_ECpPhoneNotes@@UAE@I@Z @ 44 NONAME ; CpPhoneNotes::~CpPhoneNotes(unsigned int)
- ?getStaticMetaObject@Tools@@SAABUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const & Tools::getStaticMetaObject(void)
- ?qt_metacast@CpSettingsWrapper@@UAEPAXPBD@Z @ 46 NONAME ; void * CpSettingsWrapper::qt_metacast(char const *)
- ?metaObject@CpPhoneLocalisation@@UBEPBUQMetaObject@@XZ @ 47 NONAME ; struct QMetaObject const * CpPhoneLocalisation::metaObject(void) const
- ?qt_metacast@CpPhoneNotes@@UAEPAXPBD@Z @ 48 NONAME ; void * CpPhoneNotes::qt_metacast(char const *)
- ?tr@CpPhoneLocalisation@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString CpPhoneLocalisation::tr(char const *, char const *)
- ?tr@CpPhoneNotes@@SA?AVQString@@PBD0H@Z @ 50 NONAME ; class QString CpPhoneNotes::tr(char const *, char const *, int)
- ?tr@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 51 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *, int)
- ?isOngoingCall@CpSettingsWrapper@@QBE_NXZ @ 52 NONAME ; bool CpSettingsWrapper::isOngoingCall(void) const
- ??1CpPhoneNotes@@EAE@XZ @ 53 NONAME ; CpPhoneNotes::~CpPhoneNotes(void)
- ?showGlobalNote@CpPhoneNotes@@QAEXAAHABVQString@@W4MessageBoxType@HbMessageBox@@@Z @ 54 NONAME ; void CpPhoneNotes::showGlobalNote(int &, class QString const &, enum HbMessageBox::MessageBoxType)
- ?finishedPasswordQueryDialog@CpPhoneNotes@@QAEXPAVHbAction@@@Z @ 55 NONAME ; void CpPhoneNotes::finishedPasswordQueryDialog(class HbAction *)
- ?videoSupported@Tools@@SA_NXZ @ 56 NONAME ; bool Tools::videoSupported(void)
- ?showCallDuration@CpSettingsWrapper@@QAE_NXZ @ 57 NONAME ; bool CpSettingsWrapper::showCallDuration(void)
- ?writeSoftRejectText@CpSettingsWrapper@@QAEHABVQString@@_N@Z @ 58 NONAME ; int CpSettingsWrapper::writeSoftRejectText(class QString const &, bool)
- ?setShowCallDuration@CpSettingsWrapper@@QAEH_N@Z @ 59 NONAME ; int CpSettingsWrapper::setShowCallDuration(bool)
- ?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 60 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *)
- ??_ECpSettingsWrapper@@UAE@I@Z @ 61 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(unsigned int)
- ??1CpPhoneLocalisation@@UAE@XZ @ 62 NONAME ; CpPhoneLocalisation::~CpPhoneLocalisation(void)
- ?progressNoteCanceled@CpPhoneNotes@@IAEXXZ @ 63 NONAME ; void CpPhoneNotes::progressNoteCanceled(void)
- ?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 64 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *, int)
- ??0CpPhoneNotes@@AAE@XZ @ 65 NONAME ; CpPhoneNotes::CpPhoneNotes(void)
- ?staticMetaObject@CpPhoneNotes@@2UQMetaObject@@B @ 66 NONAME ; struct QMetaObject const CpPhoneNotes::staticMetaObject
- ?tr@Tools@@SA?AVQString@@PBD0@Z @ 67 NONAME ; class QString Tools::tr(char const *, char const *)
- ?showGlobalProgressNote@CpPhoneNotes@@QAEXAAHABVQString@@@Z @ 68 NONAME ; void CpPhoneNotes::showGlobalProgressNote(int &, class QString const &)
- ?voipSupported@Tools@@SA_NXZ @ 69 NONAME ; bool Tools::voipSupported(void)
- ?qt_metacast@Tools@@UAEPAXPBD@Z @ 70 NONAME ; void * Tools::qt_metacast(char const *)
- ?trUtf8@CpPhoneNotes@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString CpPhoneNotes::trUtf8(char const *, char const *)
- ?readCenrepValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 72 NONAME ; class QVariant CpSettingsWrapper::readCenrepValue(long, unsigned long) const
- ?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 73 NONAME ; class QString Tools::trUtf8(char const *, char const *, int)
- ?getStaticMetaObject@CpPhoneLocalisation@@SAABUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const & CpPhoneLocalisation::getStaticMetaObject(void)
- ?tr@Tools@@SA?AVQString@@PBD0H@Z @ 75 NONAME ; class QString Tools::tr(char const *, char const *, int)
- ?noteShowing@CpPhoneNotes@@QAE_NXZ @ 76 NONAME ; bool CpPhoneNotes::noteShowing(void)
- ?removeTranslators@CpPhoneLocalisation@@QAEXXZ @ 77 NONAME ; void CpPhoneLocalisation::removeTranslators(void)
- ?passwordQueryCompleted@CpPhoneNotes@@IAEXVQString@@_N@Z @ 78 NONAME ; void CpPhoneNotes::passwordQueryCompleted(class QString, bool)
- ?showPasswordQueryDialog@CpPhoneNotes@@QAEXABVQString@@ABVQValidator@@H@Z @ 79 NONAME ; void CpPhoneNotes::showPasswordQueryDialog(class QString const &, class QValidator const &, int)
- ?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 80 NONAME ; class QString Tools::trUtf8(char const *, char const *)
- ??0CpSettingsWrapper@@QAE@PAVQObject@@@Z @ 81 NONAME ; CpSettingsWrapper::CpSettingsWrapper(class QObject *)
- ?forbiddenIconSupported@CpSettingsWrapper@@QBE_NXZ @ 82 NONAME ; bool CpSettingsWrapper::forbiddenIconSupported(void) const
+ ?tr@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 12 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *, int)
+ ?isOngoingCall@CpSettingsWrapper@@QBE_NXZ @ 13 NONAME ; bool CpSettingsWrapper::isOngoingCall(void) const
+ ?metaObject@Tools@@UBEPBUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const * Tools::metaObject(void) const
+ ?readSoftRejectText@CpSettingsWrapper@@QAEXAAVQString@@AA_N@Z @ 15 NONAME ; void CpSettingsWrapper::readSoftRejectText(class QString &, bool &)
+ ?getStaticMetaObject@CpSettingsWrapper@@SAABUQMetaObject@@XZ @ 16 NONAME ; struct QMetaObject const & CpSettingsWrapper::getStaticMetaObject(void)
+ ?metaObject@CpSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const * CpSettingsWrapper::metaObject(void) const
+ ?videoSupported@Tools@@SA_NXZ @ 18 NONAME ; bool Tools::videoSupported(void)
+ ?showCallDuration@CpSettingsWrapper@@QAE_NXZ @ 19 NONAME ; bool CpSettingsWrapper::showCallDuration(void)
+ ?isPhoneOffline@CpSettingsWrapper@@QBE_NXZ @ 20 NONAME ; bool CpSettingsWrapper::isPhoneOffline(void) const
+ ?errorCodeTextMapping@Tools@@SA_NHAAVQString@@@Z @ 21 NONAME ; bool Tools::errorCodeTextMapping(int, class QString &)
+ ?qt_metacall@CpPhoneLocalisation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 22 NONAME ; int CpPhoneLocalisation::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?writeVtVideoSending@CpSettingsWrapper@@QAEHH@Z @ 23 NONAME ; int CpSettingsWrapper::writeVtVideoSending(int)
+ ?readCenrepString@CpSettingsWrapper@@ABE?AVQString@@JK@Z @ 24 NONAME ; class QString CpSettingsWrapper::readCenrepString(long, unsigned long) const
+ ?writeSoftRejectText@CpSettingsWrapper@@QAEHABVQString@@_N@Z @ 25 NONAME ; int CpSettingsWrapper::writeSoftRejectText(class QString const &, bool)
+ ?setShowCallDuration@CpSettingsWrapper@@QAEH_N@Z @ 26 NONAME ; int CpSettingsWrapper::setShowCallDuration(bool)
+ ?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 27 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *)
+ ??1CpPhoneLocalisation@@UAE@XZ @ 29 NONAME ; CpPhoneLocalisation::~CpPhoneLocalisation(void)
+ ??_ECpSettingsWrapper@@UAE@I@Z @ 30 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(unsigned int)
+ ?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 31 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *, int)
+ ?trUtf8@CpPhoneLocalisation@@SA?AVQString@@PBD0@Z @ 32 NONAME ; class QString CpPhoneLocalisation::trUtf8(char const *, char const *)
+ ?tr@Tools@@SA?AVQString@@PBD0@Z @ 33 NONAME ; class QString Tools::tr(char const *, char const *)
+ ?voipSupported@Tools@@SA_NXZ @ 34 NONAME ; bool Tools::voipSupported(void)
+ ?staticMetaObject@CpPhoneLocalisation@@2UQMetaObject@@B @ 35 NONAME ; struct QMetaObject const CpPhoneLocalisation::staticMetaObject
+ ?qt_metacast@Tools@@UAEPAXPBD@Z @ 36 NONAME ; void * Tools::qt_metacast(char const *)
+ ?readCenrepValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 37 NONAME ; class QVariant CpSettingsWrapper::readCenrepValue(long, unsigned long) const
+ ?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString Tools::trUtf8(char const *, char const *, int)
+ ?getStaticMetaObject@CpPhoneLocalisation@@SAABUQMetaObject@@XZ @ 39 NONAME ; struct QMetaObject const & CpPhoneLocalisation::getStaticMetaObject(void)
+ ?tr@Tools@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString Tools::tr(char const *, char const *, int)
+ ?qt_metacall@CpSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 41 NONAME ; int CpSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??0CpPhoneLocalisation@@QAE@PAVQObject@@@Z @ 42 NONAME ; CpPhoneLocalisation::CpPhoneLocalisation(class QObject *)
+ ??_ECpPhoneLocalisation@@UAE@I@Z @ 43 NONAME ; CpPhoneLocalisation::~CpPhoneLocalisation(unsigned int)
+ ?removeTranslators@CpPhoneLocalisation@@QAEXXZ @ 44 NONAME ; void CpPhoneLocalisation::removeTranslators(void)
+ ?numberGroupingSupported@CpSettingsWrapper@@QBE_NXZ @ 45 NONAME ; bool CpSettingsWrapper::numberGroupingSupported(void) const
+ ?tr@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 46 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *)
+ ?isFeatureCallWaitingDistiquishNotProvisionedEnabled@CpSettingsWrapper@@QAE_NXZ @ 47 NONAME ; bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
+ ?writeCenrepValue@CpSettingsWrapper@@ABEHJKABVQVariant@@@Z @ 48 NONAME ; int CpSettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const
+ ?staticMetaObject@Tools@@2UQMetaObject@@B @ 49 NONAME ; struct QMetaObject const Tools::staticMetaObject
+ ?readVtVideoSending@CpSettingsWrapper@@QAEHXZ @ 50 NONAME ; int CpSettingsWrapper::readVtVideoSending(void)
+ ?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 51 NONAME ; class QString Tools::trUtf8(char const *, char const *)
+ ?staticMetaObject@CpSettingsWrapper@@2UQMetaObject@@B @ 52 NONAME ; struct QMetaObject const CpSettingsWrapper::staticMetaObject
+ ??0CpSettingsWrapper@@QAE@PAVQObject@@@Z @ 53 NONAME ; CpSettingsWrapper::CpSettingsWrapper(class QObject *)
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro Fri Jul 09 15:40:55 2010 +0300
@@ -16,7 +16,8 @@
TEMPLATE = lib
TARGET = cptelephonyutils
-CONFIG += hb
+CONFIG += hb mobility
+MOBILITY += systeminfo
MOC_DIR = moc
INCLUDEPATH += inc
@@ -24,11 +25,9 @@
# Input
HEADERS += inc/cpplugincommon.h \
- inc/cpphonenotes.h \
inc/cpphonelocalisation.h
-SOURCES += src/cpphonenotes.cpp \
- src/cpphonelocalisation.cpp
+SOURCES += src/cpphonelocalisation.cpp
symbian: {
SOURCES += src/cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def Fri Jul 09 15:40:55 2010 +0300
@@ -1,82 +1,53 @@
EXPORTS
- _ZN12CpPhoneNotes10cancelNoteEi @ 1 NONAME
- _ZN12CpPhoneNotes11noteShowingEv @ 2 NONAME
- _ZN12CpPhoneNotes11qt_metacallEN11QMetaObject4CallEiPPv @ 3 NONAME
- _ZN12CpPhoneNotes11qt_metacastEPKc @ 4 NONAME
- _ZN12CpPhoneNotes14showGlobalNoteERiRK7QStringN12HbMessageBox14MessageBoxTypeE @ 5 NONAME
- _ZN12CpPhoneNotes16staticMetaObjectE @ 6 NONAME DATA 16
- _ZN12CpPhoneNotes19getStaticMetaObjectEv @ 7 NONAME
- _ZN12CpPhoneNotes19passwordTextChangedEv @ 8 NONAME
- _ZN12CpPhoneNotes19showGlobalErrorNoteERii @ 9 NONAME
- _ZN12CpPhoneNotes20progressNoteCanceledEv @ 10 NONAME
- _ZN12CpPhoneNotes21launchNextNoteIfReadyEv @ 11 NONAME
- _ZN12CpPhoneNotes21showCallDivertDetailsERK21PSCallDivertingStatus @ 12 NONAME
- _ZN12CpPhoneNotes22activeNoteAboutToCloseEv @ 13 NONAME
- _ZN12CpPhoneNotes22passwordQueryCompletedE7QStringb @ 14 NONAME
- _ZN12CpPhoneNotes22showGlobalProgressNoteERiRK7QString @ 15 NONAME
- _ZN12CpPhoneNotes22showNotificationDialogERK7QString @ 16 NONAME
- _ZN12CpPhoneNotes23showPasswordQueryDialogERK7QStringRK10QValidatori @ 17 NONAME
- _ZN12CpPhoneNotes26handleProgressNoteCanceledEv @ 18 NONAME
- _ZN12CpPhoneNotes27finishedPasswordQueryDialogEP8HbAction @ 19 NONAME
- _ZN12CpPhoneNotes8instanceEv @ 20 NONAME
- _ZN12CpPhoneNotesC1Ev @ 21 NONAME
- _ZN12CpPhoneNotesC2Ev @ 22 NONAME
- _ZN12CpPhoneNotesD0Ev @ 23 NONAME
- _ZN12CpPhoneNotesD1Ev @ 24 NONAME
- _ZN12CpPhoneNotesD2Ev @ 25 NONAME
- _ZN17CpSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 26 NONAME
- _ZN17CpSettingsWrapper11qt_metacastEPKc @ 27 NONAME
- _ZN17CpSettingsWrapper16showCallDurationEv @ 28 NONAME
- _ZN17CpSettingsWrapper16staticMetaObjectE @ 29 NONAME DATA 16
- _ZN17CpSettingsWrapper18readSoftRejectTextER7QStringRb @ 30 NONAME
- _ZN17CpSettingsWrapper18readVtVideoSendingEv @ 31 NONAME
- _ZN17CpSettingsWrapper19getStaticMetaObjectEv @ 32 NONAME
- _ZN17CpSettingsWrapper19setShowCallDurationEb @ 33 NONAME
- _ZN17CpSettingsWrapper19writeSoftRejectTextERK7QStringb @ 34 NONAME
- _ZN17CpSettingsWrapper19writeVtVideoSendingEi @ 35 NONAME
- _ZN17CpSettingsWrapper51isFeatureCallWaitingDistiquishNotProvisionedEnabledEv @ 36 NONAME
- _ZN17CpSettingsWrapperC1EP7QObject @ 37 NONAME
- _ZN17CpSettingsWrapperC2EP7QObject @ 38 NONAME
- _ZN17CpSettingsWrapperD0Ev @ 39 NONAME
- _ZN17CpSettingsWrapperD1Ev @ 40 NONAME
- _ZN17CpSettingsWrapperD2Ev @ 41 NONAME
- _ZN19CpPhoneLocalisation11qt_metacallEN11QMetaObject4CallEiPPv @ 42 NONAME
- _ZN19CpPhoneLocalisation11qt_metacastEPKc @ 43 NONAME
- _ZN19CpPhoneLocalisation16staticMetaObjectE @ 44 NONAME DATA 16
- _ZN19CpPhoneLocalisation17installTranslatorENS_17TranslationFileIdE @ 45 NONAME
- _ZN19CpPhoneLocalisation17removeTranslatorsEv @ 46 NONAME
- _ZN19CpPhoneLocalisation19getStaticMetaObjectEv @ 47 NONAME
- _ZN19CpPhoneLocalisationC1EP7QObject @ 48 NONAME
- _ZN19CpPhoneLocalisationC2EP7QObject @ 49 NONAME
- _ZN19CpPhoneLocalisationD0Ev @ 50 NONAME
- _ZN19CpPhoneLocalisationD1Ev @ 51 NONAME
- _ZN19CpPhoneLocalisationD2Ev @ 52 NONAME
- _ZN5Tools11qt_metacallEN11QMetaObject4CallEiPPv @ 53 NONAME
- _ZN5Tools11qt_metacastEPKc @ 54 NONAME
- _ZN5Tools13voipSupportedEv @ 55 NONAME
- _ZN5Tools14videoSupportedEv @ 56 NONAME
- _ZN5Tools16staticMetaObjectE @ 57 NONAME DATA 16
- _ZN5Tools19getStaticMetaObjectEv @ 58 NONAME
- _ZN5Tools20errorCodeTextMappingEiR7QString @ 59 NONAME
- _ZNK12CpPhoneNotes10metaObjectEv @ 60 NONAME
- _ZNK12CpPhoneNotes17formatPhoneNumberE7QString @ 61 NONAME
- _ZNK17CpSettingsWrapper10metaObjectEv @ 62 NONAME
- _ZNK17CpSettingsWrapper13isOngoingCallEv @ 63 NONAME
- _ZNK17CpSettingsWrapper14isPhoneOfflineEv @ 64 NONAME
- _ZNK17CpSettingsWrapper15readCenrepValueElm @ 65 NONAME
- _ZNK17CpSettingsWrapper15readPubSubValueElm @ 66 NONAME
- _ZNK17CpSettingsWrapper16readCenrepStringElm @ 67 NONAME
- _ZNK17CpSettingsWrapper16writeCenrepValueElmRK8QVariant @ 68 NONAME
- _ZNK17CpSettingsWrapper23numberGroupingSupportedEv @ 69 NONAME
- _ZNK19CpPhoneLocalisation10metaObjectEv @ 70 NONAME
- _ZNK5Tools10metaObjectEv @ 71 NONAME
- _ZTI12CpPhoneNotes @ 72 NONAME
- _ZTI17CpSettingsWrapper @ 73 NONAME
- _ZTI19CpPhoneLocalisation @ 74 NONAME
- _ZTI5Tools @ 75 NONAME
- _ZTV12CpPhoneNotes @ 76 NONAME
- _ZTV17CpSettingsWrapper @ 77 NONAME
- _ZTV19CpPhoneLocalisation @ 78 NONAME
- _ZTV5Tools @ 79 NONAME
- _ZNK17CpSettingsWrapper22forbiddenIconSupportedEv @ 80 NONAME
+ _ZN17CpSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
+ _ZN17CpSettingsWrapper11qt_metacastEPKc @ 2 NONAME
+ _ZN17CpSettingsWrapper16showCallDurationEv @ 3 NONAME
+ _ZN17CpSettingsWrapper16staticMetaObjectE @ 4 NONAME DATA 16
+ _ZN17CpSettingsWrapper18readSoftRejectTextER7QStringRb @ 5 NONAME
+ _ZN17CpSettingsWrapper18readVtVideoSendingEv @ 6 NONAME
+ _ZN17CpSettingsWrapper19getStaticMetaObjectEv @ 7 NONAME
+ _ZN17CpSettingsWrapper19setShowCallDurationEb @ 8 NONAME
+ _ZN17CpSettingsWrapper19writeSoftRejectTextERK7QStringb @ 9 NONAME
+ _ZN17CpSettingsWrapper19writeVtVideoSendingEi @ 10 NONAME
+ _ZN17CpSettingsWrapper51isFeatureCallWaitingDistiquishNotProvisionedEnabledEv @ 11 NONAME
+ _ZN17CpSettingsWrapperC1EP7QObject @ 12 NONAME
+ _ZN17CpSettingsWrapperC2EP7QObject @ 13 NONAME
+ _ZN17CpSettingsWrapperD0Ev @ 14 NONAME
+ _ZN17CpSettingsWrapperD1Ev @ 15 NONAME
+ _ZN17CpSettingsWrapperD2Ev @ 16 NONAME
+ _ZN19CpPhoneLocalisation11qt_metacallEN11QMetaObject4CallEiPPv @ 17 NONAME
+ _ZN19CpPhoneLocalisation11qt_metacastEPKc @ 18 NONAME
+ _ZN19CpPhoneLocalisation16staticMetaObjectE @ 19 NONAME DATA 16
+ _ZN19CpPhoneLocalisation17installTranslatorENS_17TranslationFileIdE @ 20 NONAME
+ _ZN19CpPhoneLocalisation17removeTranslatorsEv @ 21 NONAME
+ _ZN19CpPhoneLocalisation19getStaticMetaObjectEv @ 22 NONAME
+ _ZN19CpPhoneLocalisationC1EP7QObject @ 23 NONAME
+ _ZN19CpPhoneLocalisationC2EP7QObject @ 24 NONAME
+ _ZN19CpPhoneLocalisationD0Ev @ 25 NONAME
+ _ZN19CpPhoneLocalisationD1Ev @ 26 NONAME
+ _ZN19CpPhoneLocalisationD2Ev @ 27 NONAME
+ _ZN5Tools11qt_metacallEN11QMetaObject4CallEiPPv @ 28 NONAME
+ _ZN5Tools11qt_metacastEPKc @ 29 NONAME
+ _ZN5Tools13voipSupportedEv @ 30 NONAME
+ _ZN5Tools14videoSupportedEv @ 31 NONAME
+ _ZN5Tools16staticMetaObjectE @ 32 NONAME DATA 16
+ _ZN5Tools19getStaticMetaObjectEv @ 33 NONAME
+ _ZN5Tools20errorCodeTextMappingEiR7QString @ 34 NONAME
+ _ZNK17CpSettingsWrapper10metaObjectEv @ 35 NONAME
+ _ZNK17CpSettingsWrapper13isOngoingCallEv @ 36 NONAME
+ _ZNK17CpSettingsWrapper14isPhoneOfflineEv @ 37 NONAME
+ _ZNK17CpSettingsWrapper15readCenrepValueElm @ 38 NONAME
+ _ZNK17CpSettingsWrapper15readPubSubValueElm @ 39 NONAME
+ _ZNK17CpSettingsWrapper16readCenrepStringElm @ 40 NONAME
+ _ZNK17CpSettingsWrapper16writeCenrepValueElmRK8QVariant @ 41 NONAME
+ _ZNK17CpSettingsWrapper22forbiddenIconSupportedEv @ 42 NONAME
+ _ZNK17CpSettingsWrapper23numberGroupingSupportedEv @ 43 NONAME
+ _ZNK19CpPhoneLocalisation10metaObjectEv @ 44 NONAME
+ _ZNK5Tools10metaObjectEv @ 45 NONAME
+ _ZTI17CpSettingsWrapper @ 46 NONAME
+ _ZTI19CpPhoneLocalisation @ 47 NONAME
+ _ZTI5Tools @ 48 NONAME
+ _ZTV17CpSettingsWrapper @ 49 NONAME
+ _ZTV19CpPhoneLocalisation @ 50 NONAME
+ _ZTV5Tools @ 51 NONAME
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpphonenotes.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2009 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:
- *
- */
-#ifndef CPPHONENOTES_H
-#define CPPHONENOTES_H
-
-#include <QObject>
-#include <QString>
-#include <QQueue>
-#include <hbmessagebox.h>
-#include <psetcalldivertingwrapper.h>
-#include "cptelephonyutilsdefs.h"
-
-class CpSettingsWrapper;
-class HbInputDialog;
-class QValidator;
-
-using namespace CpTelephonyUtils;
-
-class CPTELEPHONYUTILS_EXPORT CpPhoneNotes: public QObject
-{
- Q_OBJECT
-
-public:
-
- static CpPhoneNotes* instance();
-
-private:
-
- CpPhoneNotes();
-
- ~CpPhoneNotes();
-
- Q_DISABLE_COPY(CpPhoneNotes)
-
-signals:
-
- /**
- This signal is emitted when the device progress dialog is cancelled by
- user pressing the "cancel" button or by the application itself.
- @param noteId On return contains unique note identifier.
- */
- void progressNoteCanceled();
-
- /**
- This signal is emitted when the user coplete password query.
- @param password On return contains user given password.
- @param ok True if the user pressed OK, false if the user
- pressed Cancel.
- */
- void passwordQueryCompleted(
- QString password,
- bool okPressed);
-
-public slots: // Slots:
-
- /**
- Shows global progress note. Note showing may be delayed if other note
- showing is ongoing.
- @param noteId On return contains unique note identifier.
- @param text Text to show on a note.
- */
- void showGlobalProgressNote(int ¬eId, const QString& text);
-
- /**
- Shows global note. Note showing may be delayed if other note
- showing is ongoing.
- @param noteId On return contains unique note identifier.
- @param text Text to show on a note.
- @param noteType Note type.
- */
- void showGlobalNote(int ¬eId, const QString& text,
- HbMessageBox::MessageBoxType noteType);
-
- /**
- Shows global error note. Note showing may be delayed if other note
- showing is ongoing.
- @param noteId On return contains unique note identifier.
- @param errorCode Code specifying error situation.
- */
- void showGlobalErrorNote(int ¬eId, int errorCode);
-
-
- /**
- Shows detailed call divert information about the selected divert service
- group.
- @param divertStatus Divert status information.
- */
- void showCallDivertDetails(
- const PSCallDivertingStatus &divertStatus);
-
- /**
- Shows password query dialog with OK & Cancel buttons and returns user
- given password unless user has canceled query. Only valid password is
- accepted.
- @param title Title for the query dialog.
- @param validator Password validator.
- @param maxPasswordLength Maximum length for the password.
- */
- void showPasswordQueryDialog(
- const QString &title,
- const QValidator &validator,
- int maxPasswordLength);
-
- /**
- Cancels specified note.
- @param noteId Note identifier.
- */
- void cancelNote(int noteId);
-
- /**
- Retuns true if note is currently shown.
- */
- bool noteShowing();
-
- /**
- Slot for HbDialog finished singal.
- */
- void finishedPasswordQueryDialog(HbAction* action);
-
- /**
- Shows notification dialog.
- @param text Text to show on a dialog.
- */
- void showNotificationDialog(const QString& text);
-
-private:
-
- /**
- Formats phone number according to locale specific rules.
- @param number Unformatted phone number.
- @return Formatted number.
- */
- QString formatPhoneNumber(QString number) const;
-
- /**
- Launches next note in the queue if not busy with showing other
- note currently.
- */
- void launchNextNoteIfReady();
-
-private slots:
-
- /**
- Handler method for notes' about to close signal.
- */
- void activeNoteAboutToClose();
-
- /**
- Handler method for notes' canceled signal.
- */
- void handleProgressNoteCanceled();
-
- /**
- Used for dynamic enable/disable of password dialog's OK button according
- to validity of the currently inputted password.
- */
- void passwordTextChanged();
-
-private: // Data:
-
- /**
- Cenrep settings wrapper.
- */
- CpSettingsWrapper *m_cpSettingsWrapper;
-
- /**
- Notes waiting to be shown.
- */
- QQueue<QObject*> *m_notesQueue;
-
- /**
- Indicates whether note controller is busy with some note showing.
- */
- bool m_isNoteShowingOngoing;
-
- /**
- Password query dialog. Own.
- */
- HbInputDialog *m_passwordDialog;
-
- /**
- Password validator. Not own.
- */
- const QValidator *m_passwordValidator;
-};
-#endif // CPPHONENOTES_H
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h Fri Jul 09 15:40:55 2010 +0300
@@ -19,11 +19,13 @@
#define CPPLUGINCOMMON_H
#include <qvariant.h>
+#include <qsysteminfo.h>
#include "cptelephonyutilsdefs.h"
class XQSettingsManager;
using namespace CpTelephonyUtils;
+using namespace QtMobility;
/*!
\class Tools
@@ -133,7 +135,9 @@
private: // Data
// Own
- XQSettingsManager* m_Settings;
+ XQSettingsManager *m_settings;
+
+ QSystemDeviceInfo *m_deviceInfo;
};
#endif // CPPLUGINCOMMON_H
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpphonenotes.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,444 +0,0 @@
-/*
- * Copyright (c) 2009 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:
- *
- */
-#include "cpphonenotes.h"
-#include "cpplugincommon.h"
-#include "cppluginlogging.h"
-#include <hbdevicemessagebox.h>
-#include <HbDeviceProgressDialog>
-#include <hblistview.h>
-#include <hbdialog.h>
-#include <hblabel.h>
-#include <hbaction.h>
-#include <hbmessagebox.h>
-#include <hbnotificationdialog.h>
-#include <QStandardItemModel>
-#include <QItemSelectionModel>
-#include <hbstringutil.h>
-#include <hbextendedlocale.h>
-#include <HbInputDialog>
-#include <HbEditorInterface>
-#include <hbinputdef.h>
-#include <hbinputstandardfilters.h>
-
-/*!
- CpPhoneNotes::instance.
- */
-CpPhoneNotes* CpPhoneNotes::instance()
-{
- DPRINT << ": IN";
-
- static CpPhoneNotes theInstance;
-
- DPRINT << ", instance address: " << reinterpret_cast<int>(&theInstance);
- return &theInstance;
-}
-
-/*!
- CpPhoneNotes::CpPhoneNotes.
- */
-CpPhoneNotes::CpPhoneNotes():
- QObject(NULL),
- m_notesQueue(NULL),
- m_isNoteShowingOngoing(false),
- m_passwordDialog(NULL),
- m_passwordValidator(NULL)
- {
- DPRINT << ": IN";
-
- m_notesQueue = new QQueue<QObject*>();
- m_cpSettingsWrapper = new CpSettingsWrapper;
-
- DPRINT << ": OUT";
- }
-
-/*!
- CpPhoneNotes::~CpPhoneNotes.
- */
-CpPhoneNotes::~CpPhoneNotes()
-{
- DPRINT << ": IN";
-
- delete m_cpSettingsWrapper;
- qDeleteAll(*m_notesQueue);
- delete m_notesQueue;
-
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::showGlobalProgressNote.
- */
-void CpPhoneNotes::showGlobalProgressNote(
- int ¬eId, const QString& text)
-{
- DPRINT << ": IN";
-
- HbDeviceProgressDialog *note =
- new HbDeviceProgressDialog(HbProgressDialog::WaitDialog, this);
- note->setText(text);
-
- if(hbTrId("txt_common_info_requesting") == text){
- QAction *action = new QAction(hbTrId("txt_common_button_hide"), note);
- note->setAction(action, HbDeviceProgressDialog::CancelButtonRole );
- }
-
- noteId = reinterpret_cast<int>(note);
- DPRINT << ", NOTEID: " << noteId;
- QObject::connect(
- note, SIGNAL(aboutToClose()),
- this, SLOT(activeNoteAboutToClose()));
- QObject::connect(
- note, SIGNAL(cancelled()),
- this, SLOT(handleProgressNoteCanceled()));
- m_notesQueue->enqueue(note);
- launchNextNoteIfReady();
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::showGlobalNote.
- */
-void CpPhoneNotes::showGlobalNote(int ¬eId, const QString& text,
- HbMessageBox::MessageBoxType messageBoxType)
-{
- DPRINT << ": IN";
-
- HbDeviceMessageBox *note
- = new HbDeviceMessageBox(text, messageBoxType, this);
- if (messageBoxType == HbMessageBox::MessageTypeQuestion ||
- messageBoxType == HbMessageBox::MessageTypeInformation) {
- note->setTimeout(HbPopup::ConfirmationNoteTimeout);
- }
- else {
- note->setTimeout(0);
- }
- noteId = reinterpret_cast<int>(note);
- DPRINT << ", NOTEID: " << noteId;
-
- QObject::connect(
- note, SIGNAL(aboutToClose()),
- this, SLOT(activeNoteAboutToClose()));
-
- m_notesQueue->enqueue(note);
- launchNextNoteIfReady();
-
- DPRINT << ": OUT";
-}
-
-
-/*!
- CpPhoneNotes::cancelNote.
- */
-void CpPhoneNotes::cancelNote(int noteId)
-{
- DPRINT << ": IN";
-
- if (!m_notesQueue->isEmpty()) {
- QObject *note = m_notesQueue->head();
- if(note == reinterpret_cast<QObject *>(noteId)) {
- int index = m_notesQueue->indexOf(reinterpret_cast<QObject *>(noteId));
- Q_ASSERT(-1 < index);
- QObject *note = m_notesQueue->at(index);
- DPRINT << ": NOTEID: " << noteId;
- if (qobject_cast<HbDeviceProgressDialog *>(note)) {
- static_cast<HbDeviceProgressDialog *>(note)->close();
- } else if (qobject_cast<HbDeviceMessageBox *>(note)) {
- static_cast<HbDeviceMessageBox *>(note)->close();
- } else {
- DPRINT << ", UNKNOWN NOTE";
- Q_ASSERT(false);
- }
- }
- else {
- DPRINT << ": remove from queue, noteId: " << noteId;
- m_notesQueue->removeOne(reinterpret_cast<QObject *>(noteId));
- }
- }
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::noteShowing.
- */
-bool CpPhoneNotes::noteShowing()
-{
- return !m_notesQueue->isEmpty();
-}
-
-/*!
- CpPhoneNotes::showGlobalErrorNote.
- */
-void CpPhoneNotes::showGlobalErrorNote(int ¬eId, int errorcode)
-{
- DPRINT << ": IN";
-
- QString errorText = "";
- Tools::errorCodeTextMapping(errorcode, errorText);
-
- HbDeviceMessageBox *note
- = new HbDeviceMessageBox(errorText, HbMessageBox::MessageTypeWarning, this);
- note->setTimeout(0);
- noteId = reinterpret_cast<int>(note);
- DPRINT << ", NOTEID: " << noteId;
- QObject::connect(
- note, SIGNAL(aboutToClose()),
- this, SLOT(activeNoteAboutToClose()));
- m_notesQueue->enqueue(note);
- launchNextNoteIfReady();
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::showCallDivertDetails.
- */
-void CpPhoneNotes::showCallDivertDetails(
- const PSCallDivertingStatus &divertStatus)
-{
- DPRINT << ": IN";
-
- QScopedPointer<HbMessageBox> divertInfoScopedPointer(
- new HbMessageBox(HbMessageBox::MessageTypeInformation));
- divertInfoScopedPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
- // TODO: Orbit layout support is insufficient currently and all text
- // is not shown.
- QString content = "";
- content.append(hbTrId("txt_phone_info_number"));
- content.append(formatPhoneNumber(divertStatus.iNumber));
- if (0 < divertStatus.iTimeout) {
- content.append(hbTrId("txt_phone_setlabel_delay"));
- content.append(QString::number(divertStatus.iTimeout));
- content.append(hbTrId(" seconds"));
- }
- divertInfoScopedPointer->setText(content);
- HbAction *backAction = new HbAction(
- hbTrId("txt_common_button_back"),
- divertInfoScopedPointer.data());
- divertInfoScopedPointer->addAction(backAction);
-
- HbMessageBox *divertInfo = divertInfoScopedPointer.take();
- QObject::connect(
- divertInfo, SIGNAL(finished(HbAction*)),
- divertInfo, SLOT(deleteLater()));
- divertInfo->show();
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::showPasswordQueryDialog.
- */
-void CpPhoneNotes::showPasswordQueryDialog(
- const QString &title,
- const QValidator &validator,
- int maxPasswordLength)
-{
- DPRINT << ": IN";
-
- QScopedPointer<HbInputDialog> passwordDialog(new HbInputDialog());
-
- // configure editor so that only digits can be inputted
- passwordDialog->setPromptText(title);
- passwordDialog->setEchoMode(HbLineEdit::Password);
- passwordDialog->setInputMethodHints(Qt::ImhDigitsOnly);
- passwordDialog->actions().at(0)->setEnabled(false);
-
- HbLineEdit *hbLineEdit = passwordDialog->lineEdit();
- hbLineEdit->setMaxLength(maxPasswordLength);
-
- HbEditorInterface editorInterface(hbLineEdit);
- editorInterface.setMode(HbInputModeNumeric);
- editorInterface.setInputConstraints(HbEditorConstraintFixedInputMode);
- editorInterface.setFilter(HbDigitsOnlyFilter::instance());
-
- m_passwordValidator = &validator;
-
- connect(
- hbLineEdit, SIGNAL(contentsChanged()),
- this, SLOT(passwordTextChanged()));
-
- passwordDialog->open(this, SLOT(finishedPasswordQueryDialog(HbAction*)));
- if(m_passwordDialog) {
- m_passwordDialog->deleteLater();
- m_passwordDialog = NULL;
- }
- m_passwordDialog = passwordDialog.take();
- m_passwordDialog->setParent(this);
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::finishedPasswordQueryDialog.
- */
-void CpPhoneNotes::finishedPasswordQueryDialog(HbAction* action)
-{
- bool ok;
- QString password;
- if(m_passwordDialog) {
- if (action == m_passwordDialog->actions().at(1)) {
- ok = false;
- } else {
- ok = true;
- password = m_passwordDialog->value().toString();
- }
-
- disconnect(
- m_passwordDialog->lineEdit(), SIGNAL(contentsChanged()),
- this, SLOT(passwordTextChanged()));
-
- m_passwordDialog->deleteLater();
- m_passwordDialog = NULL;
- m_passwordValidator = NULL;
-
- emit passwordQueryCompleted(password, ok);
- }
-}
-
-/*!
- CpPhoneNotes::formatPhoneNumber.
- Formats phone number according to locale specific rules.
- */
-QString CpPhoneNotes::formatPhoneNumber(QString number) const
-{
- DPRINT << ": IN";
-
- QString formattedNumber = number;
-
- if (m_cpSettingsWrapper->numberGroupingSupported() == true) {
- // TODO: utilize HbNumberGrouping API when available
- }
-
- // TODO: digit conversion e.g. into arabic-indic
-// HbExtendedLocale locale = HbExtendedLocale::system();
-// HbStringUtil::convertDigitsTo(formattedNumber, ArabicIndicDigit);
-
- DPRINT << ": OUT";
-
- return formattedNumber;
-}
-
-/*!
- CpPhoneNotes::launchNextNoteIfReady.
- */
-void CpPhoneNotes::launchNextNoteIfReady()
-{
- DPRINT << ": IN";
-
- if (m_notesQueue->isEmpty()) {
- DPRINT << ", QUEUE EMPTY";
- return;
- }
- if (!m_isNoteShowingOngoing) {
- m_isNoteShowingOngoing = true;
- // note is left in the queue so that it can be cancelled at request
- QObject *note = m_notesQueue->head();
- DPRINT << ", note: " << reinterpret_cast<int>(note);
- if (qobject_cast<HbDeviceProgressDialog *>(note)) {
- DPRINT << ", show HbDeviceProgressDialog";
- static_cast<HbDeviceProgressDialog *>(note)->show();
- } else if (qobject_cast<HbDeviceMessageBox *>(note)) {
- DPRINT << ", show HbDeviceMessageBox";
- static_cast<HbDeviceMessageBox *>(note)->show();
- } else {
- DPRINT << ", UNKNOWN NOTE";
- Q_ASSERT(false);
- }
- } else {
- DPRINT << ", BUSY";
- }
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::activeNoteAboutToClose.
- */
-void CpPhoneNotes::activeNoteAboutToClose()
-{
- DPRINT << ": IN";
-
- if (m_isNoteShowingOngoing) {
- m_isNoteShowingOngoing = false;
- QObject* note(NULL);
- if (!m_notesQueue->isEmpty()) {
- note = m_notesQueue->dequeue();
- }
- if(note) {
- launchNextNoteIfReady();
- note->disconnect(this);
- DPRINT << ", delete note: " << reinterpret_cast<int>(note);
- HbDeviceProgressDialog *pNote =
- qobject_cast<HbDeviceProgressDialog *>(note);
- note->deleteLater();
- }
- }
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::handleProgressNoteCanceled().
- */
-void CpPhoneNotes::handleProgressNoteCanceled()
-{
- DPRINT << ": IN";
-
- emit progressNoteCanceled();
-
- DPRINT << ": OUT";
-}
-
-/*!
- CpPhoneNotes::passwordTextChanged().
- */
-void CpPhoneNotes::passwordTextChanged()
-{
- DPRINT << ": IN";
- Q_ASSERT(m_passwordDialog && m_passwordValidator);
-
- HbLineEdit *hbLineEdit = m_passwordDialog->lineEdit();
- int position = 0;
- QString password = hbLineEdit->text();
- bool isPasswordValid =
- (QValidator::Acceptable == m_passwordValidator->validate(
- password, position));
- m_passwordDialog->actions().at(0)->setEnabled(isPasswordValid);
-
- DPRINT << ": OUT";
-}
-
-
-/*!
- CpPhoneNotes::showNotificationDialog.
- */
-void CpPhoneNotes::showNotificationDialog(const QString& text)
-{
- DPRINT << ": IN";
- HbNotificationDialog *notifDialog = new HbNotificationDialog();
- notifDialog->setDismissPolicy(HbPopup::TapAnywhere);
- notifDialog->setAttribute(Qt::WA_DeleteOnClose, true);
- notifDialog->setText(text);
- notifDialog->show();
-
- DPRINT << ": OUT";
-}
-
-// End of File.
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -136,14 +136,17 @@
}
CpSettingsWrapper::CpSettingsWrapper(QObject *parent):
- QObject(parent)
+ QObject(parent),
+ m_settings(NULL),
+ m_deviceInfo(NULL)
{
- m_Settings = new XQSettingsManager();
+ m_settings = new XQSettingsManager(this);
+ m_deviceInfo = new QSystemDeviceInfo(this);
}
CpSettingsWrapper::~CpSettingsWrapper()
{
- delete m_Settings;
+
}
bool CpSettingsWrapper::showCallDuration()
@@ -226,7 +229,7 @@
const long int uid, const unsigned long int key) const
{
XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, uid, key);
- QVariant ret = m_Settings->readItemValue(settingsKey);
+ QVariant ret = m_settings->readItemValue(settingsKey);
DPRINT << "ret: " << ret;
return ret;
}
@@ -235,7 +238,7 @@
const long int uid, const unsigned long int key) const
{
XQSettingsKey settingsKey(XQSettingsKey::TargetPublishAndSubscribe, uid, key);
- QVariant ret = m_Settings->readItemValue(settingsKey);
+ QVariant ret = m_settings->readItemValue(settingsKey);
DPRINT << "PubSub ret: " << ret;
return ret;
}
@@ -244,7 +247,7 @@
const long int uid, const unsigned long int key) const
{
XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, uid, key);
- QString text = m_Settings->readItemValue(settingsKey, XQSettingsManager::TypeString).toString();
+ QString text = m_settings->readItemValue(settingsKey, XQSettingsManager::TypeString).toString();
DPRINT << "text: " << text;
return text;
}
@@ -254,7 +257,7 @@
{
DPRINT << "uid:" << uid << ", key:" << key << ", settingsKeyValue:" << settingsKeyValue;
XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, uid, key);
- int err = m_Settings->writeItemValue(settingsKey, settingsKeyValue );
+ int err = m_settings->writeItemValue(settingsKey, settingsKeyValue );
DPRINT << "err: " << err;
return err;
}
@@ -268,13 +271,7 @@
bool CpSettingsWrapper::isPhoneOffline() const
{
- bool offLinesupport(false);
- if (XQSysInfo::isSupported(KFeatureIdOfflineMode)) {
- offLinesupport = !readCenrepValue(
- KCRUidCoreApplicationUIs.iUid,
- KCoreAppUIsNetworkConnectionAllowed).toBool();
- }
- return offLinesupport;
+ return QSystemDeviceInfo::OfflineProfile == m_deviceInfo->currentProfile();
}
bool CpSettingsWrapper::isOngoingCall() const
@@ -286,4 +283,3 @@
}
return callOngoing;
}
-
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/qtestmains60ui.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#include <hbapplication.h>
-#include <hbmainwindow.h>
-
-char *new_argv[3];
-HbMainWindow *mainWindow;
-#define QTEST_MAIN_S60UI(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-HbApplication app(argc, argv); \
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray bytes = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-QResource::registerResource("../hbcore.rcc"); \
-mainWindow = new HbMainWindow;\
-mainWindow->show(); \
-int ret = QTest::qExec(&tc, 3, new_argv); \
-delete mainWindow; \
-return ret; \
-}
-
-#endif
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/ut_cpphonenotes.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#include "ut_cpphonenotes.h"
-#include "qtestmains60ui.h"
-#include <hbmainwindow.h>
-#include <HbDeviceMessageBox.h>
-#include <HbMessageBox.h>
-#include <hbnotificationdialog.h>
-#define private public
-#include "cpphonenotes.h"
-
-/*!
- UT_CpPhoneNotes::UT_CpPhoneNotes
- */
-UT_CpPhoneNotes::UT_CpPhoneNotes()
-{
- CpPhoneNotes::instance();
-}
-
-/*!
- UT_CpPhoneNotes::~UT_CpPhoneNotes
- */
-UT_CpPhoneNotes::~UT_CpPhoneNotes()
-{
- //delete m_psui;
-}
-
-/*!
- UT_CpPhoneNotes::timerEvent
- */
-void UT_CpPhoneNotes::timerEvent( QTimerEvent* event )
-{
- QString currentTest(QTest::currentTestFunction());
- qDebug() << "timerEvent:" << currentTest;
-
- if (currentTest == "t_showGlobalErrorNote") {
- verifyGlobalNote(wantedNoteText);
- }
-
- if (m_noteid1) {
- CpPhoneNotes::instance()->cancelNote(m_noteid1);
- m_noteid1 = 0;
- }
- if (m_noteid2) {
- CpPhoneNotes::instance()->cancelNote(m_noteid2);
- m_noteid2 = 0;
- }
- if (m_noteid3) {
- CpPhoneNotes::instance()->cancelNote(m_noteid3);
- m_noteid3 = 0;
- }
-
- if (visibleDialog()) {
- visibleDialog()->close();
- QTest::qWait(1);
- }
-
-}
-
-/*!
- UT_CpPhoneNotes::visibleDialog
- */
-HbDialog *UT_CpPhoneNotes::visibleDialog()
-{
- QList<QGraphicsItem*> items = mainWindow->scene()->items();
- foreach (QGraphicsItem* item, items) {
- HbDialog *w = qobject_cast<HbDialog*>(item->parentWidget());
- if (w && w->isVisible()) {
- qDebug() << "visibleDialog: " << w->getStaticMetaObject().className() <<
- "contentWidget: " << w->contentWidget()->getStaticMetaObject().className();
- return w;
- }
- }
-
- return 0;
-}
-
-/*!
- UT_CpPhoneNotes::verifyGlobalNote
- */
-void UT_CpPhoneNotes::verifyGlobalNote( const QString& noteText )
-{
- qDebug() << "verifyGlobalNote:" << noteText;
- HbDeviceMessageBox *note=0;
- QObject* o=0;
- QVERIFY(CpPhoneNotes::instance()->m_notesQueue->count());
- QVERIFY(o = CpPhoneNotes::instance()->m_notesQueue->at(0));
- QVERIFY(note = qobject_cast<HbDeviceMessageBox *>(o));
- QCOMPARE(note->text(), noteText);
- note->close();
- QTest::qWait(1);
-}
-
-/*!
- UT_CpPhoneNotes::init
- */
-void UT_CpPhoneNotes::init()
-{
- initialize();
- timerid = startTimer(3000);
- m_noteid1 = 0;
- m_noteid2 = 0;
- m_noteid3 = 0;
-}
-
-/*!
- UT_CpPhoneNotes::cleanup
- */
-void UT_CpPhoneNotes::cleanup()
-{
- reset();
- if (timerid) {
- killTimer(timerid);
- timerid = 0;
- }
-}
-
-/*!
- UT_CpPhoneNotes::t_memleak
- */
-void UT_CpPhoneNotes::t_memleak()
-{
-
-}
-
-/*!
- UT_CpPhoneNotes::t_showNotificationDialog
- */
-void UT_CpPhoneNotes::t_showNotificationDialog()
-{
- CpPhoneNotes::instance()->showNotificationDialog("NotificationDialog");
-}
-
-/*!
- UT_CpPhoneNotes::t_showProgressNote
- */
-void UT_CpPhoneNotes::t_showProgressNote()
-{
- CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "testshowProgressNote1");
- QTest::qWait(5000);
- CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid2, "testshowProgressNote2");
- QTest::qWait(5000);
-}
-
-/*!
- UT_CpPhoneNotes::t_showGlobalProgressNote
- */
-void UT_CpPhoneNotes::t_showGlobalProgressNote()
-{
- CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "testshowGPN");
- QTest::qWait(5000);
- CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid2,
- hbTrId("txt_common_info_requesting"));
- QTest::qWait(5000);
-}
-
-/*!
- UT_CpPhoneNotes::t_showGlobalNote
- */
-void UT_CpPhoneNotes::t_showGlobalNote()
-{
- CpPhoneNotes::instance()->showGlobalNote(m_noteid1, "MessageTypeQuestion",HbMessageBox::MessageTypeQuestion );
- CpPhoneNotes::instance()->showGlobalNote(m_noteid2, "MessageTypeInformation",HbMessageBox::MessageTypeInformation);
- CpPhoneNotes::instance()->showGlobalNote(m_noteid3, "MessageTypeWarning",HbMessageBox::MessageTypeWarning );
-
-}
-
-/*!
- UT_CpPhoneNotes::t_showGlobalErrorNote
- */
-void UT_CpPhoneNotes::t_showGlobalErrorNote()
-{
- int errorcode = -1;
- wantedNoteText = "";
- expect("Tools::errorCodeTextMapping").with(errorcode,wantedNoteText).returns(true);
- CpPhoneNotes::instance()->showGlobalErrorNote(m_noteid1, errorcode );
- QVERIFY( verify() );
-
-}
-
-
-/*!
- UT_CpPhoneNotes::t_showCallDivertDetails
- */
-void UT_CpPhoneNotes::t_showCallDivertDetails()
-{
- expect("CpSettingsWrapper::numberGroupingSupported").returns(QVariant(true));
- PSCallDivertingStatus status;
- CpPhoneNotes::instance()->showCallDivertDetails(status);
- QVERIFY( verify() );
-
- expect("CpSettingsWrapper::numberGroupingSupported").returns(QVariant(false));
- status.iTimeout = 30;
- CpPhoneNotes::instance()->showCallDivertDetails(status);
- QVERIFY( verify() );
-}
-
-/*!
- UT_CpPhoneNotes::t_showPasswordQueryDialog
- */
-void UT_CpPhoneNotes::t_showPasswordQueryDialog()
-{
- QString queryTitle("Password query title");
- QString password = "";
- bool okPressed = false;
- QRegExp regExpression("\\d{4}");
- QRegExpValidator validator(regExpression, this);
- CpPhoneNotes::instance()->showPasswordQueryDialog(
- queryTitle, validator, 5);
-
-}
-
-
-/*!
- UT_CpPhoneNotes::t_cancelNote
- */
-void UT_CpPhoneNotes::t_cancelNote()
-{
- CpPhoneNotes::instance()->cancelNote(m_noteid1);
- CpPhoneNotes::instance()->showGlobalProgressNote(m_noteid1, "testcancelNote");
- CpPhoneNotes::instance()->noteShowing();
- CpPhoneNotes::instance()->cancelNote(m_noteid1);
-
- QTest::qWait(5000);
-}
-
-QTEST_MAIN_S60UI(UT_CpPhoneNotes)
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/ut_cpphonenotes.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#ifndef UT_PSUI2NOTECONTROLLER_H
-#define UT_PSUI2NOTECONTROLLER_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-#include <etelmm.h>
-#include <psetcalldivertingwrapper.h>
-
-class HbDialog;
-
-class UT_CpPhoneNotes : public QObject, MockService
-{
- Q_OBJECT
-
-public:
- UT_CpPhoneNotes();
- ~UT_CpPhoneNotes();
-
-private: // From QObject
- void timerEvent( QTimerEvent* event );
-
-private: // Tools
- HbDialog *visibleDialog();
- void verifyGlobalNote( const QString& noteText );
- void appendAllEtelServices(QList<PSCallDivertingStatus*>& list);
- void appendService(
- QList<PSCallDivertingStatus*>& list,
- RMobilePhone::TMobileService service);
-
-private slots:
-
- void init();
- void cleanup();
-
- void t_memleak();
-
- void t_showProgressNote();
- void t_showGlobalProgressNote();
- void t_showGlobalNote();
- void t_showGlobalErrorNote();
- void t_showCallDivertDetails();
- void t_showPasswordQueryDialog();
- void t_cancelNote();
- void t_showNotificationDialog();
-
-private:
- int m_noteid1;
- int m_noteid2;
- int m_noteid3;
- int timerid;
- QString wantedNoteText;
-
-};
-
-#endif // UT_PSUI2NOTECONTROLLER_H
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/ut_cpphonenotes.pro Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2009 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:
-#
-
-
-CONFIG += hb qtestlib
-TEMPLATE = app
-TARGET =
-DEPENDPATH += . ../../src/
-INCLUDEPATH += . ../../inc/
-DEFINES += BUILD_CPTELEPHONYUTILS
-
-QT -= gui
-QT += testlib
-
-symbian: {
- INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
- LIBS += -lmocklib -lsymbianmock
-}
-
-# test code
-HEADERS += ut_cpphonenotes.h
-SOURCES += ut_cpphonenotes.cpp
-
-# code to be tested
-HEADERS += ../../inc/cpphonenotes.h \
- ../../inc/cptelephonyutilsdefs.h \
- ../../inc/cpplugincommon.h
-
-SOURCES += ../../src/cpphonenotes.cpp # \
-# ../../src/cpphonenotes_p.cpp
-
-# mocks needed for testing
-SOURCES += ../../../tsrc/mocks/mock_cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -15,14 +15,15 @@
*
*/
-#include "ut_cpplugincommon.h"
-#include "qtestmains60.h"
+#include <xqsettingsmanager.h>
+#include <xqsysinfo.h>
#include <gsmerror.h>
#include <exterror.h>
#include <etelmm.h>
#include <btsapdomainpskeys.h>
-#define private public
+#include "ut_cpplugincommon.h"
#include "cpplugincommon.h"
+#include "qtestmains60.h"
/*!
UT_CpPluginCommon::UT_CpPluginCommon
@@ -74,7 +75,7 @@
*/
void UT_CpPluginCommon::t_showCallDuration()
{
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(23324));
mWrapper->showCallDuration();
@@ -98,18 +99,18 @@
{
QString text="";
bool userDefined=true;
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(true));
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant("text"));
mWrapper->readSoftRejectText(text, userDefined);
userDefined=false;
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(false));
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant("text"));
mWrapper->readSoftRejectText(text, userDefined);
@@ -134,7 +135,7 @@
*/
void UT_CpPluginCommon::t_numberGroupingSupported()
{
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(true));
mWrapper->numberGroupingSupported();
@@ -147,10 +148,10 @@
void UT_CpPluginCommon::t_voipSupported()
{
- expect("XQSysInfo::isSupported").with(
+ EXPECT(XQSysInfo::isSupported).with(
KFeatureIdCommonVoip).returns(false);
QCOMPARE( Tools::voipSupported(), false );
- expect("XQSysInfo::isSupported").with(
+ EXPECT(XQSysInfo::isSupported).with(
KFeatureIdCommonVoip).returns(true);
QCOMPARE( Tools::voipSupported(), true );
@@ -162,10 +163,10 @@
*/
void UT_CpPluginCommon::t_videoSupported()
{
- expect("XQSysInfo::isSupported").with(
+ EXPECT(XQSysInfo::isSupported).with(
KFeatureIdCsVideoTelephony).returns(true);
QCOMPARE( Tools::videoSupported(), true );
- expect("XQSysInfo::isSupported").with(
+ EXPECT(XQSysInfo::isSupported).with(
KFeatureIdCsVideoTelephony).returns(false);
QCOMPARE( Tools::videoSupported(), false );
@@ -235,21 +236,21 @@
Tools::errorCodeTextMapping(KErrGsmSSUnknownAlphabet, text);
QCOMPARE( text, QString("txt_phone_info_invalid_phone_number"));
- expect("XQSysInfo::isSupported").returns(false);
+ EXPECT(XQSysInfo::isSupported).returns(false);
Tools::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text);
QCOMPARE( text, QString(
"txt_phone_info_request_not_completed"));
QVERIFY( verify() );
- expect("XQSysInfo::isSupported").returns(true);
- expect("XQSettingsManager::readItemValue").returns(QVariant(EBTSapConnected));
+ EXPECT(XQSysInfo::isSupported).returns(true);
+ EXPECT(XQSettingsManager::readItemValue).returns(QVariant(EBTSapConnected));
Tools::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text);
QCOMPARE( text, QString(
"Operation not possible in SIM access profile mode"));
QVERIFY( verify() );
- expect("XQSysInfo::isSupported").returns(true);
- expect("XQSettingsManager::readItemValue").returns(QVariant(EBTSapNotConnected));
+ EXPECT(XQSysInfo::isSupported).returns(true);
+ EXPECT(XQSettingsManager::readItemValue).returns(QVariant(EBTSapNotConnected));
Tools::errorCodeTextMapping(KErrGsmOfflineOpNotAllowed, text);
QCOMPARE( text, QString(
"Operation not possible in Off-line mode"));
@@ -267,7 +268,7 @@
*/
void UT_CpPluginCommon::t_readVtVideoSending()
{
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(1));
mWrapper->readVtVideoSending();
QVERIFY( verify() );
@@ -278,7 +279,7 @@
*/
void UT_CpPluginCommon::t_writeVtVideoSending()
{
- expect("XQSettingsManager::writeItemValue");//.
+ EXPECT(XQSettingsManager::writeItemValue);//.
//times(2);
int i=0;
mWrapper->writeVtVideoSending(i);
@@ -290,7 +291,7 @@
*/
void UT_CpPluginCommon::t_isFeatureCallWaitingDistiquishNotProvisionedEnabled()
{
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(1));
mWrapper->isFeatureCallWaitingDistiquishNotProvisionedEnabled();
QVERIFY( verify() );
@@ -301,9 +302,17 @@
*/
void UT_CpPluginCommon::t_isPhoneOffline()
{
- expect("XQSysInfo::isSupported");
- mWrapper->isPhoneOffline();
- QVERIFY( verify() );
+ EXPECT(QtMobility::QSystemDeviceInfo::currentProfile)
+ .returns(QSystemDeviceInfo::NormalProfile);
+ bool isOffline = mWrapper->isPhoneOffline();
+ QCOMPARE(isOffline, false);
+ QVERIFY(verify());
+
+ EXPECT(QtMobility::QSystemDeviceInfo::currentProfile)
+ .returns(QSystemDeviceInfo::OfflineProfile);
+ isOffline = mWrapper->isPhoneOffline();
+ QCOMPARE(isOffline, true);
+ QVERIFY(verify());
}
/*!
@@ -311,7 +320,7 @@
*/
void UT_CpPluginCommon::t_isOngoingCall()
{
- expect("XQSettingsManager::readItemValue").
+ EXPECT(XQSettingsManager::readItemValue).
returns(QVariant(1));
mWrapper->isOngoingCall();
QVERIFY( verify() );
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro Fri Jul 09 15:40:55 2010 +0300
@@ -14,15 +14,17 @@
# Description:
#
-CONFIG += qtestlib
-CONFIG += hb
+CONFIG += qtestlib hb mobility
+MOBILITY += systeminfo
TEMPLATE = app
TARGET =
DEPENDPATH += . ../../src/
INCLUDEPATH += . ../../inc/
DEFINES += BUILD_CPTELEPHONYUTILS \
XQSETTINGSMANAGER_NO_LIBRARY \
- XQSYSINFO_NO_LIBRARY
+ XQSYSINFO_NO_LIBRARY \
+ QT_BUILD_SYSINFO_LIB \
+ QT_MAKEDLL
QT -= gui
QT += testlib
@@ -43,6 +45,7 @@
/epoc32/include/platform/mw/xqsettingskey.h \
/epoc32/include/platform/mw/xqsettingsmanager.h \
/epoc32/include/platform/mw/xqsysinfo.h \
+ /epoc32/include/mw/qsysteminfo.h \
../../../../../inc/telephonyvariant.hrh \
../../../../../inc/telinternalcrkeys.h
@@ -51,4 +54,5 @@
# mocks needed for testing
SOURCES += ../../../tsrc/mocks/mock_xqsettingskey.cpp \
../../../tsrc/mocks/mock_xqsettingsmanager.cpp \
- ../../../tsrc/mocks/mock_xqsysinfo.cpp
+ ../../../tsrc/mocks/mock_xqsysinfo.cpp \
+ ../../../tsrc/mocks/mock_qsysteminfo.cpp
--- a/phonesettings/cpphonesettingsplugins/divertplugin/divertplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/divertplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -29,7 +29,8 @@
LIBS += -lcpframework \
-lpsetwrapper \
-lsssettingswrapper \
- -lcptelephonyutils
+ -lcptelephonyutils \
+ -lpsuinotes
# Input
SOURCES += src/cpdivertplugingroup.cpp \
--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -29,9 +29,9 @@
#include <hblabel.h>
#include <hbparameterlengthlimiter.h>
#include <cpitemdatahelper.h>
+#include <psuinotes.h>
#include "cpdivertplugingroup.h"
#include "cpplugincommon.h"
-#include "cpphonenotes.h"
#include "cppluginlogging.h"
#include "cpdivertitemdata.h"
@@ -134,9 +134,9 @@
DPRINT << ": IN";
CpSettingFormItemData *page = new CpSettingFormItemData(
HbDataFormModelItem::GroupPageItem,
- hbTrId("txt_phone_setlabel_service_val_voice_divert"));
+ hbTrId("txt_phone_setlabel_service_val_voice_divert"),
+ this);
page->setObjectName("voiceCallSettingsGroupItem");
- parent->appendChild(page);
m_DataItemVoiceAllCalls = createDivertItem(
DivertConditionUnconditional,
@@ -190,11 +190,10 @@
CpSettingFormItemData *page = new CpSettingFormItemData(
HbDataFormModelItem::GroupPageItem,
- hbTrId("txt_phone_setlabel_service_val_video_divert"));
+ hbTrId("txt_phone_setlabel_service_val_video_divert"),
+ this);
page->setObjectName("videoCallSettingsGroupItem");
- parent->appendChild(page);
-
m_DataItemVideoAllCalls = createDivertItem(
DivertConditionUnconditional,
ServiceGroupData,
@@ -273,8 +272,6 @@
item, SIGNAL(itemClicked(CpDivertItemData&)),
this, SLOT(changeDivertingStateRequested(CpDivertItemData&)));
- parent->appendChild(item);
-
DPRINT << ": OUT";
return item;
}
@@ -296,10 +293,10 @@
bool isInitialStatusQueryDoneForItem =
modelItem->contentWidgetData("text").isValid();
if (!isInitialStatusQueryDoneForItem) {
- CpDivertItemData *item = static_cast<CpDivertItemData*>(modelItem);
- if (qvariant_cast<PsCallDivertingCondition>(item->property("condition")) !=
+ CpDivertItemData *pitem = static_cast<CpDivertItemData*>(modelItem);
+ if (qvariant_cast<PsCallDivertingCondition>(pitem->property("condition")) !=
DivertConditionAllConditionalCases) {
- addToDivertingRequestQueue(CheckDivertStatus, *item);
+ addToDivertingRequestQueue(CheckDivertStatus, *pitem);
}
}
@@ -342,7 +339,7 @@
if (m_divertRequestQueue.isEmpty()) {
// Queue empty so cancel process note
- CpPhoneNotes::instance()->cancelNote(m_activeProgressNoteId);
+ PsUiNotes::instance()->cancelNote(m_activeProgressNoteId);
}
DPRINT << ": OUT";
@@ -557,8 +554,8 @@
m_divertCommand.iCondition,
bscParam(m_divertCommand.iServiceGroup) );
- if (!CpPhoneNotes::instance()->noteShowing()) {
- CpPhoneNotes::instance()->showGlobalProgressNote(
+ if (!PsUiNotes::instance()->noteShowing()) {
+ PsUiNotes::instance()->showGlobalProgressNote(
m_activeProgressNoteId,
hbTrId("txt_common_info_requesting"));
}
@@ -600,7 +597,7 @@
{
DPRINT << ": IN";
- CpPhoneNotes::instance()->cancelNote(m_activeNoteId);
+ PsUiNotes::instance()->cancelNote(m_activeNoteId);
DPRINT << "aPlural:" << aPlural;
DPRINT << "iCondition:" << aSetting.iCondition;
DPRINT << "iNoReplyTimer:" << aSetting.iNoReplyTimer;
@@ -621,10 +618,10 @@
switch (aSetting.iStatus) {
case DivertingStatusActive: {
if (aPlural) {
- CpPhoneNotes::instance()->showNotificationDialog(
+ PsUiNotes::instance()->showNotificationDialog(
hbTrId("txt_phone_info_diverts_activated"));
} else {
- CpPhoneNotes::instance()->showNotificationDialog(
+ PsUiNotes::instance()->showNotificationDialog(
hbTrId("txt_phone_info_divert_activated"));
}
QString voiceMailBoxNumber;
@@ -640,17 +637,17 @@
case DivertingStatusNotRegistered:
case DivertingStatusInactive:
if (aPlural) {
- CpPhoneNotes::instance()->showNotificationDialog(
+ PsUiNotes::instance()->showNotificationDialog(
hbTrId("txt_phone_info_diverts_deactivated"));
} else {
- CpPhoneNotes::instance()->showNotificationDialog(
+ PsUiNotes::instance()->showNotificationDialog(
hbTrId("txt_phone_info_divert_deactivated"));
}
break;
case DivertingStatusNotProvisioned:
case DivertingStatusUnknown:
default:
- CpPhoneNotes::instance()->showNotificationDialog(
+ PsUiNotes::instance()->showNotificationDialog(
hbTrId("txt_phone_info_request_not_completed"));
break;
}
@@ -707,10 +704,10 @@
m_divertRequestQueue.clear();
// Cancel previous note
- CpPhoneNotes::instance()->cancelNote(m_activeNoteId);
+ PsUiNotes::instance()->cancelNote(m_activeNoteId);
// Show error note
- CpPhoneNotes::instance()->showGlobalErrorNote(m_activeNoteId, aReason);
+ PsUiNotes::instance()->showGlobalErrorNote(m_activeNoteId, aReason);
DPRINT << ": OUT";
}
@@ -922,7 +919,7 @@
DPRINT << ": m_divertCommand.iNumber "
<< m_divertCommand.iNumber;
if (m_divertCommand.iNumber.isEmpty()) {
- CpPhoneNotes::instance()->showNotificationDialog(hbTrId("txt_phone_info_invalid_phone_number"));
+ PsUiNotes::instance()->showNotificationDialog(hbTrId("txt_phone_info_invalid_phone_number"));
}
}
if (m_dialog) {
@@ -951,8 +948,8 @@
int result = m_callDivertingWrapper->setCallDiverting(
command, bscParam(command.iServiceGroup));
if (0 == result) {
- if (!CpPhoneNotes::instance()->noteShowing()) {
- CpPhoneNotes::instance()->showGlobalProgressNote(
+ if (!PsUiNotes::instance()->noteShowing()) {
+ PsUiNotes::instance()->showGlobalProgressNote(
m_activeProgressNoteId, hbTrId("txt_common_info_requesting"));
}
} else {
@@ -1313,6 +1310,7 @@
m_activateDivertPhase = NonePhase;
setCallDiverting(m_divertCommand);
}
+ break;
default:
DPRINT << "Error: unknown enum value";
break;
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -169,8 +169,8 @@
expect("PSetCallDivertingWrapper::queryVoiceMailBoxNumber").willOnce(invoke(fillNumber)).returns(0);
expect("SsSettingsWrapper::get");
expect("PSetCallDivertingWrapper::setCallDiverting");
- expect("CpPhoneNotes::noteShowing").returns(false);
- expect("CpPhoneNotes::showGlobalProgressNote");
+ expect("PsUiNotes::noteShowing").returns(false);
+ expect("PsUiNotes::showGlobalProgressNote");
m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData(
"checkState", Qt::Checked);
m_divertpluginGroup->m_DataItemVoiceAllCalls->thisItemClicked();
@@ -182,9 +182,9 @@
command.iCondition = qvariant_cast<PsCallDivertingCondition>(
m_divertpluginGroup->m_DataItemVoiceAllCalls->property("condition"));
command.iServiceGroup = ServiceGroupVoice;
- expect("CpPhoneNotes::showNotificationDialog");
+ expect("PsUiNotes::showNotificationDialog");
m_divertpluginGroup->handleDivertingChanged(command, false);
- expect("CpPhoneNotes::cancelNote");
+ expect("PsUiNotes::cancelNote");
m_divertpluginGroup->divertRequestProcessed();
QVERIFY(verify()); // Verify result processing
@@ -196,8 +196,8 @@
expect("PSetCallDivertingWrapper::getDefaultNumbers");
expect("SsSettingsWrapper::get");
expect("PSetCallDivertingWrapper::setCallDiverting");
- expect("CpPhoneNotes::noteShowing").returns(false);
- expect("CpPhoneNotes::showGlobalProgressNote");
+ expect("PsUiNotes::noteShowing").returns(false);
+ expect("PsUiNotes::showGlobalProgressNote");
m_divertpluginGroup->m_DataItemVoiceAllCalls->thisItemClicked();
waitForQueueEmpty();
command.iNumber = "0401234567";
@@ -205,19 +205,19 @@
command.iCondition = qvariant_cast<PsCallDivertingCondition>(
m_divertpluginGroup->m_DataItemVoiceAllCalls->property("condition"));
command.iServiceGroup = ServiceGroupVoice;
- expect("CpPhoneNotes::cancelNote");
- expect("CpPhoneNotes::showNotificationDialog");
+ expect("PsUiNotes::cancelNote");
+ expect("PsUiNotes::showNotificationDialog");
expect("PSetCallDivertingWrapper::setNewDefaultNumber").with(QString("0401234567"));
m_divertpluginGroup->handleDivertingChanged(command, true);
- expect("CpPhoneNotes::cancelNote");
+ expect("PsUiNotes::cancelNote");
m_divertpluginGroup->divertRequestProcessed();
QVERIFY(verify());
// Divert is disabled
expect("SsSettingsWrapper::get");
expect("PSetCallDivertingWrapper::setCallDiverting"); // Disable divert
- expect("CpPhoneNotes::noteShowing").returns(false);
- expect("CpPhoneNotes::showGlobalProgressNote");
+ expect("PsUiNotes::noteShowing").returns(false);
+ expect("PsUiNotes::showGlobalProgressNote");
m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData(
"checkState", Qt::Unchecked);
m_divertpluginGroup->m_DataItemVoiceAllCalls->thisItemClicked();
@@ -227,9 +227,9 @@
command.iCondition = qvariant_cast<PsCallDivertingCondition>(
m_divertpluginGroup->m_DataItemVoiceAllCalls->property("condition"));
command.iServiceGroup = ServiceGroupVoice;
- expect("CpPhoneNotes::showNotificationDialog");
+ expect("PsUiNotes::showNotificationDialog");
m_divertpluginGroup->handleDivertingChanged(command, false);
- //expect("CpPhoneNotes::cancelNote");
+ //expect("PsUiNotes::cancelNote");
m_divertpluginGroup->divertRequestProcessed();
QVERIFY(verify());
*/
@@ -252,8 +252,8 @@
void UT_CpDivertPlugin::t_itemShown()
{
expect("PSetCallDivertingWrapper::getCallDivertingStatus");
- expect("CpPhoneNotes::noteShowing").returns(false);
- expect("CpPhoneNotes::showGlobalProgressNote");
+ expect("PsUiNotes::noteShowing").returns(false);
+ expect("PsUiNotes::showGlobalProgressNote");
m_divertpluginGroup->itemShown(
m_dataForm->indexFromItem(m_divertpluginGroup->m_DataItemVoiceAllCalls));
m_divertpluginGroup->itemShown(
@@ -333,9 +333,9 @@
command.iCondition = qvariant_cast<PsCallDivertingCondition>(
m_divertpluginGroup->m_DataItemVoiceIfNotAnswered->property("condition"));
command.iServiceGroup = ServiceGroupVoice;
- expect("CpPhoneNotes::showNotificationDialog");
+ expect("PsUiNotes::showNotificationDialog");
m_divertpluginGroup->handleDivertingChanged(command, false);
- expect("CpPhoneNotes::cancelNote");
+ expect("PsUiNotes::cancelNote");
m_divertpluginGroup->divertRequestProcessed();
QVERIFY(verify());
@@ -351,9 +351,9 @@
command.iCondition = qvariant_cast<PsCallDivertingCondition>(
m_divertpluginGroup->m_DataItemVoiceIfNotAnswered->property("condition"));
command.iServiceGroup = ServiceGroupVoice;
- expect("CpPhoneNotes::showNotificationDialog");
+ expect("PsUiNotes::showNotificationDialog");
m_divertpluginGroup->handleDivertingChanged(command, false);
- expect("CpPhoneNotes::cancelNote");
+ expect("PsUiNotes::cancelNote");
m_divertpluginGroup->divertRequestProcessed();
QVERIFY(verify());
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro Fri Jul 09 15:40:55 2010 +0300
@@ -20,7 +20,8 @@
DEPENDPATH += . ../../src/
INCLUDEPATH += .
INCLUDEPATH +=../../../cptelephonyutils/inc
-DEFINES += BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER
+DEFINES += BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER \
+ BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
QT -= gui
QT += testlib
@@ -42,9 +43,9 @@
HEADERS += ../../src/cpdivertplugin.h \
../../src/cpdivertplugingroup.h \
../../src/cpdivertitemdata.h \
- ../../../cptelephonyutils/inc/cpphonenotes.h \
../../../cptelephonyutils/inc/cpplugincommon.h \
/epoc32/include/platform/mw/psetwrapper.h \
+ /epoc32/include/platform/mw/psuinotes.h \
/epoc32/include/platform/mw/psetcliwrapper.h \
/epoc32/include/platform/mw/psetcallwaitingwrapper.h \
/epoc32/include/platform/mw/psetcalldivertingwrapper.h \
@@ -59,5 +60,5 @@
SOURCES += ../../../tsrc/mocks/mock_psetcalldivertingwrapper.cpp \
../../../tsrc/mocks/mock_sssettingswrapper.cpp \
../../../tsrc/mocks/mock_cpplugincommon.cpp \
- ../../../tsrc/mocks/mock_cpphonenotes.cpp \
+ ../../../tsrc/mocks/mock_psuinotes.cpp \
../../../tsrc/mocks/mock_psetwrapper.cpp
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -67,7 +67,10 @@
QList<CpSettingFormItemData*> ret;
ret.append(new CpSettingFormEntryItemDataImpl<CpTelephonyPluginView>(
- itemDataHelper, hbTrId("txt_cp_dblist_telephone"), hbTrId("")));
+ itemDataHelper,
+ hbTrId("txt_cp_dblist_telephone"),
+ hbTrId(""),
+ HbIcon(QString("qtg_large_voice_call"))));
return ret;
}
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -59,13 +59,12 @@
DPRINT << ": Loading cpcallsplugin";
items.append(groupItemFromPlugin(
PLUGIN_NAME_CALLSPLUGIN));
- // CpSettingFormItemData* expandedItem = items.last();
+ CpSettingFormItemData* expandedItem = items.last();
DPRINT << ": Loading vmbxcpplugin";
items.append(groupItemFromPlugin(
PLUGIN_NAME_VMBXPLUGIN));
-
DPRINT << ": Loading cpdivertsplugin";
items.append(groupItemFromPlugin(
PLUGIN_NAME_DIVERTPLUGIN));
@@ -81,7 +80,6 @@
form->setModel(model);
- /*
if (expandedItem) {
QModelIndex expandedItemIndex = model->indexFromItem(expandedItem);
@@ -89,7 +87,6 @@
form->setExpanded(expandedItemIndex, true);
}
}
- */
}
DPRINT << ": OUT";
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkpluginview.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkpluginview.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -48,7 +48,7 @@
// CpNetworkPluginView::SearchAvailableNetworks
// -----------------------------------------------------------------------------
//
-void CpNetworkPluginView::SearchAvailableNetworks( )
+void CpNetworkPluginView::searchAvailableNetworks( )
{
SMC_MOCK_METHOD0( void )
}
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpphonenotes.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-#include <QDebug>
-#include <QString>
-#include <smcmockclassincludes.h>
-#include "cpphonenotes.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::CpPhoneNotes
-// -----------------------------------------------------------------------------
-//
-CpPhoneNotes::CpPhoneNotes( ): QObject(NULL)
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::instance
-// -----------------------------------------------------------------------------
-//
-CpPhoneNotes * CpPhoneNotes::instance( )
- {
- static CpPhoneNotes theInstance;
- return &theInstance;
- }
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::~CpPhoneNotes
-// -----------------------------------------------------------------------------
-//
-CpPhoneNotes::~CpPhoneNotes( )
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::showGlobalProgressNote
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::showGlobalProgressNote(
- int & noteId,
- const QString & text )
- {
- SMC_MOCK_METHOD2( void, int &, noteId,
- const QString &, text )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::showGlobalNote
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::showGlobalNote(
- int & noteId,
- const QString & text,
- HbMessageBox::MessageBoxType noteType )
- {
- SMC_MOCK_METHOD3( void, int &, noteId,
- const QString &, text,
- HbMessageBox::MessageBoxType, noteType )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::showGlobalErrorNote
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::showGlobalErrorNote(
- int & noteId,
- int errorCode )
- {
- SMC_MOCK_METHOD2( void, int &, noteId,
- int, errorCode )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::showCallDivertDetails
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::showCallDivertDetails(
- const PSCallDivertingStatus & divertStatus )
- {
- SMC_MOCK_METHOD1( void, const PSCallDivertingStatus &, divertStatus )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::showPasswordQueryDialog
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::showPasswordQueryDialog(
- const QString & title,
- const QValidator & validator,
- int maxPasswordLength )
- {
- SMC_MOCK_METHOD3( void, const QString &, title,
- const QValidator &, validator,
- int, maxPasswordLength )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::cancelNote
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::cancelNote(
- int noteId )
- {
- SMC_MOCK_METHOD1( void, int, noteId )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::noteShowing
-// -----------------------------------------------------------------------------
-//
-bool CpPhoneNotes::noteShowing( )
- {
- SMC_MOCK_METHOD0( bool )
- }
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::finishedPasswordQueryDialog
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::finishedPasswordQueryDialog(
- HbAction * /*action*/ )
- {
- //SMC_MOCK_METHOD1( void, HbAction *, action )
- }
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::showNotificationDialog
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::showNotificationDialog(
- const QString & text )
- {
- SMC_MOCK_METHOD1( void, const QString &, text )
- }
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::activeNoteAboutToClose
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::activeNoteAboutToClose()
-{
- SMC_MOCK_METHOD0( void )
-}
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::handleProgressNoteCanceled
-// -----------------------------------------------------------------------------
-//
-void CpPhoneNotes::handleProgressNoteCanceled()
-{
- SMC_MOCK_METHOD0( void )
-}
-
-
-// -----------------------------------------------------------------------------
-// CpPhoneNotes::passwordTextChanged
-// -----------------------------------------------------------------------------
-//
-
-
-void CpPhoneNotes::passwordTextChanged()
-{
- SMC_MOCK_METHOD0( void )
-}
-
-
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetnetworkwrapper_p.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetnetworkwrapper_p.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -18,6 +18,7 @@
#include <PsetContainer.h>
#include <PsetNetwork.h>
#include <smcmockclassincludes.h>
+#include <psetcsp.h>
#include "psetnetworkwrapper_p.h"
// ============================ MEMBER FUNCTIONS ===============================
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psuinotes.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,204 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+#include <QDebug>
+#include <QString>
+#include <smcmockclassincludes.h>
+#include <psuinotes.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::PsUiNotes
+// -----------------------------------------------------------------------------
+//
+PsUiNotes::PsUiNotes( )
+ //:
+ //QObject( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::instance
+// -----------------------------------------------------------------------------
+//
+PsUiNotes * PsUiNotes::instance( )
+ {
+ static PsUiNotes theInstance;
+ return &theInstance;
+ }
+// -----------------------------------------------------------------------------
+// PsUiNotes::~PsUiNotes
+// -----------------------------------------------------------------------------
+//
+PsUiNotes::~PsUiNotes( )
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showGlobalProgressNote
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showGlobalProgressNote(
+ int & noteId,
+ const QString & text )
+ {
+ SMC_MOCK_METHOD2( void, int &, noteId,
+ const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showGlobalNote
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showGlobalNote(
+ int & noteId,
+ const QString & text,
+ HbMessageBox::MessageBoxType noteType )
+ {
+ SMC_MOCK_METHOD3( void, int &, noteId,
+ const QString &, text,
+ HbMessageBox::MessageBoxType, noteType )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showGlobalErrorNote
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showGlobalErrorNote(
+ int & noteId,
+ int errorCode )
+ {
+ SMC_MOCK_METHOD2( void, int &, noteId,
+ int, errorCode )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showCallDivertDetails
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showCallDivertDetails(
+ const QList<PSCallDivertingStatus *> & divertingStatusList )
+ {
+ SMC_MOCK_METHOD1( void, const QList<PSCallDivertingStatus *> &, divertingStatusList )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showPasswordQueryDialog
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showPasswordQueryDialog(
+ const QString & title,
+ const QValidator & validator,
+ int maxPasswordLength )
+ {
+ SMC_MOCK_METHOD3( void, const QString &, title,
+ const QValidator &, validator,
+ int, maxPasswordLength )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::cancelNote
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::cancelNote(
+ int noteId )
+ {
+ SMC_MOCK_METHOD1( void, int, noteId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::noteShowing
+// -----------------------------------------------------------------------------
+//
+bool PsUiNotes::noteShowing( )
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::finishedPasswordQueryDialog
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::finishedPasswordQueryDialog(
+ HbAction * action )
+ {
+// SMC_MOCK_METHOD1( void, HbAction *, action )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showNotificationDialog
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showNotificationDialog(
+ const QString & text )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::showGlobalNotificationDialog
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::showGlobalNotificationDialog(
+ const QString & text )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::activeNoteAboutToClose
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::activeNoteAboutToClose()
+{
+ SMC_MOCK_METHOD0( void )
+}
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::handleProgressNoteCanceled
+// -----------------------------------------------------------------------------
+//
+void PsUiNotes::handleProgressNoteCanceled()
+{
+ SMC_MOCK_METHOD0( void )
+}
+
+
+// -----------------------------------------------------------------------------
+// PsUiNotes::passwordTextChanged
+// -----------------------------------------------------------------------------
+//
+
+
+void PsUiNotes::passwordTextChanged()
+{
+ SMC_MOCK_METHOD0( void )
+}
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_qsysteminfo.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_qsysteminfo.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -17,12 +17,34 @@
#include <QDebug>
#include <smcmockclassincludes.h>
#include <qsysteminfo.h>
+#include <QStringList>
+#include <QSize>
+#include <QFile>
+#include <QTextStream>
+#include <QLocale>
+#include <QLibraryInfo>
+#include <QApplication>
+#include <QDesktopWidget>
// ============================ MEMBER FUNCTIONS ===============================
QTM_BEGIN_NAMESPACE
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QSystemStorageInfo::QSystemStorageInfo
+// -----------------------------------------------------------------------------
+//
+QSystemStorageInfo::QSystemStorageInfo( QObject * parent )
+ :
+ QObject(parent)
+ {
+
+ }
+
+
// -----------------------------------------------------------------------------
// QSystemStorageInfo::~QSystemStorageInfo
// -----------------------------------------------------------------------------
@@ -80,12 +102,10 @@
// QSystemDeviceInfo::QSystemDeviceInfo
// -----------------------------------------------------------------------------
//
-QSystemDeviceInfo::QSystemDeviceInfo(
- QObject * parent )
- //:
- //QObject( /*parent*/ )
+QSystemDeviceInfo::QSystemDeviceInfo ( QObject * parent )
+ :
+ QObject(parent)
{
-
}
@@ -223,12 +243,10 @@
// QSystemInfo::QSystemInfo
// -----------------------------------------------------------------------------
//
-QSystemInfo::QSystemInfo(
- QObject * parent )
- //:
- //QObject( /*parent*/ )
+QSystemInfo::QSystemInfo( QObject * parent )
+ :
+ QObject(parent)
{
-
}
@@ -236,7 +254,7 @@
// QSystemInfo::~QSystemInfo
// -----------------------------------------------------------------------------
//
-QSystemInfo::~QSystemInfo( )
+QSystemInfo::~QSystemInfo()
{
}
@@ -246,7 +264,7 @@
// QSystemInfo::currentLanguage
// -----------------------------------------------------------------------------
//
-QString QSystemInfo::currentLanguage( )
+QString QSystemInfo::currentLanguage()
{
SMC_MOCK_METHOD0( QString )
}
@@ -300,12 +318,10 @@
// QSystemNetworkInfo::QSystemNetworkInfo
// -----------------------------------------------------------------------------
//
-QSystemNetworkInfo::QSystemNetworkInfo(
- QObject * parent )
- //:
- //QObject( /*parent*/ )
+QSystemNetworkInfo::QSystemNetworkInfo( QObject * parent )
+ :
+ QObject(parent)
{
-
}
@@ -326,7 +342,8 @@
Q_INVOKABLE QSystemNetworkInfo::NetworkStatus QSystemNetworkInfo::networkStatus(
QSystemNetworkInfo::NetworkMode mode )
{
- SMC_MOCK_METHOD1( Q_INVOKABLE QSystemNetworkInfo::NetworkStatus, QSystemNetworkInfo::NetworkMode, mode )
+ SMC_MOCK_METHOD1( Q_INVOKABLE QSystemNetworkInfo::NetworkStatus,
+ QSystemNetworkInfo::NetworkMode, mode )
}
@@ -334,10 +351,11 @@
// QSystemNetworkInfo::networkSignalStrength
// -----------------------------------------------------------------------------
//
-Q_INVOKABLE int QSystemNetworkInfo::networkSignalStrength(
- QSystemNetworkInfo::NetworkMode mode )
+Q_INVOKABLE int QSystemNetworkInfo::networkSignalStrength(
+ QSystemNetworkInfo::NetworkMode mode )
{
- SMC_MOCK_METHOD1( Q_INVOKABLE int, QSystemNetworkInfo::NetworkMode, mode )
+ SMC_MOCK_METHOD1( Q_INVOKABLE int,
+ QSystemNetworkInfo::NetworkMode, mode )
}
@@ -346,7 +364,7 @@
// -----------------------------------------------------------------------------
//
QString QSystemNetworkInfo::macAddress(
- QSystemNetworkInfo::NetworkMode mode )
+ QSystemNetworkInfo::NetworkMode mode )
{
SMC_MOCK_METHOD1( QString, QSystemNetworkInfo::NetworkMode, mode )
}
@@ -426,10 +444,10 @@
// QSystemNetworkInfo::networkName
// -----------------------------------------------------------------------------
//
-Q_INVOKABLE QString QSystemNetworkInfo::networkName(
- QSystemNetworkInfo::NetworkMode mode )
+Q_INVOKABLE QString QSystemNetworkInfo::networkName(
+ QSystemNetworkInfo::NetworkMode mode )
{
- SMC_MOCK_METHOD1( Q_INVOKABLE QString, QSystemNetworkInfo::NetworkMode, mode )
+ SMC_MOCK_METHOD1( Q_INVOKABLE QString, QSystemNetworkInfo::NetworkMode, mode )
}
@@ -438,7 +456,7 @@
// -----------------------------------------------------------------------------
//
QNetworkInterface QSystemNetworkInfo::interfaceForMode(
- QSystemNetworkInfo::NetworkMode mode )
+ QSystemNetworkInfo::NetworkMode mode )
{
SMC_MOCK_METHOD1( QNetworkInterface, QSystemNetworkInfo::NetworkMode, mode )
}
@@ -466,6 +484,17 @@
}
+// -----------------------------------------------------------------------------
+// QSystemScreenSaver::QSystemScreenSaver
+// -----------------------------------------------------------------------------
+//
+QSystemScreenSaver::QSystemScreenSaver ( QObject * parent )
+ :
+ QObject(parent)
+ {
+
+ }
+
// -----------------------------------------------------------------------------
// QSystemScreenSaver::~QSystemScreenSaver
@@ -503,8 +532,8 @@
//
QSystemDisplayInfo::QSystemDisplayInfo(
QObject * parent )
- //:
- //QObject( /*parent*/ )
+ :
+ QObject( parent )
{
}
@@ -541,4 +570,6 @@
SMC_MOCK_METHOD1( int, int, screen )
}
+#include "moc_qsysteminfo.cpp"
+
QTM_END_NAMESPACE
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro Tue Jul 06 14:15:47 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro Fri Jul 09 15:40:55 2010 +0300
@@ -29,8 +29,8 @@
INCLUDEPATH += ../../telephonyplugin/src
INCLUDEPATH += /sf/mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper/src
-DEFINES += BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER
-DEFINES += XQSYSINFO_LIBRARY XQSETTINGSMANAGER_LIBRARY
+DEFINES += BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
+DEFINES += XQSYSINFO_LIBRARY XQSETTINGSMANAGER_LIBRARY QT_BUILD_SYSINFO_LIB QT_MAKEDLL
QT -= gui
QT += testlib
@@ -46,10 +46,10 @@
HEADERS += ut_mockintegrity.h
HEADERS += ../../callsplugin/src/cpcallsplugin.h \
- ../../cptelephonyutils/inc/cpphonenotes.h \
../../cptelephonyutils/inc/cpplugincommon.h \
../../cptelephonyutils/inc/cpphonelocalisation.h \
/epoc32/include/platform/mw/psetwrapper.h \
+ /epoc32/include/platform/mw/psuinotes.h \
/epoc32/include/platform/mw/psetcliwrapper.h \
/epoc32/include/platform/mw/sssettingswrapper.h \
/epoc32/include/platform/mw/psetcallwaitingwrapper.h \
@@ -58,7 +58,8 @@
/epoc32/include/platform/mw/psetcallbarringwrapper.h \
/epoc32/include/platform/mw/xqsettingskey.h \
/epoc32/include/platform/mw/xqsettingsmanager.h \
- /epoc32/include/platform/mw/xqsysinfo.h
+ /epoc32/include/platform/mw/xqsysinfo.h \
+ /epoc32/include/mw/qsysteminfo.h
SOURCES += *.cpp
--- a/phoneuis/TelephonyDeviceMode/bwins/TelephonyDeviceModeU.DEF Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- ?CTelDMHandlerCreateL@@YAPAVCTelDMHandler@@XZ @ 1 NONAME ; class CTelDMHandler * CTelDMHandlerCreateL(void)
-
--- a/phoneuis/TelephonyDeviceMode/eabi/telephonydevicemodeu.def Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- _Z20CTelDMHandlerCreateLv @ 1 NONAME
-
--- a/phoneuis/TelephonyDeviceMode/group/TelephonyDeviceMode.mmp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2005-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: Project specification for Telephony Device Mode
-*
-*/
-
-#include <platform_paths.hrh>
-
-// Capability assignment.
-CAPABILITY CAP_GENERAL_DLL
-// Assign Vendor ID.
-VENDORID VID_DEFAULT
-
-TARGET telephonydevicemode.dll
-TARGETTYPE DLL
-UID 0x1000008d 0x1020299B
-
-SOURCEPATH ../src
-SOURCE cteldmhandlerimpl.cpp
-SOURCE cteldmgriphandler.cpp
-SOURCE cteldmcallstatelistener.cpp
-SOURCE cteldmcommandhandler.cpp
-SOURCE cteldmaudioaccessorylistener.cpp
-
-USERINCLUDE ../inc
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE ../../../inc // Telephony internal headers
-
-LIBRARY euser.lib
-LIBRARY featmgr.lib
-LIBRARY avkon.lib
-LIBRARY telephonyaudiorouting.lib
-LIBRARY centralrepository.lib
-// End of File
--- a/phoneuis/TelephonyDeviceMode/group/bld.inf Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2005 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: Build information file for TelephonyDeviceMode
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-telephonydevicemode_stub.sis /epoc32/data/z/system/install/telephonydevicemode_stub.sis
-
-// IBY files
-../rom/telephonydevicemode.iby CORE_APP_LAYER_IBY_EXPORT_PATH(telephonydevicemode.iby)
-
-PRJ_MMPFILES
-../group/telephonydevicemode.mmp
-
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/group/telephonydevicemode.pkg Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-;
-; Copyright (c) 2009 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: Packing for telephony device mode.
-;
-; Languages
-&EN
-
-; Header
-#{"TelephonyDeviceMode"}, (0x1020299B), 10, 1, 0, TYPE=SA
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-"\epoc32\RELEASE\armv5\UREL\TelephonyDeviceMode.dll"-"z:\sys\bin\TelephonyDeviceMode.dll"
Binary file phoneuis/TelephonyDeviceMode/group/telephonydevicemode_stub.SIS has changed
--- a/phoneuis/TelephonyDeviceMode/group/telephonydevicemode_stub.pkg Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-;
-; Copyright (c) 2009 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: Packing of telephony device mode.
-;
-; Languages
-&EN
-
-; Header
-#{"TelephonyDeviceMode"}, (0x1020299B), 1, 0, 0, TYPE=SA
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-""-"z:\sys\bin\TelephonyDeviceMode.dll"
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMAudioAccessoryListener.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 2002-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: Accessory mode.
-*
-*/
-
-
-#ifndef CTELDMAUDIOACCESSORYLISTENER_H
-#define CTELDMAUDIOACCESSORYLISTENER_H
-
-// INCLUDE FILES
-#include <MTelephonyAudioRoutingObserver.h>
-#include "mteldmaccessory.h"
-
-// FORWARD DECLARATIONS
-
-// CLASS DEFINITIONS
-class CTelephonyAudioRouting;
-
-/**
-* Class for listening accessory mode and routing changes.
-*
-* @lib telephonydevicemode.dll
-* @since 3.1
-*/
-NONSHARABLE_CLASS( CTelDMAudioAccessoryListener ): public CBase,
- public MTelDMAccessory,
- public MTelephonyAudioRoutingObserver
- {
- public: // constructor & destructor
-
- /**
- * Two phase constructor
- */
- static CTelDMAudioAccessoryListener* NewL();
-
- // Destructor
- virtual ~CTelDMAudioAccessoryListener( );
-
-
- public: // from MTelDMAccessory
-
- /**
- * See MTelDMAccessory
- */
- TBool IsAccessoryAttached();
-
- /**
- * See MTelDMAccessory
- */
- TBool IsAnyActiveAccessory();
-
- public: //from MTelephonyAudioRoutingObserver
-
- void AvailableOutputsChanged( CTelephonyAudioRouting&
- aTelephonyAudioRouting);
-
- void OutputChanged( CTelephonyAudioRouting&
- aTelephonyAudioRouting);
-
- void SetOutputComplete( CTelephonyAudioRouting&
- aTelephonyAudioRouting,
- TInt aError);
- private: // Constructor
-
- /** c++ constructor */
- CTelDMAudioAccessoryListener();
-
- /** 2nd phase constructor */
- void ConstructL();
-
-
- private:
-
- // Array of available outputs
- RArray<CTelephonyAudioRouting::TAudioOutput> iOutputArray;
-
- // Current accessory mode.
- TBool iIsActiveAccessory;
-
- // Audio routing API
- CTelephonyAudioRouting* iAudioRouting;
-
- };
-
-#endif // CTELDMAUDIOACCESSORYLISTENER_H
-
-// End of file
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMCallStateListener.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* 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: Header file for MTelDMCallStateObserver class.
-*
-*/
-
-
-
-#ifndef CTELDMCALLSTATELISTENER_H
-#define CTELDMCALLSTATELISTENER_H
-
-// INCLUDES
-#include <e32property.h>
-#include <e32base.h>
-
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-class MTelDMCallStateObserver;
-
-/**
-* Call state listener. Listening TelephonyCallState PS key.
-*
-* @since 3.1
-*/
-
-NONSHARABLE_CLASS( CTelDMCallStateListener ) : public CActive
- {
- public: // Constructors and destructors.
-
- /**
- * Two-phased constructor.
- */
- static CTelDMCallStateListener* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CTelDMCallStateListener();
-
-
- public:
-
- void AddObserverL( MTelDMCallStateObserver& aCallStateObserver );
-
- private: // from CActive
-
- /**
- * @see CActive::RunL.
- */
- void RunL();
-
- /**
- * @see CActive::DoCancel.
- */
- void DoCancel();
-
- private:
-
- /**
- * Handle notification request
- */
- void HandleChange();
-
- /**
- * Start notification.
- */
- void IssueRequest();
-
- /**
- * Constructor.
- */
- CTelDMCallStateListener();
-
- /**
- * Symbian OS constructor.
- */
- void ConstructL();
-
- private:
- // Owned Publish & Subscribe instance.
- RProperty iProperty;
-
- // Call state
- TInt iCallState;
-
- // Call State Change Observer array.
- RPointerArray< MTelDMCallStateObserver > iObserverArray;
- };
-
-#endif // CTELDMCALLSTATELISTENER_H
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMCommandHandler.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2002-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: Header file for CTelDMCommandHandler class.
-*
-*/
-
-
-#ifndef CTELDMCOMMANDHANDLER_H
-#define CTELDMCOMMANDHANDLER_H
-
-// INCLUDE FILES
-
-#include <e32base.h>
-#include <aknkeylock.h>
-#include "mteldmcallstateobserver.h"
-
-// FORWARD DECLARATIONS
-
-// CLASS DEFINITIONS
-
-class MTelDMAcessory;
-class MPhoneDeviceModeObserver;
-class MTelDMAccessory;
-class CTelDMCallStateListener;
-/**
-* Class for command
-*
-* @lib telephonydevicemode.dll
-* @since 3.1
-*/
-NONSHARABLE_CLASS( CTelDMCommandHandler ): public CBase,
- public MTelDMCallStateObserver
- {
- public: // constructor & destructor
-
- /**
- * Two phase constructor
- */
- static CTelDMCommandHandler* NewL( MPhoneDeviceModeObserver& aCallHandler,
- MTelDMAccessory& aAccessory );
-
- // Destructor
- virtual ~CTelDMCommandHandler();
-
- public:
-
- enum TCommands
- {
- EGripOpen,
- EGripClose
- };
-
- void HandleCommand( TCommands aCommand );
-
- public: // from MTelDMCallStateObserver
-
- /** See MTelDMCallStateObserver.h */
- void CallStateChangedL( TInt aCallState );
-
-
- private: // Constructor
-
- /** c++ constructor */
- CTelDMCommandHandler( MPhoneDeviceModeObserver& aCallHandler,
- MTelDMAccessory& aAccessory );
-
- /** 2nd phase constructor */
- void ConstructL();
-
- private:
-
- /**
- * Ends calls
- */
- void EndCalls();
-
- /**
- * Offer key lock query.
- */
- void OfferKeyLock();
-
- /**
- * Check emergency call
- * @return status of emergency call
- */
- TBool IsEmergencyCall() const;
-
- /**
- * Check soft reject
- * @return status of soft reject operation
- */
- TBool IsSoftRejectOngoing() const;
-
- private:
-
- // Reference to device mode observer
- MPhoneDeviceModeObserver& iCallHandler;
-
- // Reference to accessory listene
- MTelDMAccessory& iAccessory;
-
- // For keypad locking.
- RAknKeyLock iKeyLock;
-
- // Is grip open ?
- TBool iGripOpen;
-
- // Grip open when ringing state ?
- TBool iGripOpenOnRingingState;
-
- // Call state
- TInt iCallState;
-
- };
-
-#endif // CTELDMCOMMANDHANDLER_H
-
-// end of file
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMDebug.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* 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: This file defines logging macros for TelephonyDeviceMode
-*
-*/
-
-
-
-#ifndef CTELDMDEBUG_H
-#define CTELDMDEBUG_H
-
-#ifdef _DEBUG
-// ===========================================================================
- // RDebug logging for target HW
-// ===========================================================================
-#include <e32svr.h>
-
-#define FLOG( a ) { RDebug::Print( a ); }
-#define FTRACE( a ) { a; }
-
-// Declare the FPrint function
-//
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
- {
- VA_LIST list;
- VA_START( list, aFmt );
- TInt tmpInt = VA_ARG( list, TInt );
- TInt tmpInt2 = VA_ARG( list, TInt );
- TInt tmpInt3 = VA_ARG( list, TInt );
- VA_END( list );
- RDebug::Print( aFmt, tmpInt, tmpInt2, tmpInt3 );
- }
-
-// ===========================================================================
-#else // // No loggings --> Reduced binary size
-// ===========================================================================
-#define FLOG( a )
-#define FTRACE( a )
-
-#endif // _DEBUG
-
-#endif //
-
-// End of File
\ No newline at end of file
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMGripHandler.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
-* Copyright (c) 2005 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: Concrete session class for Telephony Device Mode
-*
-*/
-
-
-
-#ifndef CTELDMGRIPHANDLER_H
-#define CTELDMGRIPHANDLER_H
-
-// INCLUDES
-
-#include <e32property.h>
-#include <e32base.h>
-
-
-// FORWARD DECLARATIONS
-
-class MPhoneDeviceModeObserver;
-class MTelDMAccessory;
-class CTelDMCommandHandler;
-
-// CLASS DECLARATION
-
-/**
-* Concrete session class for Telephony Device Mode
-*
-* @since 3.0
-*/
-
-NONSHARABLE_CLASS( CTelDMGripHandler ) : public CActive
- {
- public: // Constructors and destructors.
-
- /**
- * Two-phased constructor.
- */
- static CTelDMGripHandler* NewL( CTelDMCommandHandler& aCommandHandler );
-
- /**
- * Destructor.
- */
- virtual ~CTelDMGripHandler();
-
- public: // New functions
-
- public: // Functions from base classes
-
- private: // Functions from base classes
-
- /**
- * @see CActive::RunL.
- */
- void RunL();
-
- /**
- * @see CActive::DoCancel.
- */
- void DoCancel();
-
- private:
-
- /**
- * Handle notification request
- */
- void HandleChange();
-
- /**
- * Start notification.
- */
- void IssueRequest();
-
- /**
- * Constructor.
- */
- CTelDMGripHandler( CTelDMCommandHandler& aCommandHandler );
-
- /**
- * Symbian OS constructor.
- */
- void ConstructL();
-
- /**
- * Check phone settings
- * @return Status of settings value
- */
- TBool IsSliderCallAnswer() const;
-
- /**
- * Check phone settings
- * @return Status of settings value
- */
- TBool IsSliderCallEnd()const;
-
- /**
- * Get integer value of setting
- * @param aUid identifing the central repository UID.
- * @param aId central repository ID.
- * @param aValue the value associated with the central repository ID
- * @return
- */
- TInt CTelDMGripHandler::GetInt(
- const TUid& aUid,
- const TUint aId,
- TInt& aValue ) const;
-
- private:
- // Owned Publish & Subscribe instance.
- RProperty iProperty;
-
- // Reference to commander
- CTelDMCommandHandler& iCommandHandler;
-
-
- };
-
-#endif // CTELDMGRIPHANDLER_H
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMHandlerImpl.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
-* Copyright (c) 2005-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: Implementation class for for Telephony Device Mode
-*
-*/
-
-
-
-#ifndef CTELDMHANDLERIMPL_H
-#define CTELDMHANDLERIMPL_H
-
-#include <e32base.h>
-#include <cteldmhandler.h>
-#include <bldvariant.hrh>
-
-// FORWARD DECLARATIONS
-
-class MPhoneDeviceModeObserver;
-class CTelDMCallStateListener;
-class CTelDMGripHandler;
-class CTelDMCommandHandler;
-class CTelDMAudioAccessoryListener;
-class MTelDMAccessory;
-
-
-// CLASS DECLARATION
-
-
-NONSHARABLE_CLASS( CTelDMHandlerImpl ) : public CTelDMHandler
- {
- public: // Constructors and destructors.
-
- /**
- * Two-phased constructor.
- *
- * @return new instance of the class.
- */
- static CTelDMHandlerImpl* NewL();
-
- /** D'tor. */
- virtual ~CTelDMHandlerImpl();
-
- public: // From base classes.
-
- /**
- * Set call event observer
- * @return void
- */
- void SetObserverL( MPhoneDeviceModeObserver* aCallHandler );
-
- private:
-
- /**
- * C++ constructor.
- */
- CTelDMHandlerImpl();
-
- /**
- * Symbian OS default constructor.
- */
- void ConstructL();
-
-
- private:
-
- /**
- * Grip handler, Owned
- */
- CTelDMGripHandler* iGrip;
-
- /**
- * Accessory status, Owned
- */
- CTelDMAudioAccessoryListener* iAccessory;
-
- /**
- * Call state listener, Owned
- */
- CTelDMCallStateListener* iCallStateListener;
-
- /**
- * Commander, Owned
- */
- CTelDMCommandHandler* iCommandHandler;
-
- };
-
-
-#endif // CTELDMHANDLERIMPL_H
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/inc/MTelDMAccessory.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* 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: Header file for MTelDMAccessory class.
-*
-*
-*/
-
-
-#ifndef MTELDMACCESSORY_H
-#define MTELDMACCESSORY_H
-
-// INCLUDES
-
-//CLASS DECLARATION
-
-/**
-* Accessory mode
-*
-* @since 3.1
-*/
-class MTelDMAccessory
- {
-
- public: // New functions
-
- /**
- * Is accessory attached ?
- * @param none
- * @return True if accessory attached.
- */
- virtual TBool IsAccessoryAttached() = 0;
-
- /**
- * Is any active accessory ?
- * @param none
- * @return True if active accessory.
- */
- virtual TBool IsAnyActiveAccessory() = 0;
-
- };
-
-#endif // MTELDMACCESSORY_H
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/inc/MTelDMCallStateObserver.h Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* 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: Header file for MTelDMCallStateObserver class.
-*
-*
-*/
-
-
-#ifndef MTELDMSTATEOBSERVER_H
-#define MTELDMSTATEOBSERVER_H
-
-// INCLUDES
-
-//CLASS DECLARATION
-
-/**
-* Call state mode observer.
-*
-* @since 3.1
-*/
-class MTelDMCallStateObserver
- {
-
- public: // New functions
-
- /**
- * Notify changes of calls
- * @param Call state from TelephonyInternalPSKeys.h
- * @return none
- */
- virtual void CallStateChangedL( TInt aCallState ) = 0;
-
- };
-
-#endif // MTELDMSTATEOBSERVER_H
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/rom/telephonydevicemode.iby Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2005 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: IBY file for telephony device mode.
- *
-*/
-
-#ifndef __TELEPHONYDEVICEMODE_IBY__
-#define __TELEPHONYDEVICEMODE_IBY__
-
-file=ABI_DIR\BUILD_DIR\telephonydevicemode.dll SHARED_LIB_DIR\telephonydevicemode.dll
-data=ZSYSTEM\Install\telephonydevicemode_stub.sis \System\Install\telephonydevicemode_stub.sis
-
-#endif
-
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMAudioAccessoryListener.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-/*
-* Copyright (c) 2002-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: Accessory mode.
-*
-*/
-
-
-// INCLUDE FILES
-#include "cteldmaudioaccessorylistener.h" // this
-#include "cteldmdebug.h"
-#include <TelephonyAudioRouting.h>
-
-// CONSTANTS
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::NewL
-//
-// Two phase constructor
-// -----------------------------------------------------------------------------
-//
-CTelDMAudioAccessoryListener* CTelDMAudioAccessoryListener::NewL()
- {
- CTelDMAudioAccessoryListener* self = new ( ELeave ) CTelDMAudioAccessoryListener( );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::~CTelDMAudioAccessoryListener
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMAudioAccessoryListener::~CTelDMAudioAccessoryListener( )
- {
- FLOG( _L( "CTelDMAudioAccessoryListener::~CTelDMAudioAccessoryListener()" ) )
- delete iAudioRouting;
- iOutputArray.Reset();
- iOutputArray.Close();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::CTelDMAudioAccessoryListener
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMAudioAccessoryListener::CTelDMAudioAccessoryListener( ):
- iIsActiveAccessory ( EFalse )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::ConstructL
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMAudioAccessoryListener::ConstructL()
- {
- FLOG( _L( "CTelDMAudioAccessoryListener::ConstructL<" ) )
- // Audio route handler
- iAudioRouting = CTelephonyAudioRouting::NewL( *this );
- FLOG( _L( "CTelDMAudioAccessoryListener::ConstructL>" ) )
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::AvailableOutputsChanged
-// Receives event on accessory mode change.
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMAudioAccessoryListener::AvailableOutputsChanged( CTelephonyAudioRouting&
- aTelephonyAudioRouting )
- {
- FLOG( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged<" ) )
- iOutputArray.Reset();
-
- TArray<CTelephonyAudioRouting::TAudioOutput> availableOutputs
- = aTelephonyAudioRouting.AvailableOutputs();
-
- // Stores available output
- for ( TInt i=0; i< availableOutputs.Count();i++ )
- {
- iOutputArray.Append( availableOutputs[i] );
- }
-
- FLOG( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged>" ) )
- }
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::OutputChanged
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMAudioAccessoryListener::OutputChanged( CTelephonyAudioRouting&
- aTelephonyAudioRouting)
- {
- FLOG( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged<" ) )
- CTelephonyAudioRouting::TAudioOutput output = aTelephonyAudioRouting.Output();
-
- switch ( output )
- {
- // No active outputs available
- case CTelephonyAudioRouting::ENone:
- iIsActiveAccessory = EFalse;
- break;
- case CTelephonyAudioRouting::EHandset:
- iIsActiveAccessory = EFalse;
- break;
- case CTelephonyAudioRouting::ELoudspeaker:
- iIsActiveAccessory = EFalse;
- break;
- // Active outputs available
- case CTelephonyAudioRouting::EWiredAudioAccessory:
- iIsActiveAccessory = ETrue;
- break;
- case CTelephonyAudioRouting::EBTAudioAccessory:
- iIsActiveAccessory = ETrue;
- break;
- case CTelephonyAudioRouting::ETTY:
- iIsActiveAccessory = ETrue;
- break;
- default:
- break;
- }
- FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged =%d"),
- iIsActiveAccessory ))
- FLOG( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged>" ) )
- }
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::SetOutputComplete
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMAudioAccessoryListener::SetOutputComplete( CTelephonyAudioRouting&
- /*aTelephonyAudioRouting*/,
- TInt /*aError*/)
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::IsAnyActiveAccessory
-//
-// -----------------------------------------------------------------------------
-//
-TBool CTelDMAudioAccessoryListener::IsAnyActiveAccessory()
- {
- FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::IsAnyActiveAccessory =%d"),
- iIsActiveAccessory ))
- return iIsActiveAccessory;
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMAudioAccessoryListener::IsAccessoryAttached
-//
-// -----------------------------------------------------------------------------
-//
-TBool CTelDMAudioAccessoryListener::IsAccessoryAttached()
- {
-
- TBool accessroryAttached = EFalse;
-
- for ( TInt i=0; i < iOutputArray.Count();i++ )
- {
- if ( iOutputArray[i] == CTelephonyAudioRouting::EWiredAudioAccessory ||
- iOutputArray[i] == CTelephonyAudioRouting::EBTAudioAccessory ||
- iOutputArray[i] == CTelephonyAudioRouting::ETTY )
- {
- accessroryAttached = ETrue;
- break;
- }
- }
- FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::IsAccessoryAttached =%d"),
- accessroryAttached ))
- return accessroryAttached;
- }
-
-// End of file
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMCallStateListener.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
-* 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: Implementation of the CTelDMCallStateListener class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cteldmcallstatelistener.h"
-#include "mteldmcallstateobserver.h"
-#include "mteldmaccessory.h"
-
-#include <ctsydomainpskeys.h>
-
-// MODULE DATA STRUCTURES
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::NewL
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMCallStateListener* CTelDMCallStateListener::NewL()
- {
-
- CTelDMCallStateListener* self =
- new ( ELeave ) CTelDMCallStateListener;
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::CTelDMCallStateListener
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMCallStateListener::CTelDMCallStateListener():
-CActive( CActive::EPriorityStandard )
- {
- CActiveScheduler::Add( this );
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::~CTelDMCallStateListener
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMCallStateListener::~CTelDMCallStateListener()
- {
- Cancel();
- iProperty.Close();
- iObserverArray.Reset();
- iObserverArray.Close();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::ConstructL
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCallStateListener::ConstructL()
- {
- /// Attach to key. Start listening call state changes.
- iProperty.Attach( KPSUidCtsyCallInformation, KCTsyCallState );
- IssueRequest();
-
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::HandleChange
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCallStateListener::HandleChange()
- {
- TInt err( KErrNone );
- iCallState = KErrNone;
- err = RProperty::Get( KPSUidCtsyCallInformation,
- KCTsyCallState,
- iCallState );
- if ( err == KErrNone )
- {
- for ( TInt i = 0; i < iObserverArray.Count(); i++ )
- {
- TRAP_IGNORE( iObserverArray[ i ]->CallStateChangedL(iCallState) );
- }
- }
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::RunL
-// Cannot leave, no RunError implementation
-// -----------------------------------------------------------------------------
-//
-void CTelDMCallStateListener::RunL()
- {
- if ( iStatus.Int() == KErrNone )
- {
- HandleChange();
- }
- IssueRequest();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::DoCancel
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCallStateListener::DoCancel()
- {
- iProperty.Cancel();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::IssueRequest
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCallStateListener::IssueRequest()
- {
- if ( !IsActive() )
- {
- iProperty.Subscribe( iStatus );
- SetActive();
- }
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCallStateListener::AddObserver
-//
-// -----------------------------------------------------------------------------
-void CTelDMCallStateListener::AddObserverL( MTelDMCallStateObserver&
- aCallStateObserver )
- {
- if ( iObserverArray.Find( &aCallStateObserver ) != KErrNone )
- {
- User::LeaveIfError( iObserverArray.Append( &aCallStateObserver ) );
- }
- }
-
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMCommandHandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,266 +0,0 @@
-/*
-* 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: Implementation of the CTelDMCommandHandler class.
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include <mphonedevicemodeobserver.h>
-#include <PSVariables.h>
-#include <ctsydomainpskeys.h>
-
-#include "cteldmcommandhandler.h"
-#include "cteldmcallstatelistener.h"
-#include "mteldmaccessory.h"
-#include "cteldmdebug.h"
-#include <coreapplicationuisdomainpskeys.h>
-
-// MODULE DATA STRUCTURES
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::NewL
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMCommandHandler* CTelDMCommandHandler::NewL(
- MPhoneDeviceModeObserver& aCallHandler,
- MTelDMAccessory& aAccessory )
- {
- CTelDMCommandHandler* self =
- new ( ELeave ) CTelDMCommandHandler( aCallHandler,
- aAccessory );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::CTelDMCommandHandler
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMCommandHandler::CTelDMCommandHandler(
- MPhoneDeviceModeObserver& aCallHandler,
- MTelDMAccessory& aAccessory ):
- iCallHandler( aCallHandler ),
- iAccessory ( aAccessory ),
- iGripOpen ( EFalse ),
- iGripOpenOnRingingState ( EFalse )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::~CTelDMCommandHandler
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMCommandHandler::~CTelDMCommandHandler()
- {
- iKeyLock.Close();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::ConstructL
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCommandHandler::ConstructL()
- {
- User::LeaveIfError( iKeyLock.Connect() );
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::CallStateChanged()
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCommandHandler::CallStateChangedL( TInt aCallState )
- {
- FLOG( _L( "CTelDMCommandHandler::CallStateChanged<" ) )
- FTRACE( FPrint( _L( "CTelDMCommandHandler::CallStateChangedL.aCallState=%d"),
- aCallState ))
- iCallState = aCallState;
- switch( aCallState )
- {
- // Arriving call
- case EPSCTsyCallStateRinging:
- FLOG( _L( "CTelDMCommandHandler::CallStateChanged.Ringing" ) )
- RProperty::Set( KPSUidCoreApplicationUIs,
- KCoreAppUIsSoftReject,
- ECoreAppUIsSoftRejectUninitialized );
- iGripOpenOnRingingState = iGripOpen;
- break;
- // Answered
- case EPSCTsyCallStateConnected:
- {
- FLOG( _L( "CTelDMCommandHandler::CallStateChanged.Connected" ) )
- if ( iGripOpenOnRingingState )
- {
- OfferKeyLock();
- }
-
- // Clear the flag.
- iGripOpenOnRingingState = EFalse;
- }
- break;
- // Disconnected
- case EPSCTsyCallStateNone:
- {
- FLOG( _L( "CTelDMCommandHandler::CallStateChanged.None" ) )
- if ( iGripOpenOnRingingState )
- {
- OfferKeyLock();
- }
- }
- break;
- default:
- break;
- }
- FLOG( _L( "CTelDMCommandHandler::CallStateChanged>" ) )
- }
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::HandleEvent
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCommandHandler::HandleCommand( TCommands aCommand )
- {
- FLOG( _L( "CTelDMCommandHandler::HandleCommand<" ) )
- switch( aCommand )
- {
- case EGripOpen:
- {
- FLOG( _L( "CTelDMCommandHandler::HandleCommand.Open" ) )
- iGripOpen = ETrue;
- if ( !IsSoftRejectOngoing() )
- {
- iCallHandler.Answer();
- }
- }
- break;
- // Do not end calls if accessory is connected.
- case EGripClose:
- {
- FLOG( _L( "CTelDMCommandHandler::HandleCommand.Close" ) )
- iGripOpen = EFalse;
- EndCalls();
- break;
- }
- default:
- break;
- }
- FLOG( _L( "CTelDMCommandHandler::HandleCommand>" ) )
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::EndCalls
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCommandHandler::EndCalls()
-
- {
- if ( IsEmergencyCall() )
- {
- // None
- }
- else if ( iAccessory.IsAccessoryAttached() &&
- !iAccessory.IsAnyActiveAccessory() &&
- iCallState == EPSCTsyCallStateConnected )
- {
- FLOG( _L( "CTelDMCommandHandler::EndCalls#1" ) )
- iCallHandler.EndVoiceCalls();
- }
- else if ( !iAccessory.IsAccessoryAttached() )
- {
- FLOG( _L( "CTelDMCommandHandler::EndCalls#2" ) )
- iCallHandler.EndVoiceCalls();
- }
- }
-// -----------------------------------------------------------------------------
-// CTelDMCommandHandler::OfferKeyLock
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMCommandHandler::OfferKeyLock()
-
- {
- //- AudioAccessory attached (BT headset, Wired headset etc.)
- //- Arriving call and grip open.
- //- Call terminated or answered
- //-> KeyLock query is shown if not locked
- if ( iAccessory.IsAccessoryAttached() &&
- !iGripOpen &&
- !iKeyLock.IsKeyLockEnabled() )
- {
- FLOG( _L( "CTelDMCommandHandler::CallStateChanged -lock?" ) )
- //Lock keypad ?
- iKeyLock.OfferKeyLock();
- }
- }
-
-// ---------------------------------------------------------
-// CTelDMCommandHandler::IsEmergencyCall
-// ---------------------------------------------------------
-//
-TBool CTelDMCommandHandler::IsEmergencyCall() const
- {
- FLOG( _L( "CTelDMCommandHandler::IsEmergencyCall" ) )
- TBool retVal( EFalse );
- TInt err( KErrNone );
- TInt state( 0 );
-
- err = RProperty::Get(
- KPSUidCtsyEmergencyCallInfo,
- KCTSYEmergencyCallInfo,
- state );
-
- if ( err == KErrNone && state )
- {
- retVal = ETrue;
- }
- return retVal;
- }
-
-// ---------------------------------------------------------
-// CTelDMCommandHandler::IsSoftRejectOngoing
-// ---------------------------------------------------------
-//
-TBool CTelDMCommandHandler::IsSoftRejectOngoing() const
- {
- FLOG( _L( "CTelDMCommandHandler::IsSoftRejectOngoing" ) )
- TBool retVal( EFalse );
- TInt err( KErrNone );
- TInt state( 0 );
-
- err = RProperty::Get(
- KPSUidCoreApplicationUIs,
- KCoreAppUIsSoftReject,
- state );
-
- if ( err == KErrNone && state == ECoreAppUIsSoftReject )
- {
- retVal = ETrue;
- }
- return retVal;
- }
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMGripHandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-/*
-* Copyright (c) 2005 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 the CTelDMGripHandler class.
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include <mphonedevicemodeobserver.h>
-#include <hwrmdomainpskeys.h>
-#include "cteldmgriphandler.h"
-#include "mteldmaccessory.h"
-#include "cteldmcommandhandler.h"
-#include <settingsinternalcrkeys.h>
-#include <centralrepository.h>
-
-// MODULE DATA STRUCTURES
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::NewL
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMGripHandler* CTelDMGripHandler::NewL( CTelDMCommandHandler& aCommandHandler )
- {
-
- CTelDMGripHandler* self =
- new ( ELeave ) CTelDMGripHandler( aCommandHandler );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::CTelDMGripHandler
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMGripHandler::CTelDMGripHandler( CTelDMCommandHandler& aCommandHandler ):
-CActive( CActive::EPriorityStandard ),
-iCommandHandler ( aCommandHandler )
- {
- CActiveScheduler::Add( this );
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::~CTelDMGripHandler
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMGripHandler::~CTelDMGripHandler()
- {
- Cancel();
- iProperty.Close();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::ConstructL
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMGripHandler::ConstructL()
- {
- /// Attach to key. Start listening for changes.
- iProperty.Attach( KPSUidHWRM, KHWRMGripStatus );
- IssueRequest();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::HandleChange
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMGripHandler::HandleChange()
- {
- TInt err( KErrNone );
- TInt state( KErrNone );
- err = RProperty::Get(
- KPSUidHWRM,
- KHWRMGripStatus,
- state );
-
- if ( err == KErrNone && state == EPSHWRMGripOpen && IsSliderCallAnswer() )
- {
- iCommandHandler.HandleCommand( CTelDMCommandHandler::EGripOpen );
- }
- else if ( err == KErrNone && state == EPSHWRMGripClosed && IsSliderCallEnd())
- {
- iCommandHandler.HandleCommand( CTelDMCommandHandler::EGripClose );
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::RunL
-// Cannot leave, no RunError implementation
-// -----------------------------------------------------------------------------
-//
-void CTelDMGripHandler::RunL()
- {
- if ( iStatus.Int() == KErrNone )
- {
- HandleChange();
- }
- IssueRequest();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::DoCancel
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMGripHandler::DoCancel()
- {
- iProperty.Cancel();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMGripHandler::IssueRequest
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMGripHandler::IssueRequest()
- {
- if ( !IsActive() )
- {
- iProperty.Subscribe( iStatus );
- SetActive();
- }
- }
-
-// ---------------------------------------------------------
-// CPhoneState::IsSliderCallAnswer
-// ---------------------------------------------------------
-//
-TBool CTelDMGripHandler::IsSliderCallAnswer() const
- {
- TInt answerEnabled = 0;
- TBool retVal ( EFalse );
- TInt err = GetInt(
- KCRUidTelephonySettings,
- KSettingsOpeningSlideAnswer,
- answerEnabled );
-
- if ( err == KErrNone && answerEnabled )
- {
- retVal = ETrue;
- }
- return retVal;
- }
-
-// ---------------------------------------------------------
-// CPhoneState::IsSliderCallEnd
-// ---------------------------------------------------------
-//
-TBool CTelDMGripHandler::IsSliderCallEnd() const
- {
- TInt endEnabled = 0;
- TBool retVal ( EFalse );
- TInt err = GetInt(
- KCRUidTelephonySettings,
- KSettingsClosingSlideEnd,
- endEnabled );
-
- if ( err == KErrNone && endEnabled )
- {
- retVal = ETrue;
- }
- return retVal;
- }
-
-// ---------------------------------------------------------
-// CTelDMGripHandler::GetInt
-// ---------------------------------------------------------
-//
-TInt CTelDMGripHandler::GetInt(
- const TUid& aUid,
- const TUint aId,
- TInt& aValue ) const
- {
- CRepository* repository = NULL;
- TRAPD( err, repository = CRepository::NewL( aUid ) );
- if ( err == KErrNone )
- {
- err = repository->Get( aId, aValue );
- delete repository;
- }
- return err;
- }
-
-// End of File
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMHandlerImpl.cpp Tue Jul 06 14:15:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2005-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: Implementation of the CTelDMFactoryImpl class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <featmgr.h>
-#include <mphonedevicemodeobserver.h>
-#include <telinternalpskeys.h>
-#include "cteldmhandlerimpl.h"
-#include "cteldmgriphandler.h"
-#include "cteldmcommandhandler.h"
-#include "cteldmcallstatelistener.h"
-#include "cteldmaudioaccessorylistener.h"
-#include "cteldmdebug.h"
-
-// MODULE DATA STRUCTURES
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTelDMHandlerImpl
-//
-// Creates instance of telephony device mode factory.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CTelDMHandler* CTelDMHandlerCreateL()
- {
- return CTelDMHandlerImpl::NewL();
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMHandlerImpl::CTelDMHandlerImpl
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTelDMHandlerImpl::CTelDMHandlerImpl()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMHandlerImpl::~CTelDMHandlerImpl
-// -----------------------------------------------------------------------------
-//
-CTelDMHandlerImpl::~CTelDMHandlerImpl()
- {
- delete iCallStateListener;
- delete iAccessory;
- delete iCommandHandler;
- delete iGrip;
- FLOG( _L( "CTelDMHandlerImpl::~CTelDMHandlerImpl()" ) )
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMHandlerImpl::NewL
-//
-// -----------------------------------------------------------------------------
-//
-CTelDMHandlerImpl* CTelDMHandlerImpl::NewL()
- {
- CTelDMHandlerImpl* self = new( ELeave ) CTelDMHandlerImpl;
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CTelDMHandlerImpl::SetObserverL
-//
-// -----------------------------------------------------------------------------
-//
-void CTelDMHandlerImpl::SetObserverL( MPhoneDeviceModeObserver* aCallHandler )
- {
- // Default
- RProperty::Set(
- KPSUidTelAudioPreference,
- KTelAudioOutput,
- EPSAudioPrivate );
-
- if ( !FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider ) )
- {
- iCallStateListener = CTelDMCallStateListener::NewL();
- iAccessory = CTelDMAudioAccessoryListener::NewL();
- // Disconnects and answers to calls
- iCommandHandler = CTelDMCommandHandler::NewL(
- *aCallHandler,
- *iAccessory );
-
- iCallStateListener->AddObserverL( *iCommandHandler );
-
- iGrip = CTelDMGripHandler::NewL( *iCommandHandler );
-
- }
- }
-
-// End of File
-
-
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -122,8 +122,7 @@
mModel->addParticipant(
participant->bubbleId(),
participant->cli(),
- (int)participant->callState(),
- !(mHeader->callFlags()&BubbleManagerIF::NoCiphering));
+ participant->cliClipDirection());
}
mHeading->readBubbleHeader(header);
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -60,7 +60,6 @@
void BubbleImageWidget::setImage(const QString& name)
{
mImageName = name;
- mUpdateCount = 0;
if (!mImageName.isEmpty()) {
mDefaultAvatar->setVisible(false);
@@ -139,13 +138,6 @@
hint = QSizeF(100,100);
}
- // workaround, sometimes last resize event is missing
- if ((size().width()!=size().height()) && (mUpdateCount<10)) {
- BubbleImageWidget* mutableThis = const_cast<BubbleImageWidget*>(this);
- mutableThis->updateGeometry();
- mutableThis->mUpdateCount++; // prevent looping
- }
-
// qDebug() << "size hint: " << hint;
return hint;
} else {
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h Fri Jul 09 15:40:55 2010 +0300
@@ -60,7 +60,6 @@
QString mImageName;
HbIconItem* mDefaultAvatar;
bool mKeepSquareShape;
- int mUpdateCount;
};
#endif /* BUBBLEIMAGEWIDGET_H_ */
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -23,6 +23,7 @@
#include <hbstyleloader.h>
#include <hbabstractitemview.h>
#include <hblistviewitem.h>
+#include <hbstringutil.h>
#include "bubbleparticipantlistitem.h"
#include "bubblemanagerif.h"
@@ -135,7 +136,13 @@
}
// update group box title (CLI name)
- mGroupBox->setHeading(modelIndex().data(Qt::DisplayRole).toString());
+ if (modelIndex().data(Qt::TextAlignmentRole).toInt()==Qt::ElideLeft) {
+ QString converted = HbStringUtil::convertDigits(
+ modelIndex().data(Qt::DisplayRole).toString());
+ mGroupBox->setHeading(converted);
+ } else {
+ mGroupBox->setHeading(modelIndex().data(Qt::DisplayRole).toString());
+ }
}
void BubbleParticipantListItem::polish(HbStyleParameters& params)
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -23,20 +23,18 @@
public:
int mBubbleId;
QString mName;
- int mState;
- bool mCiphering;
+ Qt::TextElideMode mNameClip;
public:
- Participant(int bubbleId, const QString &name, int state, bool ciphering);
+ Participant(int bubbleId, const QString &name, Qt::TextElideMode mNameClip);
};
Participant::Participant(
int bubbleId,
const QString &name,
- int state,
- bool ciphering) :
- mBubbleId(bubbleId), mName(name), mState(state), mCiphering(ciphering)
+ Qt::TextElideMode nameClip) :
+ mBubbleId(bubbleId), mName(name), mNameClip(nameClip)
{
}
@@ -64,10 +62,8 @@
if (role == Qt::DisplayRole) {
return player->mName;
- } else if (role == Qt::DecorationRole) {
- return player->mState;
- } else if (role == Qt::StatusTipRole) {
- return player->mCiphering;
+ } if (role == Qt::TextAlignmentRole) {
+ return player->mNameClip;
} else {
return QVariant();
}
@@ -76,8 +72,7 @@
void BubbleParticipantListModel::addParticipant(
int bubbleId,
const QString &name,
- int state,
- bool ciphering)
+ Qt::TextElideMode nameClip)
{
bool itemExist=false;
@@ -85,8 +80,8 @@
for (int i=0; i < mParticipants.count(); i++) {
Participant* p = mParticipants[i];
if (p->mBubbleId == bubbleId) {
- if (isDataChanged(*p,name,state,ciphering)) {
- updateData(*p,name,state,ciphering);
+ if (isDataChanged(*p,name,nameClip)) {
+ updateData(*p,name,nameClip);
QModelIndex index = QAbstractListModel::createIndex(i,0);
emit dataChanged(index,index);
}
@@ -98,7 +93,7 @@
if (!itemExist) {
// insert new item
beginInsertRows(QModelIndex(), mParticipants.count(), mParticipants.count());
- Participant* p = new Participant(bubbleId,name,state, ciphering);
+ Participant* p = new Participant(bubbleId,name,nameClip);
mParticipants.append(p);
endInsertRows();
}
@@ -107,12 +102,11 @@
bool BubbleParticipantListModel::isDataChanged(
const Participant& participant,
const QString &name,
- int state,
- bool ciphering) const
+ Qt::TextElideMode nameClip) const
{
- if ( participant.mName != name ||
- participant.mState != state ||
- participant.mCiphering != ciphering ) {
+ if ( participant.mName != name ) {
+ return true;
+ } else if (participant.mNameClip != nameClip) {
return true;
} else {
return false;
@@ -122,12 +116,10 @@
void BubbleParticipantListModel::updateData(
Participant& participant,
const QString &name,
- int state,
- bool ciphering) const
+ Qt::TextElideMode nameClip) const
{
participant.mName = name;
- participant.mState = state;
- participant.mCiphering = ciphering;
+ participant.mNameClip = nameClip;
}
void BubbleParticipantListModel::removeParticipant(int bubbleId)
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.h Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.h Fri Jul 09 15:40:55 2010 +0300
@@ -34,8 +34,7 @@
void addParticipant(
int bubbleId,
const QString &name,
- int state,
- bool ciphering);
+ Qt::TextElideMode nameClip = Qt::ElideRight);
void removeParticipant(
int bubbleId);
@@ -53,14 +52,12 @@
inline bool isDataChanged(
const Participant& participant,
const QString &name,
- int state,
- bool ciphering) const;
+ Qt::TextElideMode nameClip) const;
inline void updateData(
Participant& participant,
const QString &name,
- int state,
- bool ciphering) const;
+ Qt::TextElideMode nameClip) const;
private:
QList<Participant*> mParticipants;
--- a/phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_3.docml Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_3.docml Fri Jul 09 15:40:55 2010 +0300
@@ -56,7 +56,15 @@
<widget name="eb:centerButton" type="BubbleButton">
<sizehint width="24.5un" type="PREFERRED"/>
- </widget>
+ </widget>
+
+ <widget name="eb:leftButton" type="BubbleButton">
+ <sizehint width="24.5un" type="PREFERRED"/>
+ </widget>
+
+ <widget name="eb:rightButton" type="BubbleButton">
+ <sizehint width="24.5un" type="PREFERRED"/>
+ </widget>
<layout type="anchor" widget="content">
<anchoritem src="collapsedBubble2" srcEdge="TOP" dst="" dstEdge="TOP"/>
@@ -127,8 +135,16 @@
</widget>
<widget name="eb:centerButton" type="BubbleButton">
- <sizehint width="22.0un" type="FIXED"/>
+ <sizehint width="28.0un" type="FIXED"/>
</widget>
+
+ <widget name="eb:leftButton" type="BubbleButton">
+ <sizehint width="21.0un" type="FIXED"/>
+ </widget>
+
+ <widget name="eb:rightButton" type="BubbleButton">
+ <sizehint width="21.0un" type="FIXED"/>
+ </widget>
<layout type="anchor" widget="content">
<anchoritem src="collapsedBubble2" srcEdge="TOP" dst="" dstEdge="TOP"/>
@@ -165,16 +181,16 @@
<anchoritem src="eb:callImage" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)"/>
<anchoritem src="eb:bubbleHeading" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un"/>
- <anchoritem src="eb:bubbleHeading" srcEdge="RIGHT" dst="eb:centerButton" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+ <anchoritem src="eb:bubbleHeading" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
<anchoritem src="eb:bubbleHeading" srcEdge="LEFT" dst="eb:callImage" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-left)"/>
- <anchoritem src="eb:centerButton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+ <anchoritem src="eb:centerButton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
<anchoritem src="eb:centerButton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)"/>
- <anchoritem src="eb:leftButton" srcEdge="CENTERH" dst="eb:centerButton" dstEdge="CENTERH" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+ <anchoritem src="eb:leftButton" srcEdge="RIGHT" dst="eb:rightButton" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
<anchoritem src="eb:leftButton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)"/>
- <anchoritem src="eb:rightButton" srcEdge="CENTERH" dst="eb:centerButton" dstEdge="CENTERH" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+ <anchoritem src="eb:rightButton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
<anchoritem src="eb:rightButton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)"/>
</layout>
--- a/phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_4.docml Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_4.docml Fri Jul 09 15:40:55 2010 +0300
@@ -4,9 +4,11 @@
<widget name="expandedBubble" type="BubbleContainerWidget">
<widget name="eb:participantList" type="HbListView">
</widget>
- <widget name="eb:bubbleHeading" type="BubbleHeadingWidget">
- <integer name="lines" value="2"/>
- </widget>
+ <widget name="eb:groupBox" type="HbGroupBox">
+ <widget name="eb:bubbleHeading" role="HbGroupBox:contentWidget" type="BubbleHeadingWidget">
+ <integer name="lines" value="2"/>
+ </widget>
+ </widget>
<widget name="eb:cipheringIcon" type="HbLabel">
<sizehint height="var(hb-param-graphic-size-secondary)" width="var(hb-param-graphic-size-secondary)" type="FIXED"/>
</widget>
@@ -26,6 +28,14 @@
</widget>
<section name="portrait">
+ <widget name="eb:groupBox" type="HbGroupBox">
+ <sizehint height="-1.0" type="PREFERRED"/>
+ </widget>
+
+ <widget name="eb:bubbleHeading" type="BubbleHeadingWidget">
+ <integer name="lines" value="2"/>
+ </widget>
+
<layout type="anchor" widget="content">
<anchoritem src="expandedBubble" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
<anchoritem src="expandedBubble" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
@@ -34,14 +44,14 @@
</layout>
<layout type="anchor" widget="expandedBubble">
- <anchoritem src="eb:bubbleHeading" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un"/>
- <anchoritem src="eb:bubbleHeading" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)"/>
- <anchoritem src="eb:bubbleHeading" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
- <anchoritem src="eb:bubbleHeading" srcEdge="BOTTOM" dst="eb:participantList" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+ <anchoritem src="eb:groupBox" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <anchoritem src="eb:groupBox" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <anchoritem src="eb:groupBox" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+ <anchoritem src="eb:groupBox" srcEdge="BOTTOM" dst="eb:participantList" dstEdge="TOP"/>
- <anchoritem src="eb:participantList" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)"/>
- <anchoritem src="eb:participantList" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
- <anchoritem src="eb:participantList" srcEdge="BOTTOM" dst="eb:centerButton" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+ <anchoritem src="eb:participantList" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <anchoritem src="eb:participantList" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+ <anchoritem src="eb:participantList" srcEdge="BOTTOM" dst="eb:centerButton" dstEdge="TOP"/>
<anchoritem src="eb:leftButton" srcEdge="RIGHT" dst="" dstEdge="CENTERH" spacing="expr(var(hb-param-margin-gene-middle-horizontal)/2)"/>
<anchoritem src="eb:leftButton" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)"/>
@@ -57,6 +67,14 @@
</section>
<section name="landscape">
+ <widget name="eb:groupBox" type="HbGroupBox">
+ <sizehint height="6.5un" type="FIXED"/>
+ </widget>
+
+ <widget name="eb:bubbleHeading" type="BubbleHeadingWidget">
+ <integer name="lines" value="1"/>
+ </widget>
+
<layout type="anchor" widget="content">
<anchoritem src="expandedBubble" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
<anchoritem src="expandedBubble" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
@@ -65,9 +83,10 @@
</layout>
<layout type="anchor" widget="expandedBubble">
- <anchoritem src="eb:bubbleHeading" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un"/>
- <anchoritem src="eb:bubbleHeading" srcEdge="LEFT" dst="" dstEdge="CENTERH" spacing="-var(hb-param-margin-gene-left)"/>
- <anchoritem src="eb:bubbleHeading" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
+ <anchoritem src="eb:groupBox" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <anchoritem src="eb:groupBox" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <anchoritem src="eb:groupBox" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+ <anchoritem src="eb:groupBox" srcEdge="BOTTOM" dst="eb:participantList" dstEdge="TOP"/>
<anchoritem src="eb:centerButton" srcEdge="LEFT" dst="" dstEdge="CENTERH" spacing="-13.0un"/>
<anchoritem src="eb:centerButton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="13.0un"/>
@@ -78,10 +97,10 @@
<anchoritem src="eb:rightButton" srcEdge="LEFT" dst="eb:centerButton" dstEdge="CENTERH" spacing="-1.0un"/>
<anchoritem src="eb:rightButton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="1.0un"/>
<anchoritem src="eb:rightButton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="3.0un"/>
- <anchoritem src="eb:participantList" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-2.0un"/>
- <anchoritem src="eb:participantList" srcEdge="RIGHT" dst="" dstEdge="CENTERH" spacing="2.0un"/>
- <anchoritem src="eb:participantList" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-2.0un"/>
- <anchoritem src="eb:participantList" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="2.0un"/>
+
+ <anchoritem src="eb:participantList" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <anchoritem src="eb:participantList" srcEdge="RIGHT" dst="" dstEdge="CENTERH"/>
+ <anchoritem src="eb:participantList" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
</layout>
</section>
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -315,7 +315,7 @@
bubbleManager().setState(mConfBubbleId,BubbleManagerIF::Active);
bubbleManager().setCli(mConfBubbleId,"Conference call",Qt::ElideRight);
if (mCallTimer->isChecked()) {
- bubbleManager().setCallTime( mConfBubbleId, "0:00" );
+ bubbleManager().setCallTime( mConfBubbleId, "00:00:00" );
}
bubbleManager().addAction(mConfBubbleId, mMute);
bubbleManager().addAction(mConfBubbleId, mEndConference);
@@ -358,7 +358,7 @@
foreach (TestCall call, mCalls) {
if ( call.callState == BubbleManager::Active ||
call.callState == BubbleManager::OnHold ) {
- bubbleManager().updateCallTime(call.bubbleId,"0:01");
+ bubbleManager().updateCallTime(call.bubbleId,"00:00:01");
}
}
}
@@ -456,7 +456,7 @@
bubbleManager().setCli(bubble, "Gloria Andersson", Qt::ElideRight);
bubbleManager().setSecondaryCli( bubble, "+35850123456789" );
} else {
- bubbleManager().setCli(bubble, "+35850123456789", Qt::ElideRight);
+ bubbleManager().setCli(bubble, "+35850123456789", Qt::ElideLeft);
}
setCallObject(bubble, ":resources/contactpic.jpg");
@@ -479,9 +479,9 @@
}
} else {
if (callCount()==2) {
- bubbleManager().setCli(bubble, "+35850232323232", Qt::ElideRight);
+ bubbleManager().setCli(bubble, "+35850232323232", Qt::ElideLeft);
} else {
- bubbleManager().setCli(bubble, "+35840987654321", Qt::ElideRight);
+ bubbleManager().setCli(bubble, "+35840987654321", Qt::ElideLeft);
}
}
@@ -524,7 +524,7 @@
case BubbleManager::Active:
{
if ( mCallTimer->isChecked() ) {
- bubbleManager().setCallTime( bubble, "0:00" );
+ bubbleManager().setCallTime( bubble, "00:00:00" );
}
break;
}
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubblepartlistmodel/ut_bubblepartlistmodel.cpp Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblepartlistmodel/ut_bubblepartlistmodel.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -62,33 +62,23 @@
{
QSignalSpy spyDataChanged(mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
- mModel->addParticipant(1,"Bubble-1",8,true);
- mModel->addParticipant(2,"Bubble-2",9,false);
- mModel->addParticipant(3,"Bubble-3",10,true);
+ mModel->addParticipant(1,"Bubble-1");
+ mModel->addParticipant(2,"Bubble-2");
+ mModel->addParticipant(3,"Bubble-3");
QVERIFY(mModel->rowCount()==3);
QVERIFY(spyDataChanged.count()==0);
// name changed
- mModel->addParticipant(2,"Bubble-Two",9,false);
+ mModel->addParticipant(2,"Bubble-Two");
QVERIFY(mModel->rowCount()==3);
QVERIFY(spyDataChanged.count()==1);
-
- // state changed
- mModel->addParticipant(2,"Bubble-Two",11,false);
- QVERIFY(mModel->rowCount()==3);
- QVERIFY(spyDataChanged.count()==2);
-
- // ciphering changed
- mModel->addParticipant(2,"Bubble-Two",11,true);
- QVERIFY(mModel->rowCount()==3);
- QVERIFY(spyDataChanged.count()==3);
}
void ut_BubbleParticipantListModel::test_removeParticipant()
{
- mModel->addParticipant(1,"Bubble-1",8,true);
- mModel->addParticipant(2,"Bubble-2",9,false);
- mModel->addParticipant(3,"Bubble-3",10,true);
+ mModel->addParticipant(1,"Bubble-1");
+ mModel->addParticipant(2,"Bubble-2");
+ mModel->addParticipant(3,"Bubble-3");
mModel->removeParticipant(2);
QVERIFY(mModel->rowCount()==2);
@@ -96,15 +86,15 @@
mModel->removeParticipant(3);
QVERIFY(mModel->rowCount()==1);
- mModel->addParticipant(2,"Bubble-2",9,false);
+ mModel->addParticipant(2,"Bubble-2");
QVERIFY(mModel->rowCount()==2);
}
void ut_BubbleParticipantListModel::test_bubbleId()
{
- mModel->addParticipant(1,"Bubble-1",8,true);
- mModel->addParticipant(2,"Bubble-2",9,false);
- mModel->addParticipant(3,"Bubble-3",10,true);
+ mModel->addParticipant(1,"Bubble-1");
+ mModel->addParticipant(2,"Bubble-2");
+ mModel->addParticipant(3,"Bubble-3");
QVERIFY(mModel->bubbleId(1)==2);
QVERIFY(mModel->bubbleId(4)==-1);
@@ -112,19 +102,16 @@
void ut_BubbleParticipantListModel::test_dataModel()
{
- mModel->addParticipant(1,"Bubble-1",8,true);
- mModel->addParticipant(2,"Bubble-2",9,false);
- mModel->addParticipant(3,"Bubble-3",10,true);
+ mModel->addParticipant(1,"Bubble-1");
+ mModel->addParticipant(2,"Bubble-2",Qt::ElideLeft);
+ mModel->addParticipant(3,"Bubble-3");
QModelIndex index = mModel->index(1,0);
- QVERIFY(index.data(Qt::DecorationRole).toInt()==9);
QVERIFY(index.data(Qt::DisplayRole).toString()=="Bubble-2");
- QVERIFY(index.data(Qt::StatusTipRole).toBool()==false);
- QVERIFY(index.data(Qt::UserRole).isNull());
+ QVERIFY(index.data(Qt::TextAlignmentRole).toInt()==Qt::ElideLeft);
- index = mModel->index(2,0);
- QVERIFY(index.data(Qt::StatusTipRole).toBool()==true);
+ QVERIFY(index.data(Qt::EditRole).isNull());
index = mModel->index(4,0);
QVERIFY(index.data(Qt::DisplayRole).isNull());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/bwins/TelephonyDeviceModeU.DEF Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ ?CTelDMHandlerCreateL@@YAPAVCTelDMHandler@@XZ @ 1 NONAME ; class CTelDMHandler * CTelDMHandlerCreateL(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/eabi/telephonydevicemodeu.def Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ _Z20CTelDMHandlerCreateLv @ 1 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/group/bld.inf Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* Copyright (c) 2005 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: Build information file for TelephonyDeviceMode
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+telephonydevicemode_stub.sis /epoc32/data/z/system/install/telephonydevicemode_stub.sis
+
+// IBY files
+../rom/telephonydevicemode.iby CORE_APP_LAYER_IBY_EXPORT_PATH(telephonydevicemode.iby)
+
+PRJ_MMPFILES
+../group/telephonydevicemode.mmp
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/group/telephonydevicemode.mmp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2005-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: Project specification for Telephony Device Mode
+*
+*/
+
+#include <platform_paths.hrh>
+
+// Capability assignment.
+CAPABILITY CAP_GENERAL_DLL
+// Assign Vendor ID.
+VENDORID VID_DEFAULT
+
+TARGET telephonydevicemode.dll
+TARGETTYPE DLL
+UID 0x1000008d 0x1020299B
+
+SOURCEPATH ../src
+SOURCE cteldmhandlerimpl.cpp
+SOURCE cteldmgriphandler.cpp
+SOURCE cteldmcallstatelistener.cpp
+SOURCE cteldmcommandhandler.cpp
+SOURCE cteldmaudioaccessorylistener.cpp
+
+USERINCLUDE ../inc
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE ../../../inc // Telephony internal headers
+
+LIBRARY euser.lib
+LIBRARY featmgr.lib
+LIBRARY avkon.lib
+LIBRARY telephonyaudiorouting.lib
+LIBRARY centralrepository.lib
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/group/telephonydevicemode.pkg Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 2009 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: Packing for telephony device mode.
+;
+; Languages
+&EN
+
+; Header
+#{"TelephonyDeviceMode"}, (0x1020299B), 10, 1, 0, TYPE=SA
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+;Files
+"\epoc32\RELEASE\armv5\UREL\TelephonyDeviceMode.dll"-"z:\sys\bin\TelephonyDeviceMode.dll"
Binary file phoneuis/telephonydevicemode/group/telephonydevicemode_stub.SIS has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/group/telephonydevicemode_stub.pkg Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 2009 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: Packing of telephony device mode.
+;
+; Languages
+&EN
+
+; Header
+#{"TelephonyDeviceMode"}, (0x1020299B), 1, 0, 0, TYPE=SA
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+;Files
+""-"z:\sys\bin\TelephonyDeviceMode.dll"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/CTelDMCallStateListener.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,105 @@
+/*
+* 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: Header file for MTelDMCallStateObserver class.
+*
+*/
+
+
+
+#ifndef CTELDMCALLSTATELISTENER_H
+#define CTELDMCALLSTATELISTENER_H
+
+// INCLUDES
+#include <e32property.h>
+#include <e32base.h>
+
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+class MTelDMCallStateObserver;
+
+/**
+* Call state listener. Listening TelephonyCallState PS key.
+*
+* @since 3.1
+*/
+
+NONSHARABLE_CLASS( CTelDMCallStateListener ) : public CActive
+ {
+ public: // Constructors and destructors.
+
+ /**
+ * Two-phased constructor.
+ */
+ static CTelDMCallStateListener* NewL();
+
+ /**
+ * Destructor.
+ */
+ virtual ~CTelDMCallStateListener();
+
+
+ public:
+
+ void AddObserverL( MTelDMCallStateObserver& aCallStateObserver );
+
+ private: // from CActive
+
+ /**
+ * @see CActive::RunL.
+ */
+ void RunL();
+
+ /**
+ * @see CActive::DoCancel.
+ */
+ void DoCancel();
+
+ private:
+
+ /**
+ * Handle notification request
+ */
+ void HandleChange();
+
+ /**
+ * Start notification.
+ */
+ void IssueRequest();
+
+ /**
+ * Constructor.
+ */
+ CTelDMCallStateListener();
+
+ /**
+ * Symbian OS constructor.
+ */
+ void ConstructL();
+
+ private:
+ // Owned Publish & Subscribe instance.
+ RProperty iProperty;
+
+ // Call state
+ TInt iCallState;
+
+ // Call State Change Observer array.
+ RPointerArray< MTelDMCallStateObserver > iObserverArray;
+ };
+
+#endif // CTELDMCALLSTATELISTENER_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/CTelDMDebug.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* 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: This file defines logging macros for TelephonyDeviceMode
+*
+*/
+
+
+
+#ifndef CTELDMDEBUG_H
+#define CTELDMDEBUG_H
+
+#ifdef _DEBUG
+// ===========================================================================
+ // RDebug logging for target HW
+// ===========================================================================
+#include <e32svr.h>
+
+#define FLOG( a ) { RDebug::Print( a ); }
+#define FTRACE( a ) { a; }
+
+// Declare the FPrint function
+//
+inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
+ {
+ VA_LIST list;
+ VA_START( list, aFmt );
+ TInt tmpInt = VA_ARG( list, TInt );
+ TInt tmpInt2 = VA_ARG( list, TInt );
+ TInt tmpInt3 = VA_ARG( list, TInt );
+ VA_END( list );
+ RDebug::Print( aFmt, tmpInt, tmpInt2, tmpInt3 );
+ }
+
+// ===========================================================================
+#else // // No loggings --> Reduced binary size
+// ===========================================================================
+#define FLOG( a )
+#define FTRACE( a )
+
+#endif // _DEBUG
+
+#endif //
+
+// End of File
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/CTelDMGripHandler.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,131 @@
+/*
+* Copyright (c) 2005 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: Concrete session class for Telephony Device Mode
+*
+*/
+
+
+
+#ifndef CTELDMGRIPHANDLER_H
+#define CTELDMGRIPHANDLER_H
+
+// INCLUDES
+
+#include <e32property.h>
+#include <e32base.h>
+
+
+// FORWARD DECLARATIONS
+
+class MPhoneDeviceModeObserver;
+class MTelDMAccessory;
+class CTelDMCommandHandler;
+
+// CLASS DECLARATION
+
+/**
+* Concrete session class for Telephony Device Mode
+*
+* @since 3.0
+*/
+
+NONSHARABLE_CLASS( CTelDMGripHandler ) : public CActive
+ {
+ public: // Constructors and destructors.
+
+ /**
+ * Two-phased constructor.
+ */
+ static CTelDMGripHandler* NewL( CTelDMCommandHandler& aCommandHandler );
+
+ /**
+ * Destructor.
+ */
+ virtual ~CTelDMGripHandler();
+
+ public: // New functions
+
+ public: // Functions from base classes
+
+ private: // Functions from base classes
+
+ /**
+ * @see CActive::RunL.
+ */
+ void RunL();
+
+ /**
+ * @see CActive::DoCancel.
+ */
+ void DoCancel();
+
+ private:
+
+ /**
+ * Handle notification request
+ */
+ void HandleChange();
+
+ /**
+ * Start notification.
+ */
+ void IssueRequest();
+
+ /**
+ * Constructor.
+ */
+ CTelDMGripHandler( CTelDMCommandHandler& aCommandHandler );
+
+ /**
+ * Symbian OS constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Check phone settings
+ * @return Status of settings value
+ */
+ TBool IsSliderCallAnswer() const;
+
+ /**
+ * Check phone settings
+ * @return Status of settings value
+ */
+ TBool IsSliderCallEnd()const;
+
+ /**
+ * Get integer value of setting
+ * @param aUid identifing the central repository UID.
+ * @param aId central repository ID.
+ * @param aValue the value associated with the central repository ID
+ * @return
+ */
+ TInt CTelDMGripHandler::GetInt(
+ const TUid& aUid,
+ const TUint aId,
+ TInt& aValue ) const;
+
+ private:
+ // Owned Publish & Subscribe instance.
+ RProperty iProperty;
+
+ // Reference to commander
+ CTelDMCommandHandler& iCommandHandler;
+
+
+ };
+
+#endif // CTELDMGRIPHANDLER_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/CTelDMHandlerImpl.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) 2005-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: Implementation class for for Telephony Device Mode
+*
+*/
+
+
+
+#ifndef CTELDMHANDLERIMPL_H
+#define CTELDMHANDLERIMPL_H
+
+#include <e32base.h>
+#include <cteldmhandler.h>
+#include <bldvariant.hrh>
+
+// FORWARD DECLARATIONS
+
+class MPhoneDeviceModeObserver;
+class CTelDMCallStateListener;
+class CTelDMGripHandler;
+class CTelDMCommandHandler;
+class CTelDMAudioAccessoryListener;
+class MTelDMAccessory;
+
+
+// CLASS DECLARATION
+
+
+NONSHARABLE_CLASS( CTelDMHandlerImpl ) : public CTelDMHandler
+ {
+ public: // Constructors and destructors.
+
+ /**
+ * Two-phased constructor.
+ *
+ * @return new instance of the class.
+ */
+ static CTelDMHandlerImpl* NewL();
+
+ /** D'tor. */
+ virtual ~CTelDMHandlerImpl();
+
+ public: // From base classes.
+
+ /**
+ * Set call event observer
+ * @return void
+ */
+ void SetObserverL( MPhoneDeviceModeObserver* aCallHandler );
+
+ private:
+
+ /**
+ * C++ constructor.
+ */
+ CTelDMHandlerImpl();
+
+ /**
+ * Symbian OS default constructor.
+ */
+ void ConstructL();
+
+
+ private:
+
+ /**
+ * Grip handler, Owned
+ */
+ CTelDMGripHandler* iGrip;
+
+ /**
+ * Accessory status, Owned
+ */
+ CTelDMAudioAccessoryListener* iAccessory;
+
+ /**
+ * Call state listener, Owned
+ */
+ CTelDMCallStateListener* iCallStateListener;
+
+ /**
+ * Commander, Owned
+ */
+ CTelDMCommandHandler* iCommandHandler;
+
+ };
+
+
+#endif // CTELDMHANDLERIMPL_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/MTelDMAccessory.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* 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: Header file for MTelDMAccessory class.
+*
+*
+*/
+
+
+#ifndef MTELDMACCESSORY_H
+#define MTELDMACCESSORY_H
+
+// INCLUDES
+
+//CLASS DECLARATION
+
+/**
+* Accessory mode
+*
+* @since 3.1
+*/
+class MTelDMAccessory
+ {
+
+ public: // New functions
+
+ /**
+ * Is accessory attached ?
+ * @param none
+ * @return True if accessory attached.
+ */
+ virtual TBool IsAccessoryAttached() = 0;
+
+ /**
+ * Is any active accessory ?
+ * @param none
+ * @return True if active accessory.
+ */
+ virtual TBool IsAnyActiveAccessory() = 0;
+
+ };
+
+#endif // MTELDMACCESSORY_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/MTelDMCallStateObserver.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,48 @@
+/*
+* 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: Header file for MTelDMCallStateObserver class.
+*
+*
+*/
+
+
+#ifndef MTELDMSTATEOBSERVER_H
+#define MTELDMSTATEOBSERVER_H
+
+// INCLUDES
+
+//CLASS DECLARATION
+
+/**
+* Call state mode observer.
+*
+* @since 3.1
+*/
+class MTelDMCallStateObserver
+ {
+
+ public: // New functions
+
+ /**
+ * Notify changes of calls
+ * @param Call state from TelephonyInternalPSKeys.h
+ * @return none
+ */
+ virtual void CallStateChangedL( TInt aCallState ) = 0;
+
+ };
+
+#endif // MTELDMSTATEOBSERVER_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/cteldmaudioaccessorylistener.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,99 @@
+/*
+* Copyright (c) 2002-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: Accessory mode.
+*
+*/
+
+
+#ifndef CTELDMAUDIOACCESSORYLISTENER_H
+#define CTELDMAUDIOACCESSORYLISTENER_H
+
+// INCLUDE FILES
+#include <MTelephonyAudioRoutingObserver.h>
+#include "mteldmaccessory.h"
+
+// FORWARD DECLARATIONS
+
+// CLASS DEFINITIONS
+class CTelephonyAudioRouting;
+
+/**
+* Class for listening accessory mode and routing changes.
+*
+* @lib telephonydevicemode.dll
+* @since 3.1
+*/
+NONSHARABLE_CLASS( CTelDMAudioAccessoryListener ): public CBase,
+ public MTelDMAccessory,
+ public MTelephonyAudioRoutingObserver
+ {
+ public: // constructor & destructor
+
+ /**
+ * Two phase constructor
+ */
+ static CTelDMAudioAccessoryListener* NewL();
+
+ // Destructor
+ virtual ~CTelDMAudioAccessoryListener( );
+
+
+ public: // from MTelDMAccessory
+
+ /**
+ * See MTelDMAccessory
+ */
+ TBool IsAccessoryAttached();
+
+ /**
+ * See MTelDMAccessory
+ */
+ TBool IsAnyActiveAccessory();
+
+ public: //from MTelephonyAudioRoutingObserver
+
+ void AvailableOutputsChanged( CTelephonyAudioRouting&
+ aTelephonyAudioRouting);
+
+ void OutputChanged( CTelephonyAudioRouting&
+ aTelephonyAudioRouting);
+
+ void SetOutputComplete( CTelephonyAudioRouting&
+ aTelephonyAudioRouting,
+ TInt aError);
+ private: // Constructor
+
+ /** c++ constructor */
+ CTelDMAudioAccessoryListener();
+
+ /** 2nd phase constructor */
+ void ConstructL();
+
+
+ private:
+
+ // Array of available outputs
+ RArray<CTelephonyAudioRouting::TAudioOutput> iOutputArray;
+
+ // Current accessory mode.
+ TBool iIsActiveAccessory;
+
+ // Audio routing API
+ CTelephonyAudioRouting* iAudioRouting;
+
+ };
+
+#endif // CTELDMAUDIOACCESSORYLISTENER_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/inc/cteldmcommandhandler.h Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,129 @@
+/*
+* Copyright (c) 2002-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: Header file for CTelDMCommandHandler class.
+*
+*/
+
+
+#ifndef CTELDMCOMMANDHANDLER_H
+#define CTELDMCOMMANDHANDLER_H
+
+// INCLUDE FILES
+
+#include <e32base.h>
+#include <aknkeylock.h>
+#include "mteldmcallstateobserver.h"
+
+// FORWARD DECLARATIONS
+
+// CLASS DEFINITIONS
+
+class MTelDMAcessory;
+class MPhoneDeviceModeObserver;
+class MTelDMAccessory;
+class CTelDMCallStateListener;
+/**
+* Class for command
+*
+* @lib telephonydevicemode.dll
+* @since 3.1
+*/
+NONSHARABLE_CLASS( CTelDMCommandHandler ): public CBase,
+ public MTelDMCallStateObserver
+ {
+ public: // constructor & destructor
+
+ /**
+ * Two phase constructor
+ */
+ static CTelDMCommandHandler* NewL( MPhoneDeviceModeObserver& aCallHandler,
+ MTelDMAccessory& aAccessory );
+
+ // Destructor
+ virtual ~CTelDMCommandHandler();
+
+ public:
+
+ enum TCommands
+ {
+ EGripOpen,
+ EGripClose
+ };
+
+ void HandleCommand( TCommands aCommand );
+
+ public: // from MTelDMCallStateObserver
+
+ /** See MTelDMCallStateObserver.h */
+ void CallStateChangedL( TInt aCallState );
+
+
+ private: // Constructor
+
+ /** c++ constructor */
+ CTelDMCommandHandler( MPhoneDeviceModeObserver& aCallHandler,
+ MTelDMAccessory& aAccessory );
+
+ /** 2nd phase constructor */
+ void ConstructL();
+
+ private:
+
+ /**
+ * Ends calls
+ */
+ void EndCalls();
+
+ /**
+ * Offer key lock query.
+ */
+ void OfferKeyLock();
+
+ /**
+ * Check emergency call
+ * @return status of emergency call
+ */
+ TBool IsEmergencyCall() const;
+
+ /**
+ * Check soft reject
+ * @return status of soft reject operation
+ */
+ TBool IsSoftRejectOngoing() const;
+
+ private:
+
+ // Reference to device mode observer
+ MPhoneDeviceModeObserver& iCallHandler;
+
+ // Reference to accessory listene
+ MTelDMAccessory& iAccessory;
+
+ // For keypad locking.
+ RAknKeyLock iKeyLock;
+
+ // Is grip open ?
+ TBool iGripOpen;
+
+ // Grip open when ringing state ?
+ TBool iGripOpenOnRingingState;
+
+ // Call state
+ TInt iCallState;
+
+ };
+
+#endif // CTELDMCOMMANDHANDLER_H
+
+// end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/rom/telephonydevicemode.iby Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2005 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: IBY file for telephony device mode.
+ *
+*/
+
+#ifndef __TELEPHONYDEVICEMODE_IBY__
+#define __TELEPHONYDEVICEMODE_IBY__
+
+file=ABI_DIR\BUILD_DIR\telephonydevicemode.dll SHARED_LIB_DIR\telephonydevicemode.dll
+data=ZSYSTEM\Install\telephonydevicemode_stub.sis \System\Install\telephonydevicemode_stub.sis
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/src/cteldmaudioaccessorylistener.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,196 @@
+/*
+* Copyright (c) 2002-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: Accessory mode.
+*
+*/
+
+
+// INCLUDE FILES
+#include "cteldmaudioaccessorylistener.h" // this
+#include "cteldmdebug.h"
+#include <TelephonyAudioRouting.h>
+
+// CONSTANTS
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::NewL
+//
+// Two phase constructor
+// -----------------------------------------------------------------------------
+//
+CTelDMAudioAccessoryListener* CTelDMAudioAccessoryListener::NewL()
+ {
+ CTelDMAudioAccessoryListener* self = new ( ELeave ) CTelDMAudioAccessoryListener( );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop();
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::~CTelDMAudioAccessoryListener
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMAudioAccessoryListener::~CTelDMAudioAccessoryListener( )
+ {
+ FLOG( _L( "CTelDMAudioAccessoryListener::~CTelDMAudioAccessoryListener()" ) )
+ delete iAudioRouting;
+ iOutputArray.Reset();
+ iOutputArray.Close();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::CTelDMAudioAccessoryListener
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMAudioAccessoryListener::CTelDMAudioAccessoryListener( ):
+ iIsActiveAccessory ( EFalse )
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::ConstructL
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMAudioAccessoryListener::ConstructL()
+ {
+ FLOG( _L( "CTelDMAudioAccessoryListener::ConstructL<" ) )
+ // Audio route handler
+ iAudioRouting = CTelephonyAudioRouting::NewL( *this );
+ FLOG( _L( "CTelDMAudioAccessoryListener::ConstructL>" ) )
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::AvailableOutputsChanged
+// Receives event on accessory mode change.
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMAudioAccessoryListener::AvailableOutputsChanged( CTelephonyAudioRouting&
+ aTelephonyAudioRouting )
+ {
+ FLOG( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged<" ) )
+ iOutputArray.Reset();
+
+ TArray<CTelephonyAudioRouting::TAudioOutput> availableOutputs
+ = aTelephonyAudioRouting.AvailableOutputs();
+
+ // Stores available output
+ for ( TInt i=0; i< availableOutputs.Count();i++ )
+ {
+ TRAPD(err, iOutputArray.AppendL( availableOutputs[i] ));
+ if(err != KErrNone)
+ {
+ FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged failed =%d"),
+ err ))
+ }
+ }
+
+ FLOG( _L( "CTelDMAudioAccessoryListener::AvailableOutputsChanged>" ) )
+ }
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::OutputChanged
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMAudioAccessoryListener::OutputChanged( CTelephonyAudioRouting&
+ aTelephonyAudioRouting)
+ {
+ FLOG( _L( "CTelDMAudioAccessoryListener::OutputsChanged<" ) )
+ CTelephonyAudioRouting::TAudioOutput output = aTelephonyAudioRouting.Output();
+
+ switch ( output )
+ {
+ // No active outputs available
+ case CTelephonyAudioRouting::ENone:
+ iIsActiveAccessory = EFalse;
+ break;
+ case CTelephonyAudioRouting::EHandset:
+ iIsActiveAccessory = EFalse;
+ break;
+ case CTelephonyAudioRouting::ELoudspeaker:
+ iIsActiveAccessory = EFalse;
+ break;
+ // Active outputs available
+ case CTelephonyAudioRouting::EWiredAudioAccessory:
+ iIsActiveAccessory = ETrue;
+ break;
+ case CTelephonyAudioRouting::EBTAudioAccessory:
+ iIsActiveAccessory = ETrue;
+ break;
+ case CTelephonyAudioRouting::ETTY:
+ iIsActiveAccessory = ETrue;
+ break;
+ default:
+ break;
+ }
+ FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::OutputsChanged =%d"),
+ iIsActiveAccessory ))
+ FLOG( _L( "CTelDMAudioAccessoryListener::OutputsChanged>" ) )
+ }
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::SetOutputComplete
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMAudioAccessoryListener::SetOutputComplete( CTelephonyAudioRouting&
+ /*aTelephonyAudioRouting*/,
+ TInt /*aError*/)
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::IsAnyActiveAccessory
+//
+// -----------------------------------------------------------------------------
+//
+TBool CTelDMAudioAccessoryListener::IsAnyActiveAccessory()
+ {
+ FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::IsAnyActiveAccessory =%d"),
+ iIsActiveAccessory ))
+ return iIsActiveAccessory;
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMAudioAccessoryListener::IsAccessoryAttached
+//
+// -----------------------------------------------------------------------------
+//
+TBool CTelDMAudioAccessoryListener::IsAccessoryAttached()
+ {
+
+ TBool accessroryAttached = EFalse;
+
+ for ( TInt i=0; i < iOutputArray.Count();i++ )
+ {
+ if ( iOutputArray[i] == CTelephonyAudioRouting::EWiredAudioAccessory ||
+ iOutputArray[i] == CTelephonyAudioRouting::EBTAudioAccessory ||
+ iOutputArray[i] == CTelephonyAudioRouting::ETTY )
+ {
+ accessroryAttached = ETrue;
+ break;
+ }
+ }
+ FTRACE( FPrint( _L( "CTelDMAudioAccessoryListener::IsAccessoryAttached =%d"),
+ accessroryAttached ))
+ return accessroryAttached;
+ }
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/src/cteldmcallstatelistener.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,158 @@
+/*
+* 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: Implementation of the CTelDMCallStateListener class.
+*
+*/
+
+
+
+// INCLUDE FILES
+#include "cteldmcallstatelistener.h"
+#include "mteldmcallstateobserver.h"
+#include "mteldmaccessory.h"
+
+#include <ctsydomainpskeys.h>
+
+// MODULE DATA STRUCTURES
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::NewL
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMCallStateListener* CTelDMCallStateListener::NewL()
+ {
+
+ CTelDMCallStateListener* self =
+ new ( ELeave ) CTelDMCallStateListener;
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::CTelDMCallStateListener
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMCallStateListener::CTelDMCallStateListener():
+CActive( CActive::EPriorityStandard )
+ {
+ CActiveScheduler::Add( this );
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::~CTelDMCallStateListener
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMCallStateListener::~CTelDMCallStateListener()
+ {
+ Cancel();
+ iProperty.Close();
+ iObserverArray.Reset();
+ iObserverArray.Close();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::ConstructL
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCallStateListener::ConstructL()
+ {
+ /// Attach to key. Start listening call state changes.
+ iProperty.Attach( KPSUidCtsyCallInformation, KCTsyCallState );
+ IssueRequest();
+
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::HandleChange
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCallStateListener::HandleChange()
+ {
+ TInt err( KErrNone );
+ iCallState = KErrNone;
+ err = RProperty::Get( KPSUidCtsyCallInformation,
+ KCTsyCallState,
+ iCallState );
+ if ( err == KErrNone )
+ {
+ for ( TInt i = 0; i < iObserverArray.Count(); i++ )
+ {
+ TRAP_IGNORE( iObserverArray[ i ]->CallStateChangedL(iCallState) );
+ }
+ }
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::RunL
+// Cannot leave, no RunError implementation
+// -----------------------------------------------------------------------------
+//
+void CTelDMCallStateListener::RunL()
+ {
+ if ( iStatus.Int() == KErrNone )
+ {
+ HandleChange();
+ }
+ IssueRequest();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::DoCancel
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCallStateListener::DoCancel()
+ {
+ iProperty.Cancel();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::IssueRequest
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCallStateListener::IssueRequest()
+ {
+ if ( !IsActive() )
+ {
+ iProperty.Subscribe( iStatus );
+ SetActive();
+ }
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCallStateListener::AddObserver
+//
+// -----------------------------------------------------------------------------
+void CTelDMCallStateListener::AddObserverL( MTelDMCallStateObserver&
+ aCallStateObserver )
+ {
+ if ( iObserverArray.Find( &aCallStateObserver ) != KErrNone )
+ {
+ User::LeaveIfError( iObserverArray.Append( &aCallStateObserver ) );
+ }
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/src/cteldmcommandhandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,266 @@
+/*
+* 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: Implementation of the CTelDMCommandHandler class.
+*
+*/
+
+
+
+// INCLUDE FILES
+
+#include <mphonedevicemodeobserver.h>
+#include <PSVariables.h>
+#include <ctsydomainpskeys.h>
+
+#include "cteldmcommandhandler.h"
+#include "cteldmcallstatelistener.h"
+#include "mteldmaccessory.h"
+#include "cteldmdebug.h"
+#include <coreapplicationuisdomainpskeys.h>
+
+// MODULE DATA STRUCTURES
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::NewL
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMCommandHandler* CTelDMCommandHandler::NewL(
+ MPhoneDeviceModeObserver& aCallHandler,
+ MTelDMAccessory& aAccessory )
+ {
+ CTelDMCommandHandler* self =
+ new ( ELeave ) CTelDMCommandHandler( aCallHandler,
+ aAccessory );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::CTelDMCommandHandler
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMCommandHandler::CTelDMCommandHandler(
+ MPhoneDeviceModeObserver& aCallHandler,
+ MTelDMAccessory& aAccessory ):
+ iCallHandler( aCallHandler ),
+ iAccessory ( aAccessory ),
+ iGripOpen ( EFalse ),
+ iGripOpenOnRingingState ( EFalse )
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::~CTelDMCommandHandler
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMCommandHandler::~CTelDMCommandHandler()
+ {
+ iKeyLock.Close();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::ConstructL
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCommandHandler::ConstructL()
+ {
+ User::LeaveIfError( iKeyLock.Connect() );
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::CallStateChanged()
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCommandHandler::CallStateChangedL( TInt aCallState )
+ {
+ FLOG( _L( "CTelDMCommandHandler::CallStateChanged<" ) )
+ FTRACE( FPrint( _L( "CTelDMCommandHandler::CallStateChangedL.aCallState=%d"),
+ aCallState ))
+ iCallState = aCallState;
+ switch( aCallState )
+ {
+ // Arriving call
+ case EPSCTsyCallStateRinging:
+ FLOG( _L( "CTelDMCommandHandler::CallStateChanged.Ringing" ) )
+ RProperty::Set( KPSUidCoreApplicationUIs,
+ KCoreAppUIsSoftReject,
+ ECoreAppUIsSoftRejectUninitialized );
+ iGripOpenOnRingingState = iGripOpen;
+ break;
+ // Answered
+ case EPSCTsyCallStateConnected:
+ {
+ FLOG( _L( "CTelDMCommandHandler::CallStateChanged.Connected" ) )
+ if ( iGripOpenOnRingingState )
+ {
+ OfferKeyLock();
+ }
+
+ // Clear the flag.
+ iGripOpenOnRingingState = EFalse;
+ }
+ break;
+ // Disconnected
+ case EPSCTsyCallStateNone:
+ {
+ FLOG( _L( "CTelDMCommandHandler::CallStateChanged.None" ) )
+ if ( iGripOpenOnRingingState )
+ {
+ OfferKeyLock();
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ FLOG( _L( "CTelDMCommandHandler::CallStateChanged>" ) )
+ }
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::HandleEvent
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCommandHandler::HandleCommand( TCommands aCommand )
+ {
+ FLOG( _L( "CTelDMCommandHandler::HandleCommand<" ) )
+ switch( aCommand )
+ {
+ case EGripOpen:
+ {
+ FLOG( _L( "CTelDMCommandHandler::HandleCommand.Open" ) )
+ iGripOpen = ETrue;
+ if ( !IsSoftRejectOngoing() )
+ {
+ iCallHandler.Answer();
+ }
+ }
+ break;
+ // Do not end calls if accessory is connected.
+ case EGripClose:
+ {
+ FLOG( _L( "CTelDMCommandHandler::HandleCommand.Close" ) )
+ iGripOpen = EFalse;
+ EndCalls();
+ break;
+ }
+ default:
+ break;
+ }
+ FLOG( _L( "CTelDMCommandHandler::HandleCommand>" ) )
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::EndCalls
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCommandHandler::EndCalls()
+
+ {
+ if ( IsEmergencyCall() )
+ {
+ // None
+ }
+ else if ( iAccessory.IsAccessoryAttached() &&
+ !iAccessory.IsAnyActiveAccessory() &&
+ iCallState == EPSCTsyCallStateConnected )
+ {
+ FLOG( _L( "CTelDMCommandHandler::EndCalls#1" ) )
+ iCallHandler.EndVoiceCalls();
+ }
+ else if ( !iAccessory.IsAccessoryAttached() )
+ {
+ FLOG( _L( "CTelDMCommandHandler::EndCalls#2" ) )
+ iCallHandler.EndVoiceCalls();
+ }
+ }
+// -----------------------------------------------------------------------------
+// CTelDMCommandHandler::OfferKeyLock
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMCommandHandler::OfferKeyLock()
+
+ {
+ //- AudioAccessory attached (BT headset, Wired headset etc.)
+ //- Arriving call and grip open.
+ //- Call terminated or answered
+ //-> KeyLock query is shown if not locked
+ if ( iAccessory.IsAccessoryAttached() &&
+ !iGripOpen &&
+ !iKeyLock.IsKeyLockEnabled() )
+ {
+ FLOG( _L( "CTelDMCommandHandler::CallStateChanged -lock?" ) )
+ //Lock keypad ?
+ iKeyLock.OfferKeyLock();
+ }
+ }
+
+// ---------------------------------------------------------
+// CTelDMCommandHandler::IsEmergencyCall
+// ---------------------------------------------------------
+//
+TBool CTelDMCommandHandler::IsEmergencyCall() const
+ {
+ FLOG( _L( "CTelDMCommandHandler::IsEmergencyCall" ) )
+ TBool retVal( EFalse );
+ TInt err( KErrNone );
+ TInt state( 0 );
+
+ err = RProperty::Get(
+ KPSUidCtsyEmergencyCallInfo,
+ KCTSYEmergencyCallInfo,
+ state );
+
+ if ( err == KErrNone && state )
+ {
+ retVal = ETrue;
+ }
+ return retVal;
+ }
+
+// ---------------------------------------------------------
+// CTelDMCommandHandler::IsSoftRejectOngoing
+// ---------------------------------------------------------
+//
+TBool CTelDMCommandHandler::IsSoftRejectOngoing() const
+ {
+ FLOG( _L( "CTelDMCommandHandler::IsSoftRejectOngoing" ) )
+ TBool retVal( EFalse );
+ TInt err( KErrNone );
+ TInt state( 0 );
+
+ err = RProperty::Get(
+ KPSUidCoreApplicationUIs,
+ KCoreAppUIsSoftReject,
+ state );
+
+ if ( err == KErrNone && state == ECoreAppUIsSoftReject )
+ {
+ retVal = ETrue;
+ }
+ return retVal;
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/src/cteldmgriphandler.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,208 @@
+/*
+* Copyright (c) 2005 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 the CTelDMGripHandler class.
+*
+*/
+
+
+
+// INCLUDE FILES
+
+#include <mphonedevicemodeobserver.h>
+#include <hwrmdomainpskeys.h>
+#include "cteldmgriphandler.h"
+#include "mteldmaccessory.h"
+#include "cteldmcommandhandler.h"
+#include <settingsinternalcrkeys.h>
+#include <centralrepository.h>
+
+// MODULE DATA STRUCTURES
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::NewL
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMGripHandler* CTelDMGripHandler::NewL( CTelDMCommandHandler& aCommandHandler )
+ {
+
+ CTelDMGripHandler* self =
+ new ( ELeave ) CTelDMGripHandler( aCommandHandler );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::CTelDMGripHandler
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMGripHandler::CTelDMGripHandler( CTelDMCommandHandler& aCommandHandler ):
+CActive( CActive::EPriorityStandard ),
+iCommandHandler ( aCommandHandler )
+ {
+ CActiveScheduler::Add( this );
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::~CTelDMGripHandler
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMGripHandler::~CTelDMGripHandler()
+ {
+ Cancel();
+ iProperty.Close();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::ConstructL
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMGripHandler::ConstructL()
+ {
+ /// Attach to key. Start listening for changes.
+ iProperty.Attach( KPSUidHWRM, KHWRMGripStatus );
+ IssueRequest();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::HandleChange
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMGripHandler::HandleChange()
+ {
+ TInt err( KErrNone );
+ TInt state( KErrNone );
+ err = RProperty::Get(
+ KPSUidHWRM,
+ KHWRMGripStatus,
+ state );
+
+ if ( err == KErrNone && state == EPSHWRMGripOpen && IsSliderCallAnswer() )
+ {
+ iCommandHandler.HandleCommand( CTelDMCommandHandler::EGripOpen );
+ }
+ else if ( err == KErrNone && state == EPSHWRMGripClosed && IsSliderCallEnd())
+ {
+ iCommandHandler.HandleCommand( CTelDMCommandHandler::EGripClose );
+ }
+ }
+
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::RunL
+// Cannot leave, no RunError implementation
+// -----------------------------------------------------------------------------
+//
+void CTelDMGripHandler::RunL()
+ {
+ if ( iStatus.Int() == KErrNone )
+ {
+ HandleChange();
+ }
+ IssueRequest();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::DoCancel
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMGripHandler::DoCancel()
+ {
+ iProperty.Cancel();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMGripHandler::IssueRequest
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMGripHandler::IssueRequest()
+ {
+ if ( !IsActive() )
+ {
+ iProperty.Subscribe( iStatus );
+ SetActive();
+ }
+ }
+
+// ---------------------------------------------------------
+// CPhoneState::IsSliderCallAnswer
+// ---------------------------------------------------------
+//
+TBool CTelDMGripHandler::IsSliderCallAnswer() const
+ {
+ TInt answerEnabled = 0;
+ TBool retVal ( EFalse );
+ TInt err = GetInt(
+ KCRUidTelephonySettings,
+ KSettingsOpeningSlideAnswer,
+ answerEnabled );
+
+ if ( err == KErrNone && answerEnabled )
+ {
+ retVal = ETrue;
+ }
+ return retVal;
+ }
+
+// ---------------------------------------------------------
+// CPhoneState::IsSliderCallEnd
+// ---------------------------------------------------------
+//
+TBool CTelDMGripHandler::IsSliderCallEnd() const
+ {
+ TInt endEnabled = 0;
+ TBool retVal ( EFalse );
+ TInt err = GetInt(
+ KCRUidTelephonySettings,
+ KSettingsClosingSlideEnd,
+ endEnabled );
+
+ if ( err == KErrNone && endEnabled )
+ {
+ retVal = ETrue;
+ }
+ return retVal;
+ }
+
+// ---------------------------------------------------------
+// CTelDMGripHandler::GetInt
+// ---------------------------------------------------------
+//
+TInt CTelDMGripHandler::GetInt(
+ const TUid& aUid,
+ const TUint aId,
+ TInt& aValue ) const
+ {
+ CRepository* repository = NULL;
+ TRAPD( err, repository = CRepository::NewL( aUid ) );
+ if ( err == KErrNone )
+ {
+ err = repository->Get( aId, aValue );
+ delete repository;
+ }
+ return err;
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/telephonydevicemode/src/cteldmhandlerimpl.cpp Fri Jul 09 15:40:55 2010 +0300
@@ -0,0 +1,111 @@
+/*
+* Copyright (c) 2005-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: Implementation of the CTelDMFactoryImpl class.
+*
+*/
+
+
+
+// INCLUDE FILES
+#include <featmgr.h>
+#include <mphonedevicemodeobserver.h>
+#include <telinternalpskeys.h>
+#include "cteldmhandlerimpl.h"
+#include "cteldmgriphandler.h"
+#include "cteldmcommandhandler.h"
+#include "cteldmcallstatelistener.h"
+#include "cteldmaudioaccessorylistener.h"
+#include "cteldmdebug.h"
+
+// MODULE DATA STRUCTURES
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CTelDMHandlerImpl
+//
+// Creates instance of telephony device mode factory.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CTelDMHandler* CTelDMHandlerCreateL()
+ {
+ return CTelDMHandlerImpl::NewL();
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMHandlerImpl::CTelDMHandlerImpl
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CTelDMHandlerImpl::CTelDMHandlerImpl()
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMHandlerImpl::~CTelDMHandlerImpl
+// -----------------------------------------------------------------------------
+//
+CTelDMHandlerImpl::~CTelDMHandlerImpl()
+ {
+ delete iCallStateListener;
+ delete iAccessory;
+ delete iCommandHandler;
+ delete iGrip;
+ FLOG( _L( "CTelDMHandlerImpl::~CTelDMHandlerImpl()" ) )
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMHandlerImpl::NewL
+//
+// -----------------------------------------------------------------------------
+//
+CTelDMHandlerImpl* CTelDMHandlerImpl::NewL()
+ {
+ CTelDMHandlerImpl* self = new( ELeave ) CTelDMHandlerImpl;
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// CTelDMHandlerImpl::SetObserverL
+//
+// -----------------------------------------------------------------------------
+//
+void CTelDMHandlerImpl::SetObserverL( MPhoneDeviceModeObserver* aCallHandler )
+ {
+ // Default
+ RProperty::Set(
+ KPSUidTelAudioPreference,
+ KTelAudioOutput,
+ EPSAudioPrivate );
+
+ if ( !FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider ) )
+ {
+ iCallStateListener = CTelDMCallStateListener::NewL();
+ iAccessory = CTelDMAudioAccessoryListener::NewL();
+ // Disconnects and answers to calls
+ iCommandHandler = CTelDMCommandHandler::NewL(
+ *aCallHandler,
+ *iAccessory );
+
+ iCallStateListener->AddObserverL( *iCommandHandler );
+
+ iGrip = CTelDMGripHandler::NewL( *iCommandHandler );
+
+ }
+ }
+
+// End of File
+
+