--- a/applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -71,6 +71,7 @@
 LIBRARY         efsrv.lib
 LIBRARY         estor.lib
 LIBRARY         eikcore.lib 
+LIBRARY         aknnotify.lib
 
 START WINS
 END

--- a/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -31,6 +31,7 @@
 #include "AiwEcomMonitor.h"
 #include "AiwTlsData.h"
 #include "data_caging_path_literals.hrh"
+#include "../../../uifw/inc/akntrace.h"
 
 // CONSTANTS
 // Max number of empty menu resource slots.
@@ -66,10 +67,14 @@
 
 CAiwServiceHandlerImpl* CAiwServiceHandlerImpl::NewL()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     CAiwServiceHandlerImpl* handler = new (ELeave) CAiwServiceHandlerImpl();
     CleanupStack::PushL( handler );
     handler->ConstructL();
     CleanupStack::Pop(); // handler
+    
+    _AKNTRACE_FUNC_EXIT;
     return handler;
     }
 
@@ -119,6 +124,8 @@
 
 CAiwServiceHandlerImpl::~CAiwServiceHandlerImpl()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     if (iResourceOffset && iCoeEnv)
         {
         iCoeEnv->DeleteResourceFile(iResourceOffset);
@@ -133,12 +140,18 @@
         data->RemoveMenuLaunchObserver( this );
         CAiwTlsData::Close();
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::Reset()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
+    RProcess pro;
+    AknTracePrint(_L("process name:%S"),&(pro.FileName()));
+    
     iInterestList.ResetAndDestroy();
     iMenuBindings.ResetAndDestroy();
     iBaseBindings.ResetAndDestroy();
@@ -152,6 +165,8 @@
     iInParams = NULL;
     delete iOutParams;
     iOutParams = NULL;
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -159,6 +174,8 @@
 void CAiwServiceHandlerImpl::ListProvidersForCriteriaL(RArray<TInt>& aResult, 
     CAiwCriteriaItem& aItem)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt i;
 
     for (i = 0; i < iProviders.Count(); i++)
@@ -168,12 +185,16 @@
             User::LeaveIfError(aResult.Append(iProviders[i]->ImplementationUid().iUid));
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 TInt CAiwServiceHandlerImpl::NbrOfProviders(const CAiwCriteriaItem* aCriteria)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     if(!aCriteria)
         {
         return 0;
@@ -203,6 +224,7 @@
             }       
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return 0;
     }
 
@@ -210,6 +232,8 @@
 
 void CAiwServiceHandlerImpl::AttachL(TInt aInterestResourceId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -234,12 +258,16 @@
 
     CleanupStack::Pop(); // filtered
     CleanupStack::Pop(); // interest
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::AttachL(const RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+        
     RCriteriaArray interest, filtered;
     
     CleanupStack::PushL( TCleanupItem( InterestCleanup, &interest ) );
@@ -257,6 +285,12 @@
         item->SetDefaultProvider( (aInterest[i]->DefaultProvider()).iUid );
         item->SetMaxProviders(     aInterest[i]->MaxProviders()          );       
         
+        _AKNTRACE("aInterest[i]->Id():%x",aInterest[i]->Id());
+        _AKNTRACE("aInterest[i]->ServiceCmd():%x",aInterest[i]->ServiceCmd());
+        _AKNTRACE("aInterest[i]->ServiceClass():%x",aInterest[i]->ServiceClass());
+        _AKNTRACE("(aInterest[i]->DefaultProvider()).iUid:%x",(aInterest[i]->DefaultProvider()).iUid);
+        _AKNTRACE("aInterest[i]->MaxProviders():%x",aInterest[i]->MaxProviders());
+        
         User::LeaveIfError(interest.Append(item));
         CleanupStack::Pop(item); 
         }
@@ -269,12 +303,18 @@
 
     CleanupStack::Pop(); // filtered
     CleanupStack::Pop(); // interest
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::DoAttachL(const RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
+    RProcess pro;
+    AknTracePrint(_L("process name:%S"),&(pro.FileName()));
     CAiwBinding* bind;
     for (TInt i = 0; i < aInterest.Count(); i++)
         {
@@ -305,11 +345,15 @@
             CleanupStack::PopAndDestroy(); // bind
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::GetInterest(RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     for (TInt i = 0; i < iInterestList.Count(); i++)
         {
         if (aInterest.Append(iInterestList[i]) != KErrNone)
@@ -317,12 +361,16 @@
             return;
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
     
     
 
 void CAiwServiceHandlerImpl::DetachL(const RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     // First, remove relevant criteria items from relevat base bindings.
     for (TInt i = 0; i < aInterest.Count(); i++)
         {
@@ -351,13 +399,18 @@
     RemoveObsoleteCriteriaItems();
     
     // Finally check if there were left obselete providers and remove them.
-    RemoveObsoleteProviders();        
+    RemoveObsoleteProviders();      
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::DetachL(TInt aInterestResourceId)
     { 
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
+    
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -377,11 +430,14 @@
 
     interest.ResetAndDestroy();
     CleanupStack::Pop(); // interest
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 const CAiwCriteriaItem* CAiwServiceHandlerImpl::GetCriteria(TInt aId)
     {
+    _AKNTRACE_FUNC_ENTER;
     for (TInt i = 0; i < iInterestList.Count(); i++)
         {
         if (iInterestList[i]->Id() == aId)
@@ -389,12 +445,15 @@
             return iInterestList[i];
             }
         }
-
+    
+    _AKNTRACE_FUNC_EXIT;
     return NULL;  
     }
     
 TInt CAiwServiceHandlerImpl::NumAlreadyInitializedPaneIdsL() const
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt ret = 0;
     TInt paneIds[KMaxPaneIds] = {0};
     TBool found = EFalse;
@@ -426,6 +485,8 @@
             ret++;
             }                       
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     return ret;         
     }    
 
@@ -435,8 +496,12 @@
     TInt aBaseMenuCmdId,
     const CAiwGenericParamList& aInParamList)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId, 
         aInParamList, EFalse, EFalse);    
+    
+    _AKNTRACE_FUNC_EXIT;
     }        
         
 void CAiwServiceHandlerImpl::InitializeMenuPaneL(
@@ -446,7 +511,11 @@
     const CAiwGenericParamList& aInParamList,
     TBool aUseSubmenuTextsIfAvailable)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId, aInParamList, aUseSubmenuTextsIfAvailable, EFalse);
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -458,6 +527,20 @@
     TBool aUseSubmenuTextsIfAvailable,
     TBool aSetAsItemSpecific)
     {        
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuPane:%x",&aMenuPane);
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+    _AKNTRACE("aBaseMenuCmdId:%x",aBaseMenuCmdId);
+    _AKNTRACE("aUseSubmenuTextsIfAvailable:%x",aUseSubmenuTextsIfAvailable);
+    _AKNTRACE("aSetAsItemSpecific:%x",aSetAsItemSpecific);
+    
+    TInt count = aInParamList.Count();
+    for(TInt i=0;i<count;i++)
+        {
+        _AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId());
+        AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes()));
+        
+        }
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -592,11 +675,16 @@
                 }
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 TInt CAiwServiceHandlerImpl::ServiceCmdByMenuCmd(TInt aMenuCmdId) const
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuCmdId:%x",aMenuCmdId);
+    
     for (TInt i = 0; i < iMenuBindings.Count(); i++)
         {
         if ((IsInLastInitialized(iMenuBindings[i]->MenuPane())) &&
@@ -606,6 +694,8 @@
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
+    
     return 0;   
     }
 
@@ -618,6 +708,27 @@
     TUint aCmdOptions,
     MAiwNotifyCallback* aCallback)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuCmdId:%x",aMenuCmdId);
+     
+    RProcess pro;
+    AknTracePrint(_L("process name:%S"),&(pro.FileName()));
+    
+    TInt count = aInParamList.Count();
+    for (TInt i = 0; i < count; i++)
+        {
+        _AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId());
+        AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes()));
+
+        }
+        
+    count = iProviders.Count();
+    for (TInt i = 0; i < count; i++)
+        {
+        AknTracePrint(_L("i:%d, iProviders[i]->ImplementationUid():%x"),i,iProviders[i]->ImplementationUid().iUid);
+        AknTracePrint(_L("i:%d, iProviders[i]:%x"),i,iProviders[i]);
+        }
+    
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -653,12 +764,17 @@
                 }
             }
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, TInt aInterestResourceId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+    _AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
+    
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -681,12 +797,17 @@
     CleanupStack::PopAndDestroy(); // reader
     CleanupStack::Pop(); // filtered
     CleanupStack::Pop(); // interest
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, TResourceReader& aReader)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+        
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -707,11 +828,16 @@
     CleanupStack::PopAndDestroy(); // reader
     CleanupStack::Pop(); // filtered
     CleanupStack::Pop(); // interest
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, const RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+        
     // CCoeEnv/CEikonEnv needs to be accessible.
     if(!iCoeEnv)
         {
@@ -736,6 +862,12 @@
         item->SetDefaultProvider( (aInterest[i]->DefaultProvider()).iUid );
         item->SetMaxProviders(     aInterest[i]->MaxProviders()          );       
         
+        _AKNTRACE("aInterest[i]->Id():%x",aInterest[i]->Id());
+        _AKNTRACE("aInterest[i]->ServiceCmd():%x",aInterest[i]->ServiceCmd());
+        _AKNTRACE("aInterest[i]->ServiceClass():%x",aInterest[i]->ServiceClass());
+        _AKNTRACE("(aInterest[i]->DefaultProvider()).iUid:%x",(aInterest[i]->DefaultProvider()).iUid);
+        _AKNTRACE("aInterest[i]->MaxProviders():%x",aInterest[i]->MaxProviders());
+        
         User::LeaveIfError(interest.Append(item));
         CleanupStack::Pop(item); 
         }
@@ -748,12 +880,19 @@
     CleanupStack::PopAndDestroy(); // reader
     CleanupStack::Pop(); // filtered
     CleanupStack::Pop(); // interest    
+    
+    _AKNTRACE_FUNC_EXIT;
     }   
 
 
 void CAiwServiceHandlerImpl::DoAttachMenuL(TResourceReader& aReader, TInt aMenuId, 
     RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
+    RProcess pro;
+    AknTracePrint(_L("process name:%S"),&(pro.FileName()));
+        
     TInt menuCmd;
     TInt count = aReader.ReadInt16();
     TBool bound;
@@ -833,6 +972,8 @@
             }
         SkipMenuFields(aReader);  // Jump to next menu item
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -849,6 +990,10 @@
 
 void CAiwServiceHandlerImpl::DetachMenu(TInt aMenuResourceId, TInt aInterestResourceId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+    _AKNTRACE("aInterestResourceId:%x",aInterestResourceId);
+        
     // If interest resource id is null, then detach all items in the given menu.
     if (!aInterestResourceId)
         {
@@ -874,11 +1019,16 @@
         
         interest.ResetAndDestroy();
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
         
 
 void CAiwServiceHandlerImpl::DoDetachMenu(TInt aMenuResourceId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+        
     // First, delete the relevant menu bindings.
     for (TInt i = 0; i < iMenuBindings.Count(); i++)
         {
@@ -895,11 +1045,16 @@
     
     // Finally check if there were left obselete providers and remove them.
     RemoveObsoleteProviders();  
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
     
 void CAiwServiceHandlerImpl::DoDetachMenu(TInt aMenuResourceId, RCriteriaArray& aInterest)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aMenuResourceId:%x",aMenuResourceId);
+    
     // First, remove relevant criteria items from relevant menu bindings.
     for (TInt i = 0; i < iMenuBindings.Count(); i++)
         {
@@ -931,12 +1086,16 @@
     RemoveObsoleteCriteriaItems();
     
     // Finally check if there were left obselete providers and remove them.
-    RemoveObsoleteProviders();        
+    RemoveObsoleteProviders();      
+    
+    _AKNTRACE_FUNC_EXIT;
     }    
     
     
 void CAiwServiceHandlerImpl::RemoveObsoleteCriteriaItems()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     for (TInt i = 0; i < iInterestList.Count(); i++)
         {
         CAiwCriteriaItem* criteria = iInterestList[i];
@@ -973,11 +1132,15 @@
             i--;
             }
         }    
+    
+    _AKNTRACE_FUNC_EXIT;
     }
     
     
 void CAiwServiceHandlerImpl::RemoveObsoleteProviders()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     for (TInt i = 0; i < iProviders.Count(); i++)
         {
         CAiwServiceIfBase* provider = iProviders[i];
@@ -1014,24 +1177,33 @@
             i--;
             }
         }    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 TBool CAiwServiceHandlerImpl::IsSubMenuEmpty(TInt aSubMenuId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aSubMenuId:%d",aSubMenuId);
+  
     for (TInt i = 0; i < iMenuBindings.Count(); i++)
         {
         if (iMenuBindings[i]->MenuId() == aSubMenuId)
             {
             if (iMenuBindings[i]->NumberOfProviders() > 0)
                 {
+                _AKNTRACE("return false");
+                _AKNTRACE_FUNC_EXIT;
                 return EFalse;
                 }
 
+            _AKNTRACE("return true");
+            _AKNTRACE_FUNC_EXIT;
             return ETrue;
             }
         }
-
+    
+    _AKNTRACE_FUNC_EXIT;
     return EFalse;
     }
 
@@ -1041,16 +1213,21 @@
 CAiwMenuBinding* CAiwServiceHandlerImpl::AlreadyBound(TInt aMenuId, TInt aMenuCmd, 
     TInt aMenuItemIndex) const
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     for (TInt i = 0; i < iMenuBindings.Count(); i++)
         {
         if ((iMenuBindings[i]->MenuId() == aMenuId) &&
             (iMenuBindings[i]->MenuCmd() == aMenuCmd) &&
             (iMenuBindings[i]->MenuItemIndex() == aMenuItemIndex))
             {
+            _AKNTRACE("iMenuBindings[i]:%x",iMenuBindings[i]);
+            _AKNTRACE_FUNC_EXIT;
             return iMenuBindings[i];
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return NULL;
     }
 
@@ -1062,6 +1239,21 @@
     TUint aCmdOptions,
     MAiwNotifyCallback* aCallback)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aCmdId:%x",aCmdId);
+    _AKNTRACE("aCmdOptions:%x",aCmdOptions);
+    
+    RProcess pro;
+    AknTracePrint(_L("process name:%S"),&(pro.FileName()));
+
+    TInt count = aInParamList.Count();
+    for (TInt i = 0; i < count; i++)
+        {
+        _AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId());
+        AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes()));
+
+        }
+        
     for (TInt i = 0; i < iBaseBindings.Count(); i++)
         {
         if(iBaseBindings[i]->HasServiceCmd(aCmdId))
@@ -1077,6 +1269,8 @@
                 }
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -1084,6 +1278,8 @@
 void CAiwServiceHandlerImpl::ReadInterestListL(TResourceReader& aReader, 
     RPointerArray<CAiwCriteriaItem>& aResult)  
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     const TInt count = aReader.ReadInt16();
     for (TInt ii = 0; ii < count; ++ii)
         {
@@ -1092,11 +1288,15 @@
         User::LeaveIfError(aResult.Append(item));
         CleanupStack::Pop(); // item
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 TInt CAiwServiceHandlerImpl::ResolveProvidersL(CAiwBinding* aBinding, CAiwCriteriaItem* aItem)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     RImplInfoPtrArray infoArray;
     TInt result = 0;
 
@@ -1157,6 +1357,8 @@
 
     CleanupStack::PopAndDestroy(); // infoArray     
 
+    _AKNTRACE_FUNC_EXIT;
+    
     return result;
     }
 
@@ -1164,6 +1366,8 @@
 
 void CAiwServiceHandlerImpl::FilterInfoArray(RImplInfoPtrArray& aArray, CAiwCriteriaItem* aItem)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     if (aItem->MaxProviders() <= 0)
         {
         aArray.ResetAndDestroy();
@@ -1185,6 +1389,8 @@
                 }
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
@@ -1221,6 +1427,7 @@
 
 TBool CAiwServiceHandlerImpl::IsInLastInitialized(CAiwMenuPane* aiwPane) const
     {
+    _AKNTRACE_FUNC_ENTER;
     if (aiwPane)
         {
         if (iSubmenu == aiwPane)
@@ -1237,6 +1444,7 @@
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return EFalse;
     }
 
@@ -1269,6 +1477,8 @@
 CAiwMenuPane* CAiwServiceHandlerImpl::CreateEmptyAiwMenuPaneL(TInt aBaseMenuCmdId, 
     TInt aResourceId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     CAiwMenuPane* result = NULL;
     TResourceReader reader; 
     
@@ -1301,12 +1511,16 @@
     
     result->SetResourceSlotId( id );
     
+    _AKNTRACE_FUNC_EXIT;
+    
     return result;
     }
 
 
 void CAiwServiceHandlerImpl::DeleteAiwMenuPane(CAiwMenuPane* aAiwPane)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     delete aAiwPane->iMenuPane;
     aAiwPane->iMenuPane = NULL;
 
@@ -1339,6 +1553,8 @@
     
     delete aAiwPane;
     aAiwPane = NULL;    
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 const TInt resourceSlotIds[KMaxMenuResources] =
@@ -1364,11 +1580,14 @@
 
 TInt CAiwServiceHandlerImpl::ResourceIdForNextFreeSlot()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     if (iNextFreeSlot < KMaxMenuResources)
         {
         return resourceSlotIds[iNextFreeSlot++];
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return -1;
     }
 
@@ -1385,42 +1604,60 @@
 
 void Cleanup( TAny* aAny )
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     RImplInfoPtrArray* implArray = 
         reinterpret_cast< RImplInfoPtrArray*> ( aAny );
     implArray->ResetAndDestroy();
     implArray->Close();
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void InterestCleanup( TAny* aAny )
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     RPointerArray<CAiwCriteriaItem>* interestArray = 
         reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
 
-    interestArray->ResetAndDestroy();   
+    interestArray->ResetAndDestroy();
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 void FilteredCleanup( TAny* aAny )
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     RPointerArray<CAiwCriteriaItem>* filteredArray = 
         reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
 
-    filteredArray->Reset();   
+    filteredArray->Reset();
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void IntArrayCleanup(TAny* aAny)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     RArray<TInt>* intArray = 
         reinterpret_cast<RArray<TInt>*> ( aAny );
 
     intArray->Close();
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::CopyMenuItemsL(CAiwMenuPane* aSource, CEikMenuPane& aDest, 
     TInt aStartIndex, TBool aIsSubmenu, TBool aSetAsItemSpecific)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt cmdId;
     TInt inPos = aStartIndex;
 
@@ -1451,12 +1688,16 @@
             aDest.InsertMenuItemL(itemData, inPos++);
             }   
         }   
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 TInt CAiwServiceHandlerImpl::SlotItemCmd(CEikMenuPane& aPane)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt index;
 
     for (TInt i = 0; i < KMaxMenuResources; i++)
@@ -1467,6 +1708,7 @@
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return -1;
     }
 
@@ -1474,6 +1716,8 @@
 
 CAiwMenuPane* CAiwServiceHandlerImpl::MenuPaneForSlotCmd(TInt aCmdId)
     {
+    _AKNTRACE_FUNC_ENTER;    
+
     TInt index = aCmdId - EAiwMenuSlotBase; 
 
     if (index < KMaxMenuResources)
@@ -1488,6 +1732,8 @@
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
+
     return NULL;
     }
 
@@ -1496,8 +1742,11 @@
 CAiwServiceHandlerImpl::TAiwPlaceholderType CAiwServiceHandlerImpl::PlaceholderType(
     CEikMenuPane& aPane, TInt aCmd, TBool& aTitleLocked)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     CEikMenuPaneItem::SData& itemData = aPane.ItemData(aCmd);
-
+    _AKNTRACE("itemData.iCascadeId:%x",itemData.iCascadeId);
+    
     aTitleLocked = EFalse;
 
     if ((itemData.iCascadeId & AIW_CASCADE_ID) == AIW_CASCADE_ID)
@@ -1517,6 +1766,7 @@
         return EAiwPlaceholderIntelligentCascade;
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return EAiwPlaceholderNormal;
     }
 
@@ -1524,6 +1774,8 @@
 void CAiwServiceHandlerImpl::ConvertPlaceholderL(CEikMenuPane& aPane, TInt aCmd, 
     CAiwMenuPane& aAiwPane, const TDesC& aTitle, TBool aSetAsItemSpecific)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     CEikMenuPaneItem::SData itemData = aPane.ItemData(aCmd);
     TInt index;
 
@@ -1551,12 +1803,16 @@
 
     // Insert cascade item.
     aPane.InsertMenuItemL(itemData, index);
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::UnCascadeL(CEikMenuPane& aPane, TInt aCmd,
     CAiwMenuPane& aAiwPane, TBool aSetAsItemSpecific)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     CEikMenuPaneItem::SData itemData = aAiwPane.MenuPane().ItemData(aAiwPane.FindCmdId(0));
     TInt index;
 
@@ -1576,12 +1832,16 @@
 
     // Insert cascade item.
     aPane.InsertMenuItemL(itemData, index);     
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::SkipMenuFields(TResourceReader& aReader)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     aReader.ReadInt32(); // Skip cascade id
     aReader.ReadInt32(); // Skip flags
     aReader.ReadTPtrC(); // Skip text
@@ -1590,11 +1850,15 @@
     aReader.ReadInt16(); // Skip bmpid.
     aReader.ReadInt16(); // Skip bmpmask. 
     aReader.ReadInt32(); // Skip extension.   
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 TBool CAiwServiceHandlerImpl::IsAiwMenu(TInt aMenuResourceId)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt i;
 
     // First check if this is aiw submenu id
@@ -1615,6 +1879,8 @@
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
+    
     return EFalse;
     }
 
@@ -1622,6 +1888,7 @@
 
 TBool CAiwServiceHandlerImpl::HandleSubmenuL(CEikMenuPane& aPane)
     {
+    _AKNTRACE_FUNC_ENTER;
     TInt slotcmd = SlotItemCmd(aPane);
     if (slotcmd >= 0)
         {
@@ -1637,6 +1904,7 @@
             }
         }
 
+    _AKNTRACE_FUNC_EXIT;
     return EFalse;
     }
 
@@ -1644,6 +1912,8 @@
 
 TBool CAiwServiceHandlerImpl::GetSubmenuTitle(CEikMenuPane& aPane, TDes& aResult)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt index;
     
     aResult.Zero();
@@ -1657,7 +1927,8 @@
         aPane.DeleteMenuItem(AIW_SUBMENU_TITLE);
         return ETrue;
         }
-
+  
+    _AKNTRACE_FUNC_EXIT;
     return EFalse;
     }
 
@@ -1687,6 +1958,8 @@
 void CAiwServiceHandlerImpl::FilterInterestListL(RPointerArray<CAiwCriteriaItem>& aOriginal,
     RPointerArray<CAiwCriteriaItem>& aFiltered)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     CAiwCriteriaItem* item;
 
     while (aOriginal.Count() > 0)
@@ -1697,12 +1970,16 @@
         User::LeaveIfError(aFiltered.Append(item));
         }
     aOriginal.Reset();
+   
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 void CAiwServiceHandlerImpl::RemoveProvider(TInt aImplUid)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt i;
 
     // First go through bindings and remove all the 
@@ -1727,11 +2004,16 @@
             i--;
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::AddProviderL(TUid aImplUid, CAiwCriteriaItem* aItem)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aImplUid:%x",aImplUid.iUid);
+    
     TInt i;
     CAiwServiceIfBase* iface = iEcomMonitor->CreateImplementationL(aImplUid);
     
@@ -1760,14 +2042,22 @@
                 }               
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 
 TInt CAiwServiceHandlerImpl::SynchronizeCallBack(TAny* aImpl)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("aImpl:%x",aImpl);
+    
     CAiwServiceHandlerImpl* impl = reinterpret_cast<CAiwServiceHandlerImpl*>(aImpl);
     TRAPD(err, impl->SynchronizeDbL());
+    
+    _AKNTRACE_FUNC_EXIT;
+    
     return err;
     }
 
@@ -1775,6 +2065,8 @@
 
 void CAiwServiceHandlerImpl::SynchronizeDbL()
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt i;
     RArray<TInt> providers;
     RImplInfoPtrArray infoArray;
@@ -1798,12 +2090,16 @@
         }
 
     CleanupStack::PopAndDestroy(2); // providers, infoArray
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::HandleRemovedProviders(RArray<TInt>& aInMemory, 
     RImplInfoPtrArray& aInSystem)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt i, j;
 
     for (i = 0; i < aInMemory.Count(); i++)
@@ -1820,12 +2116,16 @@
             RemoveProvider(aInMemory[i]);
             }
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 
 void CAiwServiceHandlerImpl::HandleNewProvidersL(RArray<TInt>& aInMemory, 
     RImplInfoPtrArray& aInSystem, CAiwCriteriaItem* aItem)
     {
+    _AKNTRACE_FUNC_ENTER;
+    
     TInt i;
 
     for (i = 0; i < aInSystem.Count(); i++)
@@ -1835,10 +2135,14 @@
             AddProviderL(aInSystem[i]->ImplementationUid(), aItem);
             }       
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
     
 void CAiwServiceHandlerImpl::MenuLaunched()
     {  
+    _AKNTRACE_FUNC_ENTER;
+    
     ClearMenuPaneArray();
     iNextFreeSlot = 0;
     iLastInitialized.Reset();
@@ -1848,6 +2152,8 @@
         {
         iMenuBindings[i]->SetMenuPane(NULL);
         }
+    
+    _AKNTRACE_FUNC_EXIT;
     }
 
 // End of file

--- a/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 LIBRARY         euser.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         servicehandler.lib
 LIBRARY         eikcoctl.lib

--- a/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -34,7 +34,9 @@
 #ifdef SBSV2
 USERINCLUDE     ../inc 
 
-     MW_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
+
+SOURCEPATH      ../src
 
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
@@ -50,9 +52,9 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         ServiceHandler.lib
+LIBRARY         servicehandler.lib
 
 
 LANG            SC

--- a/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -34,8 +34,9 @@
 #ifdef SBSV2
 USERINCLUDE     ../inc 
 
-        MW_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
+SOURCEPATH      ../src
 
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
@@ -50,8 +51,8 @@
 SOURCE          testserviceifmenuprotected.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         ServiceHandler.lib
+LIBRARY         servicehandler.lib
 
 LANG            SC

--- a/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,10 +49,10 @@
 SOURCE          testdomalarmblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY			eiksrv.lib
-LIBRARY			eikalert.lib
+LIBRARY			Eikalert.lib
 
 LANG            SC
 

--- a/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -38,7 +38,7 @@
 SOURCE          testdomserappuiderive.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eiksrv.lib
 LIBRARY         eiksrvui.lib

--- a/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -34,8 +34,9 @@
 #ifdef SBSV2
 USERINCLUDE     ../inc 
 
-      MW_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
+SOURCEPATH      ../src
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
@@ -50,11 +51,11 @@
 SOURCE          testdomakfontsblockslayoutfont.cpp 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         uiklaf.lib
 LIBRARY         avkon.lib
-LIBRARY         fontutils.lib 
+LIBRARY         fontutils.lib
 LIBRARY         gdi.lib
 LIBRARY         eikcore.lib
 LIBRARY         cone.lib

--- a/classicui_plat/avkon_localised_texts_api/loc/avkon.loc	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/avkon_localised_texts_api/loc/avkon.loc	Thu Aug 19 10:11:06 2010 +0300
@@ -4317,5 +4317,10 @@
 //
 #define qtn_navi_pane_marking_mode "Marking mode"
 
+//d: handwriting setting menu items.
+//l: list_single_pane_t1_cp2/opt3
+//r: TB9.2
+#define qtn_handwriting_input_options "Handwriting input settings"
+
 // End of File
 

--- a/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -51,7 +51,7 @@
 SOURCE          testdomasdsblocksdata.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikdlg.lib 
 LIBRARY         estor.lib 

--- a/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -38,7 +38,7 @@
 SOURCE          testplattestabilityblocksakntashook.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 

--- a/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -51,7 +51,7 @@
 SOURCE          testdomuiserverblocksakncapserverclient.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         apparc.lib
 LIBRARY         cone.lib

--- a/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 SOURCE          testdombpprotectedclass.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 

--- a/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,11 +66,11 @@
 SOURCE          testdomcfdfilterfactoryblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         bafl.lib
 LIBRARY         cone.lib 
-LIBRARY         CommonDialogs.lib
+LIBRARY         commondialogs.lib
 
 LANG            SC
 

--- a/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomcustomcursorsblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         gdi.lib

--- a/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomesecblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib

--- a/classicui_plat/emergency_call_support_api/inc/AknEcs.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/emergency_call_support_api/inc/AknEcs.h	Thu Aug 19 10:11:06 2010 +0300
@@ -45,7 +45,7 @@
 _LIT( KAknEcsSeparator, " ");
 
 // Maximum time in Microseconds between keys in a valid emergency call entry:
-const TInt KEcsInterKeyTimeout = 4000000;
+const TInt KEcsInterKeyTimeout = 10000000;
 
 // Deprecated
 const TInt KAknMaxEmergencyNumberString = 200;

--- a/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomecsprotectedclass.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 

--- a/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -44,11 +44,11 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
-LIBRARY         vpbkeng.lib
-LIBRARY         PbkEng.lib
+LIBRARY         VPbkEng.lib
+LIBRARY         pbkeng.lib
 
 LANG            SC
 

--- a/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 SOURCE          testdomextanimationcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib

--- a/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -52,7 +52,7 @@
 SOURCE          testaknview.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         aknicon.lib

--- a/classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h	Thu Aug 19 10:11:06 2010 +0300
@@ -280,7 +280,7 @@
      * Report event to pen input method.
      * @param aStateEvent, MAknEdStateObserver::EAknEdwinStateEvent     
      */
-    void ReportAknEdStateEventL( 
+    void ReportAknEdStateEvent( 
              MAknEdStateObserver::EAknEdwinStateEvent aStateEvent );
     /**
      * close VKB .    

--- a/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 SOURCE          testdomeditorcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcoctl.lib

--- a/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomgridscontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib

--- a/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomindicatorcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib

--- a/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,9 +49,9 @@
 SOURCE          testdomextinitblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         avkon.LIB
+LIBRARY         avkon.lib
 
 LANG            SC
 

--- a/classicui_plat/extended_input_capabilities_api/inc/aknextendedinputcapabilities.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_input_capabilities_api/inc/aknextendedinputcapabilities.h	Thu Aug 19 10:11:06 2010 +0300
@@ -150,7 +150,9 @@
                 Parameter not used. */
             EOpenStylusMenuCcpu,
             /** Close pen input (VKB or HWR), parameter not used */
-            EClosePenInputRequest
+            EClosePenInputRequest,
+            /**Signals observer (MFNE) to change AM to PM*/
+            EChangeAmPm
             };
             
         /**
@@ -198,7 +200,9 @@
         EInputEditorDisableVKB = 0x00000100,
         EInputEditorRevealSecretText = 0x00000200,
         EInputEditorQwertyInputActive = 0x00000400,
-        EInputEditorPartialScreen = 0x00000800
+        EInputEditorPartialScreen = 0x00000800,
+        //support to fep to change AM to PM in MFNE
+        EInputEditorAmPm = 0x00001000
         };
     static const TInt KAknEditorAlignMask = 0x000000f0;
        

--- a/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdominputcapext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikctl.lib
 

--- a/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 SOURCE          testdomlistsext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib

--- a/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomextnotesblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcdlg.lib

--- a/classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h	Thu Aug 19 10:11:06 2010 +0300
@@ -209,6 +209,24 @@
     * Reserved for future use.
     */
     IMPORT_C void CAknNotifyBase_Reserved();
+
+public:
+    
+    /** 
+    * Set UMA indicator state. Available states from avkon.hrh:
+    *
+    * EAknSignalUmaIndicatorOff = 0x600,
+    * EAknSignalUmaIndicatorAvailable,
+    * EAknSignalUmaIndicatorAttached,    
+    * EAknSignalUmaIndicatorEstablishingContext,
+    * EAknSignalUmaIndicatorContext,
+    * EAknSignalUmaIndicatorSuspended,
+    * EAknSignalUmaIndicatorMultipdp
+    *
+    * @param aUmaState UMA indicator state.
+    */
+    IMPORT_C void SetUmaStateL(TInt aUmaState);
+    
     };
 
 #endif // __AKNSIGNALNOTIFY_H__

--- a/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -8,7 +8,7 @@
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
-*  Version:   %version: 2.1.2 %
+*  Version:   %version: be1nfmx1#2.1.4 %
 *
 * Contributors:
 *
@@ -53,7 +53,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         aknnotifyplugin.lib
 LIBRARY         akndynamicsoftnote.lib

--- a/classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h	Thu Aug 19 10:11:06 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"
@@ -238,6 +238,13 @@
      * @return ETrue if collection has marked items.
      */
     TBool CollectionHasMarkedItems();
+    
+    /**
+     * Hides this item action menu.
+     * 
+     * @internal
+     */
+    void HideMenu();
 
 private:
 

--- a/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -42,7 +42,7 @@
 //RESOURCE        resource_file2
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY			avkon.lib

--- a/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 SOURCE          testdomsetpageext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         bafl.lib

--- a/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -38,9 +38,9 @@
 SOURCE          testplatextsoundblocksataudioeventapi.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         ATSoundServerClient.lib
+LIBRARY         atsoundserverclient.lib
 
 LANG            SC
 

--- a/classicui_plat/extended_status_pane_api/inc/aknsgcc.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_status_pane_api/inc/aknsgcc.h	Thu Aug 19 10:11:06 2010 +0300
@@ -98,8 +98,33 @@
     IMPORT_C static void MoveApp(TInt aAppWindowGroupId, TSgcMoveAppToWhere aWhere);
 	IMPORT_C static void SetImpl(CAknSgcImpl* aImpl);
 
-	// internal
-    static void RelinquishPriorityToForegroundAppLC(TBool aIsForeground);
+	/**
+     * Relinquishes priority for the foreground application during layout
+     * switches and skin change events. During these events the process
+     * priorities are adjusted so that the priorities of the processes at the
+     * background are lowered so that the foreground process gets more CPU
+     * time in order to be able to quickly process the events.
+     *
+     * @internal Used internally by the UI Framework.
+     *
+     * @param  aIsForeground  @c ETrue if the application is currently on
+     *                        foreground, @c EFalse otherwise.
+     */
+    static void RelinquishPriorityToForegroundAppLC( TBool aIsForeground );
+    
+    /**
+     * Enables or disables the foreground process priority maintaining
+     * during priority relinquishment. With this enabled the application can
+     * be set to the foreground process priority even if it's actually
+     * on the background, to handle the events where priority relinquishment
+     * is used faster.
+     *
+     * @internal Used internally by the UI Framework.
+     *
+     * @param  aUseForeground  @c ETrue to maintain the foreground priority,
+     *                         @c EFalse otherwise.
+     */
+    static void UseForegroundPriorityDuringRelinquish( TBool aUseForeground );
 
 protected:
 	CAknSgcClient();

--- a/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -53,7 +53,7 @@
 SOURCE          testdomstatuspaneblockssyncdraw.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib

--- a/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomextendedutltsblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikcoctl.lib 

--- a/classicui_plat/find_item_ui_api/inc/finditemdialog.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/find_item_ui_api/inc/finditemdialog.h	Thu Aug 19 10:11:06 2010 +0300
@@ -196,6 +196,15 @@
          */
         void HandlePointerEventL ( const TPointerEvent& aPointerEvent );
 
+		/**
+        * Sets AIW submenu item visibility 
+        * Must be called before displaying the dialog
+        * 
+        * @since S60 5.2
+        * @param aVisible AIW submenu item visibility
+        */
+        IMPORT_C void SetCallSubMenuVisibility( TBool aVisible );
+
     protected:  // Functions from base classes
 
         /**
@@ -541,6 +550,9 @@
 
         // Tactile Feedback interface
         MTouchFeedback* iFeedback;        		
+
+		// Hide AIW submenu
+        TBool iHideCallSubMenu;
 		
     public: // new methods
         void DeleteMeL();

--- a/classicui_plat/find_item_ui_api/inc/finditemmenu.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/find_item_ui_api/inc/finditemmenu.h	Thu Aug 19 10:11:06 2010 +0300
@@ -309,6 +309,15 @@
         IMPORT_C void SetMenuItemVisibility( 
             CFindItemMenu::TMenuItem aItem,
             TBool aVisible );                           
+
+		/**
+        * Sets AIW submenu item visibility 
+        * Must be called before displaying the menu
+        * 
+        * @since S60 5.2
+        * @param aVisible AIW submenu item visibility
+        */
+        IMPORT_C void SetCallSubMenuVisibility( TBool aVisible );
                   
     private:
 
@@ -479,6 +488,9 @@
         */
         TInt iMenuItemFlags;
         MPBAiwNotify iCallback;
+
+		// Hide AIW submenu
+        TBool iHideCallSubMenu;
    };
 
 #endif      // FINDITEMMENU_H

--- a/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,7 +66,7 @@
 SOURCE          testdomfinditemcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         commonui.lib

--- a/classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h	Thu Aug 19 10:11:06 2010 +0300
@@ -808,6 +808,8 @@
     TBool iObserverNotified;
 
     TRect iOpenedItemRect;
+    
+    TBool iRotatedDraw;
     };
 
        

--- a/classicui_plat/ganes_api/tsrc/group/testplatgane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/ganes_api/tsrc/group/testplatgane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE 		testplatganeblockshgsingletextlistwithicon.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         ganes.lib
 LIBRARY         ws32.lib 

--- a/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomgenparamext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         commonui.lib
 LIBRARY         cone.lib

--- a/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomgppcblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 

--- a/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -54,7 +54,7 @@
 SOURCE          testdomindipluginext.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 

--- a/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -34,8 +34,9 @@
 #ifdef SBSV2
 USERINCLUDE     ../inc 
 
-	    MW_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
+SOURCEPATH      ../src
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
@@ -51,9 +52,9 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         Avkon.lib
+LIBRARY         avkon.lib
 
 LANG            SC
 

--- a/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomitemfinderblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         commonui.lib
 LIBRARY         egul.lib 

--- a/classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -52,9 +52,9 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         ptiengine.lib 
+LIBRARY         ptiengine.lib
 LIBRARY         aknjapanesereading.lib
 
 LANG            SC

--- a/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,9 +49,9 @@
 SOURCE          testdomkeyrotatorblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         aknkeyrotator.lib
+LIBRARY         AknKeyRotator.lib
 
 LANG            SC