diff -r 41a7f70b3818 -r 5266b1f337bd phoneapp/phoneuiutils/inc/phoneconstants.h
--- a/phoneapp/phoneuiutils/inc/phoneconstants.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/phoneconstants.h	Wed Sep 01 12:30:10 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -46,7 +46,9 @@
 const TUid KPhoneUidAppPhonebook = { 0x101F4CCE };  // PhoneBook
 const TUid KPhoneUidAppPhoneInfo = { 0x101fc0ef };  // Phone Info
 const TUid KPhoneUidAppFTD = { 0x100058F2 };        // Field Test Display
+const TUid KDeviceManagerUid = {0x101F6DE5};        // Device manager application  
 const TUid KUidStartupApplication = { 0x100058F4 }; // Startup application
+const TUid KUidSpdia = { 0x1000590A };              // Speeddial application.
 const TUid KVtUiAppUidValue = { 0x101F8681 };       // Video Telephony application
 
 // Contants below define which view will be activated. 
@@ -61,6 +63,9 @@
 const TUid KPhoneUidLogStm = { 0x01002982 };        // Id for stm for Log application
 _LIT8( KPhoneStmLoadMagicString, "outside" );       // Message for activating view of an application
 
+// SimLock Ui UID to launch the SimLock App
+const TUid KSimLockUIApplicationUid= {0x2000B0FA};
+
 // Used in CPhoneKeyEventHandler
 // Seconds in microseconds
 const TInt KPhoneSecondInMicroseconds = 1000000;
@@ -156,10 +161,20 @@
 
 // Used in CPhoneKeys
 // The character to be used as the 'wait' character, by DTMF code.
-const TUint KPhoneDtmfWaitCharacter  = 'w';
+const TUint KPhoneDtmfWaitCharacter = 'w';
+const TUint KPhoneDtmfWaitCharacterUpper = 'W';
 
 // The character to be used as the 'soft pause' character, by DTMF code.
 const TUint KPhoneDtmfPauseCharacter = 'p';
+const TUint KPhoneDtmfPauseCharacterUpper = 'P';
+
+// The character to be used as the 'speed-dial' character, by DTMF code.
+const TUint KPhoneDtmfSpeedDialCharacter = '+';
+
+const TUint KPhoneDtmfPlusCharacter = 135;  // Bluetooth SU-8W '+'
+
+// The length of the speed dial prefix, used to prevent buffer overflow
+const TUint KPhoneDtmfSpeedDialPrefixLength = 1;
 
 // Following, are the standard DTMF characters...
 const TInt KPhoneDtmfHashCharacter    = '#';
@@ -215,7 +230,6 @@
 // From CPhoneNoteUtilities
 const TInt KPhoneNoteSoftkeysUseDefault = 0;
 const TInt KPhoneNoteGraphicNone = -1;
-const TInt KPhoneNoteNoTimeout = -1;
 
 // State machine ordinal number
 static const TInt KPhoneUiStateMachineOrdinal = 1;
@@ -229,7 +243,7 @@
 
 // Paths to CentRep
 _LIT( KGSMProtocol, "phoneuistates.dll" );
-_LIT( KVoIPExtension, "phoneuivoipextension.dll" );
+_LIT( KVoIPExtension, "PhoneUIVoIPExtension.dll" );
 
 // Literals for formatting log messages
 _LIT( KPEDefaultMsgToPhoneUI,   "PE ----> PHONEUI <%S> message from PE. CallId: %d.");
@@ -301,6 +315,12 @@
 // Conference call id
 const TInt KConferenceCallId = 8;
 
+// LifeTimer const
+const TInt KPhoneLifeTimerHoursLength 	= 6;
+const TInt KPhoneLifeTimerMinutesLength = 2;
+const TInt KTimerTextLength				= 64;
+const TInt KTimerMinuteSeparator		= 2;
+
 //AudioVolume const
 // CONSTANTS
 const TInt KPhoneDefaultVolume = 4;
@@ -417,7 +437,7 @@
 const TInt KPhoneUiMediatorIfTimeout = 10000;
 
 // Name of Call UI dll which is loaded polymorficly in CPhoneQueryController
-_LIT( KPhoneCaUiLoadedLib, "cauiengine.dll" );
+_LIT( KPhoneCaUiLoadedLib, "CaUiEngine.dll" );
 
 // CPhoneTextQuery constants
 const TInt KLeftCbaId = 0;
@@ -476,8 +496,6 @@
 // Video call setup failed query timeout
 const TInt KPhoneVideoCallSetupFailedQueryTimeout = 5; 
 
-// Key event value for long press
-const TInt EEventLongPress = 1100;
 
 #endif  // PHONECONSTANTS_H