# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282201866 -10800
# Node ID fcdfafb36fe7e4b59922308cd7a9ec53a84c10a4
# Parent  a1caeb42b3a3694e677dbcb9786588047b724066
Revision: 201031
Kit: 201033

diff -r a1caeb42b3a3 -r fcdfafb36fe7 applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/avkon_localised_texts_api/loc/avkon.loc
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/emergency_call_support_api/inc/AknEcs.h
--- 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;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h
--- 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 .    
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_input_capabilities_api/inc/aknextendedinputcapabilities.h
--- 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;
        
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h
--- 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__
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h
--- 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:
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_status_pane_api/inc/aknsgcc.h
--- 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();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/find_item_ui_api/inc/finditemdialog.h
--- 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();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/find_item_ui_api/inc/finditemmenu.h
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h
--- 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;
     };
 
        
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/ganes_api/tsrc/group/testplatgane.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp
--- 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 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp
--- 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
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp
--- 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
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp
--- a/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomlayoutcfgblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp
--- a/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomlisteffectscontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         aknlistloadertfx.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp
--- a/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomlongtapblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp
--- a/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdommediashareddocblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcore.lib 
 LIBRARY         apparc.lib
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         efsrv.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp
--- a/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdommemorycardblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         aknmemorycardui.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp
--- a/classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -35,8 +35,9 @@
 #ifdef SBSV2
 USERINCLUDE     ../inc 
 
-        MW_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
+SOURCEPATH      ../src
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
@@ -51,10 +52,10 @@
 SOURCE          testdomnumbergroupingblocksnumgrping.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         AVKON.LIB
-LIBRARY         NumberGrouping.lib
+LIBRARY         avkon.lib
+LIBRARY         numbergrouping.lib
 
 LANG            SC
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp
--- a/classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -77,7 +77,7 @@
 SOURCE          testdompslnfwbv.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         pslnframework.lib
 LIBRARY         cone.lib
@@ -87,7 +87,7 @@
 LIBRARY         eiksrv.lib
 LIBRARY         avkon.lib
 LIBRARY         egul.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         ecom.lib
 
 LANG            SC
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp
--- a/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomphonecontentutilblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/physics_api/tsrc/group/testplatphysics.mmp
--- a/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -40,7 +40,7 @@
 SOURCE          testplatphysicscontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         aknphysics.lib
 LIBRARY         eikcoctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp
--- a/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdompoieventmodcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp
--- a/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp
--- a/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomserverappserviceblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         servicehandler.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/signal_pane_api/inc/aknsignal.h
--- a/classicui_plat/signal_pane_api/inc/aknsignal.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/signal_pane_api/inc/aknsignal.h	Thu Aug 19 10:11:06 2010 +0300
@@ -225,6 +225,21 @@
 private: // From CCoeControl
     IMPORT_C virtual void Draw(const TRect& aRect) const;
 
+public:
+    /** 
+     * Set UMA state. Available UMA states are (avkon.hrh): 
+     * EAknSignalUmaIndicatorOff = 0x600,
+     * EAknSignalUmaIndicatorAvailable,
+     * EAknSignalUmaIndicatorAttached,
+     * EAknSignalUmaIndicatorEstablishingContext,
+     * EAknSignalUmaIndicatorContext,
+     * EAknSignalUmaIndicatorSuspended,
+     * EAknSignalUmaIndicatorMultipdp
+     * 
+     * @param aUmaIconState UMA state.
+     */
+    IMPORT_C void ShowUmaIconL(TInt aUmaIconState);
+    
 private:
    	static TInt TickerCallback(TAny* aThis);
     TInt DoTick();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp
--- a/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 SOURCE          testdomsignalprotected.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp
--- a/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,14 +50,14 @@
 SOURCE          testdomclockcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcore.lib 
-LIBRARY         commonui.lib 
+LIBRARY         commonui.lib
 LIBRARY         cone.lib 
-LIBRARY         aknskins.lib 
-LIBRARY         aknskinsrv.lib 
-LIBRARY         aknswallpaperutils.lib 
+LIBRARY         aknskins.lib
+LIBRARY         aknskinsrv.lib
+LIBRARY         aknswallpaperutils.lib
 LIBRARY         apparc.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/special_character_table_api/inc/AknCharMap.h
--- a/classicui_plat/special_character_table_api/inc/AknCharMap.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/special_character_table_api/inc/AknCharMap.h	Thu Aug 19 10:11:06 2010 +0300
@@ -412,6 +412,7 @@
     TInt Category();
     TBool IsSupportCategoryButtonUi() const;
     TBool IsJapaneseSctUi() const;
+    TBool IsKoreanSctUi() const;
     const TDesC* TitleWithSelectingSpecialChar();
 
 private:
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp
--- a/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomcharmap.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp
--- a/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -62,7 +62,7 @@
 SOURCE          testdomstylusactivepopupcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcore.lib
 LIBRARY         bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp
--- a/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomtasklistblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib 
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp
--- a/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,12 +50,12 @@
 SOURCE          testdomtextscrollercontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib
 LIBRARY         cone.lib
-LIBRARY         AKNLAYOUT2SCALABLE.LIB
+LIBRARY         AknLayout2Scalable.lib
 
 
 LANG            SC
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp
--- a/classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -40,7 +40,7 @@
 SOURCE          akntouchgesturefwtestsubscribercontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         akntouchgesturefw.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp
--- a/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -41,7 +41,7 @@
     TARGETPATH RESOURCE_FILES_DIR
     HEADER
     END
-
+SOURCEPATH      ../src
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
@@ -64,7 +64,7 @@
 SOURCE          testsdktptouchpanefeppen.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp
--- a/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testdomtransitioneffectparablocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 
 LANG            SC
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp
--- a/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -53,7 +53,7 @@
 SOURCE          testdomutilitiescontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         apparc.lib
 LIBRARY         cone.lib
@@ -64,8 +64,8 @@
 LIBRARY         eikdlg.lib
 LIBRARY         eiksrvui.lib
 LIBRARY         commonui.lib
-LIBRARY         commonengine.lib
-LIBRARY         sortutil.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         SortUtil.lib
 
 LANG            SC
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp
--- a/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testdomvolumepopupcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp
--- a/classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,7 +66,7 @@
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib 
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         servicehandler.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh
--- a/classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh	Thu Aug 19 10:11:06 2010 +0300
@@ -192,6 +192,12 @@
     EGenericParamLastName               = 1921,
     EGenericParamNickname               = 1922
 // BRANCH_END 08-28-08: gronoff
+    
+    ,
+    EGenericParamHideCallSubmenu        = 1950,
+    EGenericParamVoiceCall              = 1951,
+    EGenericParamVideoCall              = 1952,
+    EGenericParamVoIPCall               = 1953   
     };
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp
--- a/classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,9 +49,9 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         ServiceHandler.lib
+LIBRARY         servicehandler.lib
 LIBRARY         estor.lib
 LIBRARY         efsrv.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp
--- a/classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -54,7 +54,7 @@
 SOURCE          testsdkaiwservicehandlerblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         servicehandler.lib
 LIBRARY         eikcore.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp
--- a/classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 SOURCE          testsdkacontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp
--- a/classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -71,7 +71,7 @@
 SOURCE          testsdkappfwviewappui.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp
--- a/classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -47,7 +47,7 @@
 SOURCE          testsdkbasecontrolsblockseikalign.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/buttons_api/inc/EIKBTGPC.H
--- a/classicui_pub/buttons_api/inc/EIKBTGPC.H	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/buttons_api/inc/EIKBTGPC.H	Thu Aug 19 10:11:06 2010 +0300
@@ -102,7 +102,8 @@
         EDelayActivation = 0x02, ///< If set, the container is not activated during construction.
         EUseMaxSize      = 0x04,  ///< Not used.
         EIsEmbedded      = 0x08, ///< Embedded in a dialog or popup.
-        EParentIsControl = 0x10  ///< Parent window group is treated as CCoeControl.
+        EParentIsControl = 0x10, ///< Parent window group is treated as CCoeControl.
+        EAlwaysShown     = 0x20  ///< Left softkey is not automatically hidden 
         };
         
     /**
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp
--- a/classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -52,7 +52,7 @@
 SOURCE          testsdkbuttonscontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         bafl.lib
 LIBRARY         eikcoctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp
--- a/classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,12 +64,12 @@
 SOURCE          testsdkchoicelistcontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         bafl.lib
-LIBRARY         AVKON.LIB
+LIBRARY         avkon.lib
 LIBRARY         cone.lib
-LIBRARY         EIKCOCTL.LIB
+LIBRARY         eikcoctl.lib
 LIBRARY         eikcore.lib
 
 LANG            SC
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp
--- a/classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -87,7 +87,7 @@
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib 
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         commondialogs.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp
--- a/classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 SOURCE          testsdkcpcontextpane.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY			avkon.lib
 LIBRARY			cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp
--- a/classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 SOURCE          testsdkdialogshutterblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikdlg.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp
--- a/classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,7 +67,7 @@
 SOURCE          testsdkdialogscontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikdlg.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp
--- a/classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -40,7 +40,7 @@
 SOURCE          testsdkdocumenthandlerobserver.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         commonui.lib
 LIBRARY         eikcore.lib
@@ -48,8 +48,8 @@
 LIBRARY         efsrv.lib
 LIBRARY         apmime.lib
 LIBRARY         avkon.lib
-LIBRARY         APPARC.LIB
-LIBRARY         PlatformEnv.lib
+LIBRARY         apparc.lib
+LIBRARY         platformenv.lib
 
 LANG            SC
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/editors_api/inc/EIKEDWIN.H
--- a/classicui_pub/editors_api/inc/EIKEDWIN.H	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/editors_api/inc/EIKEDWIN.H	Thu Aug 19 10:11:06 2010 +0300
@@ -495,6 +495,11 @@
 		 * Record enableSmiley is supported.
 		 */
 		TBool iEnableSmileySupported;
+		
+		/**
+		 * Record if text view has been actually hidden.
+		 */
+		TBool iTextViewHidden;
         };
 
 public:
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/editors_api/inc/EIKMFNE.H
--- a/classicui_pub/editors_api/inc/EIKMFNE.H	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/editors_api/inc/EIKMFNE.H	Thu Aug 19 10:11:06 2010 +0300
@@ -62,6 +62,11 @@
 // Extension object within CEikMfne
 class CEikMfneExtension;
 
+// Extension object within CEikTimeAndDateEditor
+class CEikTimeAndDateEditorExtension;
+
+// Extension object within CEikTimeEditorExtension
+class CEikTimeEditorExtension;
 //
 /**
  * Abstract base class for fields within a multi-field numeric editor.
@@ -816,7 +821,9 @@
         
         ELaunchPenInputAutomatic,
 
-        EPartialScreenInput
+        EPartialScreenInput,
+        /* Support the feature change AM and PM with pressing on touch input*/
+        EChangeAmPm
         };
     /** Parameter for finger support feature: 
       * 0 means disable the suppor; 
@@ -1247,6 +1254,9 @@
 	const CFont* iFont;
     TInt iAlignment;
     TBitFlags iFlags;
+private:
+friend class CEikTimeEditor;
+friend class CEikTimeAndDateEditor; 
 	};
 
 inline TInt CEikMfne::CurrentField() const
@@ -1749,11 +1759,16 @@
     * From CAknControl
     */
     IMPORT_C void* ExtensionInterface( TUid aInterface );
+    void ChangeAmPm();
+   
 private:
 	CTimeEditor* iTimeEditor;
 	TTime iMinimumTime;
 	TTime iMaximumTime;
-	TInt iSpare;
+	CEikTimeEditorExtension* iTimeExtension;
+	
+private:
+    friend class CEikTimeEditorExtension; 
 	};
 
 
@@ -2161,12 +2176,16 @@
     * From CAknControl
     */
     IMPORT_C void* ExtensionInterface( TUid aInterface );
+    void ChangeAmPm();
+    
 private:
 	CTimeEditor* iTimeEditor;
 	CDateEditor* iDateEditor;
 	TTime iMinimumTimeAndDate;
 	TTime iMaximumTimeAndDate;
-	TInt iSpare;
+    CEikTimeAndDateEditorExtension* iTimeDateExtension;
+private:    
+    friend class CEikTimeAndDateEditorExtension; 
 	};
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp
--- a/classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -92,7 +92,7 @@
 SOURCE          testedwindialog.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcdlg.lib
@@ -107,15 +107,15 @@
 LIBRARY         form.lib
 LIBRARY         uiklaf.lib
 LIBRARY         eikcore.lib
-LIBRARY         Lbs.lib
+LIBRARY         lbs.lib
 LIBRARY         insock.lib
 LIBRARY         fepbase.lib
 LIBRARY         etext.lib
 LIBRARY         field.lib
 LIBRARY         efsrv.lib
 LIBRARY         gdi.lib
-LIBRARY         aknskins.lib 
-LIBRARY         aknskinsrv.lib 
+LIBRARY         aknskins.lib
+LIBRARY         aknskinsrv.lib
 LIBRARY         aknswallpaperutils.lib
 LIBRARY         fbscli.lib
 LIBRARY         print.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp
--- a/classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkerruiblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         commonui.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp
--- a/classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,13 +57,13 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib
 LIBRARY         cone.lib
 LIBRARY         eikcoctl.lib
-LIBRARY         fontutils.lib 
+LIBRARY         fontutils.lib
 LIBRARY         uiklaf.lib 
 LIBRARY         gdi.lib 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/form_api/tsrc/group/testsdkform.mmp
--- a/classicui_pub/form_api/tsrc/group/testsdkform.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/form_api/tsrc/group/testsdkform.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 SOURCE          testsdkformcontrol.cpp 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/generic_button_api/inc/AknButton.h
--- a/classicui_pub/generic_button_api/inc/AknButton.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/generic_button_api/inc/AknButton.h	Thu Aug 19 10:11:06 2010 +0300
@@ -1485,9 +1485,24 @@
 
         /**
          * Converts text to visual and clips it. This is called when there
-         * are possible changes in visual text.
+         * are possible changes in visual text or text area changed.
+         * Notice that if the text area size is changed, clipped visual text 
+         * should be regenerated. 
+         *
+         * @param aRect new text area.         
+         *         
          */
-        void ConvertTextToVisualAndClip() const; 
+        void ConvertTextToVisualAndClip( const TRect& aRect ) const; 
+        
+        /*
+         * Get rect for icon and text of the current button state .
+         * 
+         * @param aIconRect the rectangle for icon. If no icon used in current state,
+         *                 this will be EUninitialized.
+         * @param aTextRect the rectangle for text. If no text in current state,
+         *                 this will be EUninitialized.
+         */
+        void GetCurrentStateTextAndIconRect( TRect& aIconRect, TRect& aTextRect ) const;
 
     protected: // Data
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp
--- a/classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,16 +68,16 @@
 SOURCE          animatorcallback.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         EIKCOCTL.LIB
+LIBRARY         eikcoctl.lib
 LIBRARY         bafl.lib
 LIBRARY         egul.lib 
 LIBRARY         aknskins.lib
 LIBRARY         aknskinsrv.lib
 LIBRARY         aknswallpaperutils.lib
 LIBRARY         fbscli.lib 
-LIBRARY         aknicon.lib 
+LIBRARY         aknicon.lib
 LIBRARY         cone.lib
 LIBRARY         bitgdi.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp
--- a/classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -75,10 +75,10 @@
 SOURCE          stifgridview.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         grid.lib 
 LIBRARY         cone.lib
 LIBRARY         ws32.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp
--- a/classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -35,8 +35,9 @@
 #ifdef SBSV2
 USERINCLUDE     ../inc 
 
-    MW_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
+SOURCEPATH      ../src
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
@@ -54,7 +55,7 @@
 SOURCE          testsdkhierarchicallistsordering.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         apparc.lib
 LIBRARY         cone.lib
@@ -62,13 +63,13 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         efsrv.lib
 LIBRARY         aknhlist.lib
 LIBRARY         aknicon.lib
-LIBRARY         aknskins.lib 
-LIBRARY         aknskinsrv.lib 
+LIBRARY         aknskins.lib
+LIBRARY         aknskinsrv.lib
 LIBRARY         aknswallpaperutils.lib
 
 LANG            SC
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp
--- a/classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -43,6 +43,7 @@
 LANGUAGE_IDS
 END
 
+SOURCEPATH      ../src
 #else // SBSV2 not defined
 USERINCLUDE     ../inc 
 USERINCLUDE     ../data
@@ -63,7 +64,7 @@
 SOURCE          testsdkeikhkeytblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/images_api/tsrc/group/testsdkimages.mmp
--- a/classicui_pub/images_api/tsrc/group/testsdkimages.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/images_api/tsrc/group/testsdkimages.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 SOURCE          testsdkimagesblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         fbscli.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp
--- a/classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 SOURCE          testsdkindicatorsindicators.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         bafl.lib 
 LIBRARY         avkon.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp
--- a/classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkinfopopupnoteblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         bafl.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h
--- a/classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h	Thu Aug 19 10:11:06 2010 +0300
@@ -61,7 +61,8 @@
             EFixedMode     = 0x0008, // fixed position and size are used
             EExcludeFrames = 0x0010, // frames and heading area are excluded in fixed mode
             EAutoMirror    = 0x0020, // opening direction is automatically mirrored in left-to-right layouts
-            EDontClose     = 0x0040  // popup not closed when pointer up received outside popup 
+            EDontClose     = 0x0040, // popup not closed when pointer up received outside popup
+            EConsumeKeys   = 0x0080  // popup consumes key events
     };
             
         enum TAknPreviewPopUpContentSize
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp
--- a/classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkinformationpreviewpopupblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib 
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp
--- a/classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -51,7 +51,7 @@
 SOURCE          testsdkinitializationblocksco.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp
--- a/classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,9 +58,9 @@
 SOURCE          testsdkifcontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
-LIBRARY         aknicon.lib 
+LIBRARY         aknicon.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikcoctl.lib
 LIBRARY         eikctl.lib 
@@ -70,8 +70,8 @@
 LIBRARY         egul.lib 
 LIBRARY         cone.lib 
 LIBRARY         bafl.lib 
-LIBRARY         aknskins.lib 
-LIBRARY         aknskinsrv.lib 
+LIBRARY         aknskins.lib
+LIBRARY         aknskinsrv.lib
 LIBRARY         aknswallpaperutils.lib
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp
--- a/classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkkeylockblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/labels_api/tsrc/group/testsdklabels.mmp
--- a/classicui_pub/labels_api/tsrc/group/testsdklabels.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/labels_api/tsrc/group/testsdklabels.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -72,7 +72,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         gdi.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/lists_api/inc/EIKLBI.H
--- a/classicui_pub/lists_api/inc/EIKLBI.H	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/lists_api/inc/EIKLBI.H	Thu Aug 19 10:11:06 2010 +0300
@@ -350,7 +350,13 @@
          * This flag is used during scrolling to indicate that background has
          * been already drawn.
          */
-        EBackgroundDrawn = 0x1000
+        EBackgroundDrawn = 0x1000,
+
+        /**
+         * Override text color from skin 
+         */
+        EUseOverrideSkinTextColor = 0x2000
+
         };
 
 public:
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/lists_api/inc/EIKLBV.H
--- a/classicui_pub/lists_api/inc/EIKLBV.H	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/lists_api/inc/EIKLBV.H	Thu Aug 19 10:11:06 2010 +0300
@@ -858,6 +858,20 @@
      *                                          this class. 
      */
     void ClearSelection( TBool aDrawItems );
+    
+    /**
+     * Sets all items selected.
+     *
+     * @param  aDrawItems  Whether or not to draw the items which are
+     *                     selected.
+     *
+     * @panic EEikPanicListBoxNoSelIndexArray Panics if selection indexes have 
+     *        not been defined for this class. 
+     *        
+     * @panic EEikPanicListBoxNoModel Panics if listbox model not existing.
+     * 
+     */
+    void SelectAllL( TBool aDrawItems );
 
 protected:
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/lists_api/tsrc/group/testsdklists.mmp
--- a/classicui_pub/lists_api/tsrc/group/testsdklists.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/lists_api/tsrc/group/testsdklists.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -98,7 +98,7 @@
 SOURCE          testsdklistsblocksaknlists.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikctl.lib
@@ -114,7 +114,7 @@
 LIBRARY         gdi.lib
 LIBRARY         CommonEngine.lib
 LIBRARY         bitgdi.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         aknskins.lib
 LIBRARY         aknskinsrv.lib
 LIBRARY         aknswallpaperutils.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp
--- a/classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -73,7 +73,7 @@
 SOURCE          testsdkcapcsubprotectedclass.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib 
 LIBRARY         eikcoctl.lib 
@@ -82,10 +82,10 @@
 LIBRARY         gdi.lib 
 LIBRARY         eikcore.lib 
 LIBRARY         avkon.lib 
-LIBRARY         aknskins.lib 
-LIBRARY         aknskinsrv.lib 
-LIBRARY         aknswallpaperutils.lib 
-LIBRARY         aknicon.lib 
+LIBRARY         aknskins.lib
+LIBRARY         aknskinsrv.lib
+LIBRARY         aknswallpaperutils.lib
+LIBRARY         aknicon.lib
 
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp
--- a/classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -78,7 +78,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/notes_api/inc/aknnotecontrol.h
--- a/classicui_pub/notes_api/inc/aknnotecontrol.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/notes_api/inc/aknnotecontrol.h	Thu Aug 19 10:11:06 2010 +0300
@@ -369,7 +369,7 @@
             * @return Left index into table "Note With Image Popup Window
             * Texts Line 1".
             */
-			TInt NWIPWindowTextsLine1L(TInt aLineNum) const;
+			TInt NWIPWindowTextsLine1Left(TInt aLineNum) const;
 
         	/**
             * Return Right index into table "Note With Image Popup Window
@@ -385,7 +385,7 @@
             * @return Right index into table "Note With Image Popup Window
             * Texts Line 1".
             */
-			TInt NWIPWindowTextsLine1R(TInt aLineNum) const;
+			TInt NWIPWindowTextsLine1Right(TInt aLineNum) const;
 
 			/**
             * Return Bottom index into table "Note With Image Popup Window
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/notes_api/tsrc/group/testsdknotes.mmp
--- a/classicui_pub/notes_api/tsrc/group/testsdknotes.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/notes_api/tsrc/group/testsdknotes.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -83,7 +83,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcdlg.lib
@@ -98,15 +98,15 @@
 LIBRARY         form.lib
 LIBRARY         uiklaf.lib
 LIBRARY         eikcore.lib
-LIBRARY         Lbs.lib
+LIBRARY         lbs.lib
 LIBRARY         insock.lib
 LIBRARY         fepbase.lib
 LIBRARY         etext.lib
 LIBRARY         field.lib
 LIBRARY         efsrv.lib
 LIBRARY         gdi.lib
-LIBRARY         aknskins.lib 
-LIBRARY         aknskinsrv.lib 
+LIBRARY         aknskins.lib
+LIBRARY         aknskinsrv.lib
 LIBRARY         aknswallpaperutils.lib
 LIBRARY         fbscli.lib
 LIBRARY         print.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp
--- a/classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -48,7 +48,7 @@
 SOURCE          activeexample.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eiksrv.lib 
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp
--- a/classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,17 +66,17 @@
 SOURCE          testoptionsmenu.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikcore.lib
 LIBRARY         egul.lib 
-LIBRARY         aknicon.lib 
+LIBRARY         aknicon.lib
 LIBRARY         cone.lib 
 LIBRARY         avkon.lib 
 LIBRARY         apparc.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY	        efsrv.lib
 LIBRARY         bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp
--- a/classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -78,7 +78,7 @@
 SOURCE          testsdkpopupsspsp.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikcoctl.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H
--- a/classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H	Thu Aug 19 10:11:06 2010 +0300
@@ -408,7 +408,7 @@
 public:
     TBool HitRegionContains( const TPoint& aPoint, const CCoeControl& aControl ) const;
 public:
-    void SetPageFormSized();
+    void SetPageFormSized(const TRect& aRect);
 protected:  // from CCoeControl
     virtual void SizeChanged();
     virtual TInt CountComponentControls() const;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp
--- a/classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib 
 LIBRARY         eikcore.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp
--- a/classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 SOURCE          testsdkaknquerydialogprotected.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikcoctl.lib
@@ -75,7 +75,7 @@
 LIBRARY         bafl.lib
 LIBRARY         aknicon.lib
 LIBRARY         egul.lib
-LIBRARY         Lbs.lib
+LIBRARY         lbs.lib
 LIBRARY         insock.lib
 
 LANG            SC
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp
--- a/classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,7 +59,7 @@
 SOURCE          testsdkscscreenclearerbase.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikctl.lib
 LIBRARY         eikcoctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp
--- a/classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkscreenmodeblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp
--- a/classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -37,7 +37,7 @@
 SOURCE          testsdkscreensaverblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         ecom.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp
--- a/classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -55,7 +55,7 @@
 SOURCE          testsdkscrollereikscrlb.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp
--- a/classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.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,10 +52,10 @@
 SOURCE          testsdksfastobserver.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         cone.lib
 LIBRARY         ws32.lib
 LIBRARY         eikcore.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp
--- a/classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -41,7 +41,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp
--- a/classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -86,7 +86,7 @@
 SOURCE          testaknradiobuttonsettingpageprotected.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/slider_api/tsrc/group/testsdkslider.mmp
--- a/classicui_pub/slider_api/tsrc/group/testsdkslider.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/slider_api/tsrc/group/testsdkslider.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 SOURCE          testsdksliderview.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         bafl.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp
--- a/classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -37,7 +37,7 @@
     MW_LAYER_SYSTEMINCLUDE
 
 
-    START RESOURCE ../data/testsdktestsdksounds.rss
+    START RESOURCE ../data/testsdksounds.rss
         TARGETPATH RESOURCE_FILES_DIR
         HEADER
         END
@@ -62,7 +62,7 @@
 SOURCE          testsdksoundsblocksaknsoundsystem.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         estor.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp
--- a/classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -55,7 +55,7 @@
 SOURCE          testsdkstatuspanevisitor.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h
--- a/classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h	Thu Aug 19 10:11:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 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"
@@ -54,6 +54,12 @@
         EPositionTypeRightBottom,
         EPositionTypeLeftBottom      
         };
+
+    enum TStylusPopupMode
+        {
+        EConsumeKeyEvents = 0x01 // Consumes key events
+        };
+
     /**
      * Two-phased constructor
      *
@@ -73,6 +79,22 @@
      * @param aObserver Menu observer (not owned) that handles 
      *                  stylus popup events.
      * @param aPoint The position where stylus was tapped
+     * @param aPopup Preview popup from which stylus popup
+     *               menu was launched, can be NULL.
+     * @param aFlags Optional parameters
+     */
+
+    static CAknStylusPopUpMenu* NewL( MEikMenuObserver* aObserver,
+            const TPoint& aPoint,
+            CAknPreviewPopUpController* aPopup,
+            const TInt aFlags );
+
+    /**
+     * Two-phased constructor
+     *
+     * @param aObserver Menu observer (not owned) that handles
+     *                  stylus popup events.
+     * @param aPoint The position where stylus was tapped
      */
     IMPORT_C static CAknStylusPopUpMenu* NewL( MEikMenuObserver* aObserver, 
                                          const TPoint& aPoint );
@@ -156,6 +178,14 @@
      * @since s60 v5.2
      */
     void Clear();
+    
+    /**
+     * Hides the stylus popup menu.
+     *
+     * @internal
+     * @since S60 v5.2
+     */
+    void HideMenu();
 
 // from base class CCoeControl
 
@@ -188,9 +218,11 @@
      * @param aPoint The position where stylus was tapped
      * @param aPopup Preview popup from which stylus popup
      *               menu was launched, can be NULL.
+     * @param aFlags Optional parameters
      */
     CAknStylusPopUpMenu( MEikMenuObserver* aObserver, const TPoint& aPoint,
-                         CAknPreviewPopUpController* aPopup );
+                         CAknPreviewPopUpController* aPopup,
+                         const TInt aFlags = 0 );
 
     /**
      * 2nd phase constructor
@@ -274,6 +306,11 @@
      * Used to track if object has been deleted while calling client callback.
      */
     TBool* iIsDeleted;
+
+    /**
+     * Mode flags.
+     */
+    TInt iModeFlags;
     };
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp
--- a/classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 SOURCE          testsdkmenuobserver.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         eikcore.lib
 LIBRARY         eikcoctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tabs_api/inc/akntabgrp.h
--- a/classicui_pub/tabs_api/inc/akntabgrp.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tabs_api/inc/akntabgrp.h	Thu Aug 19 10:11:06 2010 +0300
@@ -355,7 +355,16 @@
     void SizeChangedInNormalLayout();
     void SizeChangedInFlatLayout();
     void SizeChangedInNarrowLayout();
-
+    
+    /**
+     * Sets the flag to indicate the highlight status
+     * 
+     * @param  aHighlight  highlight status
+     *                     default is EFalse
+     */
+    void SetHighlight(TBool aHighlight);
+    
+    
 private:
 
     CEikLabel* iLabel;
@@ -863,6 +872,13 @@
     void SetNaviArrowsVisible( TBool aVisible );
 
 private:
+    /**
+     * Resets the highlight status for tabs
+     */
+    void ResetHighlightStatus();
+        
+
+private:
     CArrayPtr<CAknTab>*     iTabArray;
     TInt                    iActiveTab;
     TRect                   iSpareRect;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp
--- a/classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 SOURCE          testsdktabgrpcontrol.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp
--- a/classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp
--- a/classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         eikcoctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp
--- a/classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -52,7 +52,7 @@
 
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -72,7 +72,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -69,7 +69,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,13 +63,13 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY			commonui.lib
 LIBRARY			apmime.lib 
-LIBRARY			PlatformEnv.lib 
+LIBRARY			platformenv.lib
 LIBRARY			eikctl.lib
 LIBRARY			sysutil.lib 
 LIBRARY                 bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,12 +63,12 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY	        commonui.lib 
-LIBRARY         commonengine.lib
+LIBRARY	        commonui.lib
+LIBRARY         CommonEngine.lib
 
 START RESOURCE ../group/bctesteh_reg.rss
 DEPENDS bctesteh.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,7 +66,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,13 +64,13 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
 LIBRARY         fbscli.lib
 LIBRARY         akninputlanguage.lib
-LIBRARY		    fontutils.lib 
+LIBRARY		    fontutils.lib
 LIBRARY         uiklaf.lib 
 LIBRARY         gdi.lib 
 LIBRARY         egul.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,11 +64,11 @@
 LIBRARY         aknnotify.lib
 LIBRARY		    bafl.lib
 LIBRARY         bctestutil.lib
-LIBRARY         commonengine.lib
-LIBRARY         AknSkins.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         aknskins.lib
 LIBRARY         egul.lib
-LIBRARY         AknIcon.lib
-LIBRARY         CentralRepository.lib
+LIBRARY         aknicon.lib
+LIBRARY         centralrepository.lib
 
 // Changes for Scalable UI:
 // New registration resource defined.
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,7 +66,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY         efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,8 +57,8 @@
 
 SYSTEMINCLUDE   . /epoc32/include
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -75,8 +75,8 @@
 LIBRARY         eikctl.lib 
 LIBRARY         bafl.lib
 LIBRARY         eikdlg.lib                                                  
-LIBRARY         AknSkins.lib
-LIBRARY         AknIcon.lib
+LIBRARY         aknskins.lib
+LIBRARY         aknicon.lib
 LIBRARY         egul.lib
 LIBRARY         gdi.lib
 LIBRARY         efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,8 +63,8 @@
 
 SYSTEMINCLUDE   . /epoc32/include
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -69,8 +69,8 @@
 
 SYSTEMINCLUDE   . /epoc32/include
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,12 +66,12 @@
 LIBRARY         insock.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
 LIBRARY         estor.lib 
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 LIBRARY         bafl.lib
 
 // Changes for Scalable UI:
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,8 +63,8 @@
 
 SYSTEMINCLUDE   . /epoc32/include
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,8 +67,8 @@
 LIBRARY         eikctl.lib 
 LIBRARY         bafl.lib
 LIBRARY         eikdlg.lib                                                  
-LIBRARY         AknSkins.lib
-LIBRARY         AknIcon.lib
+LIBRARY         aknskins.lib
+LIBRARY         aknicon.lib
 LIBRARY         egul.lib
 LIBRARY         gdi.lib
 LIBRARY         efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         avkon.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,11 +63,11 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY			AknSkinSrv.lib
+LIBRARY			aknskinsrv.lib
 
 START RESOURCE ../group/bctestserverapp_reg.rss
 DEPENDS bctestserverapp.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -74,7 +74,7 @@
 LIBRARY         insock.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,7 +67,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,7 +66,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,12 +63,12 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY         eikctl.lib
-LIBRARY         Lbs.lib
+LIBRARY         lbs.lib
 
 START RESOURCE ../group/BCTestLocation_reg.rss
 DEPENDS bctestlocation.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,8 +58,8 @@
 
 SYSTEMINCLUDE   . /epoc32/include
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         bafl.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp
--- a/classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,17 +64,17 @@
 
 
 
-LIBRARY         EUSER.LIB   
-LIBRARY         WS32.LIB
-LIBRARY         CONE.LIB
-LIBRARY         EIKCORE.LIB 
-LIBRARY         AVKON.LIB
-LIBRARY         APPARC.LIB
+LIBRARY         euser.lib
+LIBRARY         ws32.lib
+LIBRARY         cone.lib
+LIBRARY         eikcore.lib
+LIBRARY         avkon.lib
+LIBRARY         apparc.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         efsrv.lib
 LIBRARY	        apgrfx.lib
-LIBRARY         commonengine.lib
-LIBRARY         CentralRepository.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         centralrepository.lib
 LIBRARY         bafl.lib
 LIBRARY         sysutil.lib
 LIBRARY         estor.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp
--- a/classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp
--- a/classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,9 +49,9 @@
 LIBRARY    cone.lib
 LIBRARY    eikcore.lib
 LIBRARY    aknnotify.lib
-LIBRARY    commonengine.lib
+LIBRARY    CommonEngine.lib
 LIBRARY    avkon.lib
-LIBRARY    CentralRepository.lib
+LIBRARY    centralrepository.lib
 LIBRARY    sysutil.lib
 LIBRARY		 estor.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH
--- a/classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH	Thu Aug 19 10:11:06 2010 +0300
@@ -222,6 +222,10 @@
 #define EAknEditorFlagHideTextView                    0x800000
 #define EAknEditorFlagCursorLedingEdge                0x1000000
 #define EAknEditorFlagNeedWholeTextData               0x2000000
+// Avkon secret editor and web secret editor has different behavior, this flag 
+// is used to distinguish them for FEP 
+#define EAknEditorFlagAvkonSecretEditor               0x4000000
+
 // NOTICE! Flag value 0x80000000 is reserved for internal use by FEP.
 
 // EIKLABEL.HRH
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/ui_framework_definitions_api/inc/avkon.hrh
--- a/classicui_pub/ui_framework_definitions_api/inc/avkon.hrh	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/ui_framework_definitions_api/inc/avkon.hrh	Thu Aug 19 10:11:06 2010 +0300
@@ -394,6 +394,12 @@
     EAknCmdMarkingModeUnmarkAll,
 
     /**
+     * Command ids for switching to portrait or landscape FSQ.
+     */
+    EPeninputCmdPortraitEditor,
+    EPeninputCmdLandscapeEditor,
+
+    /**
     * @deprecated
     * Do not use.
     */
@@ -1300,7 +1306,16 @@
     EAknSignalHsdpaIndicatorEstablishingContext,
     EAknSignalHsdpaIndicatorContext,
     EAknSignalHsdpaIndicatorSuspended,
-    EAknSignalHsdpaIndicatorMultipdp
+    EAknSignalHsdpaIndicatorMultipdp,
+
+    // UMA indicator states
+    EAknSignalUmaIndicatorOff = 0x600,
+    EAknSignalUmaIndicatorAvailable,
+    EAknSignalUmaIndicatorAttached,
+    EAknSignalUmaIndicatorEstablishingContext,
+    EAknSignalUmaIndicatorContext,
+    EAknSignalUmaIndicatorSuspended,
+    EAknSignalUmaIndicatorMultipdp
     };
 
 #define KAknSignalOffLineMode 0x00010000
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp
--- a/classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkuiframedefinitionsblocks.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp
--- a/classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 SOURCE          testsdkuifwutilview.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         cone.lib
 LIBRARY         avkon.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp
--- a/classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -62,7 +62,7 @@
 SOURCE          testsdkuikonccobserver.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         eikcore.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp
--- a/classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 SOURCE          testsdkvolumecontainer.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib 
 LIBRARY         cone.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp
--- a/classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,7 +50,7 @@
 SOURCE          testsdkeventobserver.cpp
 
 LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 LIBRARY         stiftestengine.lib
 LIBRARY         avkon.lib
 LIBRARY         bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonDialogs/group/CommonDialogs.mmp
--- a/commonuis/CommonDialogs/group/CommonDialogs.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonDialogs/group/CommonDialogs.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -91,18 +91,18 @@
 LIBRARY         eikcore.lib
 LIBRARY         eikdlg.lib
 LIBRARY         avkon.lib
-LIBRARY         commonengine.lib // StringLoader
+LIBRARY         CommonEngine.lib // StringLoader
 LIBRARY         apparc.lib
 LIBRARY         directorylocalizer.lib // Build this first!
 LIBRARY         featmgr.lib // Feature manager
-LIBRARY         AknSkins.lib // Skins
+LIBRARY         aknskins.lib // Skins
 LIBRARY         egul.lib // CGulIcon
 LIBRARY         apgrfx.lib // CApaMaskedBitmap,RApaLsSession
 LIBRARY         apmime.lib // TDataType
 LIBRARY         fbscli.lib // CFbsBitmap
 LIBRARY         aknmemorycardui.lib
 LIBRARY         platformenv.lib // PathInfo
-LIBRARY         AknIcon.lib
+LIBRARY         aknicon.lib
 LIBRARY         rsfwmountman.lib
 //#include "CommonDialogsMbm.inc"
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonDialogs/group_test/CommonDialogs.mmp
--- a/commonuis/CommonDialogs/group_test/CommonDialogs.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonDialogs/group_test/CommonDialogs.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -87,18 +87,18 @@
 LIBRARY         eikcore.lib
 LIBRARY         eikdlg.lib
 LIBRARY         avkon.lib
-LIBRARY         commonengine.lib // StringLoader
+LIBRARY         CommonEngine.lib // StringLoader
 LIBRARY         apparc.lib
 LIBRARY         directorylocalizer.lib // Build this first!
 LIBRARY         featmgr.lib // Feature manager
-LIBRARY         AknSkins.lib // Skins
+LIBRARY         aknskins.lib // Skins
 LIBRARY         egul.lib // CGulIcon
 LIBRARY         apgrfx.lib // CApaMaskedBitmap,RApaLsSession
 LIBRARY         apmime.lib // TDataType
 LIBRARY         fbscli.lib // CFbsBitmap
 LIBRARY         aknmemorycardui.lib
 LIBRARY         platformenv.lib // PathInfo
-LIBRARY         AknIcon.lib
+LIBRARY         aknicon.lib
 
 //#include "CommonDialogsMbm.inc"
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonDialogs/src/AknCFDUtility.cpp
--- a/commonuis/CommonDialogs/src/AknCFDUtility.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonDialogs/src/AknCFDUtility.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -795,24 +795,21 @@
                         
         if (( aFreeSpace >= KHundredNum ) && ( aFreeSpace < KMegaNum ))
             {
-            tempNum /= KThousandNum; // Divide to kilobytes
-            tempNum = TReal32( TInt( tempNum * 10 ) ) / 10;
+            tempNum /= TReal64( KThousandNum ); // Divide to kilobytes
             unitBuf = StringLoader::LoadLC(
                                     R_CFD_QTN_MEMC_UNITS_KILOBYTE,
                                     CCoeEnv::Static());                              
             }
         else if (( aFreeSpace >= KMegaNum ) && ( aFreeSpace < KGigaNum ))
             {                             
-            tempNum /= KMegaNum; // Divide to Megabytes
-            tempNum = TReal32( TInt( tempNum * 10 ) ) / 10;
+            tempNum /= TReal64( KMegaNum ); // Divide to Megabytes
             unitBuf = StringLoader::LoadLC(
                                     R_CFD_QTN_MEMC_UNITS_MEGABYTE,
                                     CCoeEnv::Static());            
             }
         else if (aFreeSpace >= KGigaNum )   
             {
-            tempNum /= KGigaNum; // Divide to Gigabytes
-            tempNum = TReal32( TInt( tempNum * 10 ) ) / 10;
+            tempNum /= TReal64( KGigaNum ); // Divide to Gigabytes
             unitBuf = StringLoader::LoadLC(
                                     R_CFD_QTN_MEMC_UNITS_GIGABYTE,
                                     CCoeEnv::Static());            
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonDialogs/src/CAknFileSelectionModel.cpp
--- a/commonuis/CommonDialogs/src/CAknFileSelectionModel.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonDialogs/src/CAknFileSelectionModel.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -312,7 +312,7 @@
     TInt entryIndex = 0;
     for ( TInt i( 0 ); i < itemCount; i++ ) // Add entry or not
         {
-        const TEntry& entry = ( *entryArray )[i];
+        TEntry entry = ( *entryArray )[i];
         if ( EntryIsAccepted( entry ) )
             {
              // Add entry
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/CenRep/keys_commonui.xls
Binary file commonuis/CommonUi/CenRep/keys_commonui.xls has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/EABI/CommonUIU.DEF
--- a/commonuis/CommonUi/EABI/CommonUIU.DEF	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/EABI/CommonUIU.DEF	Thu Aug 19 10:11:06 2010 +0300
@@ -121,4 +121,6 @@
 	_ZN12MPBAiwNotify13HandleNotifyLEiiR20CAiwGenericParamListRKS0_ @ 120 NONAME
 	_ZN11CItemFinder22SetItemFinderObserverLEP22MAknItemFinderObserver @ 121 NONAME
 	_ZN15CFindItemDialog17EnableSingleClickEi @ 122 NONAME
+	_ZN13CFindItemMenu24SetCallSubMenuVisibilityEi @ 123 NONAME
+	_ZN15CFindItemDialog24SetCallSubMenuVisibilityEi @ 124 NONAME
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/bwins/CommonUIU.def
--- a/commonuis/CommonUi/bwins/CommonUIU.def	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/bwins/CommonUIU.def	Thu Aug 19 10:11:06 2010 +0300
@@ -91,4 +91,6 @@
 	?HandleNotifyL@MPBAiwNotify@@UAEHHHAAVCAiwGenericParamList@@ABV2@@Z @ 90 NONAME ; int MPBAiwNotify::HandleNotifyL(int, int, class CAiwGenericParamList &, class CAiwGenericParamList const &)
 	?SetItemFinderObserverL@CItemFinder@@QAEXPAVMAknItemFinderObserver@@@Z @ 91 NONAME ; void CItemFinder::SetItemFinderObserverL(class MAknItemFinderObserver *)
 	?EnableSingleClick@CFindItemDialog@@QAEXH@Z @ 92 NONAME ; void CFindItemDialog::EnableSingleClick(int)
+	?SetCallSubMenuVisibility@CFindItemMenu@@QAEXH@Z @ 93 NONAME ; void CFindItemMenu::SetCallSubMenuVisibility(int)
+	?SetCallSubMenuVisibility@CFindItemDialog@@QAEXH@Z @ 94 NONAME ; void CFindItemDialog::SetCallSubMenuVisibility(int)
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/conf/commonui.confml
Binary file commonuis/CommonUi/conf/commonui.confml has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/group/CommonUI.mmp
--- a/commonuis/CommonUi/group/CommonUI.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/group/CommonUI.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -96,31 +96,31 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         eikdlg.lib
-LIBRARY         ServiceHandler.lib
-LIBRARY         cdlengine.lib
+LIBRARY         servicehandler.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         ecom.lib
 LIBRARY         CommonEngine.lib        // For class Stringloader, etc.
 LIBRARY         apgrfx.lib              // For class RApaLsSession, class TApaTask
-LIBRARY         FeatMgr.lib             // For class FeatureManager
+LIBRARY         featmgr.lib             // For class FeatureManager
 #ifdef __SERIES60_MMC
-LIBRARY         CommonDialogs.lib
+LIBRARY         commondialogs.lib
 #endif
 
 // FindUI
 LIBRARY         etext.lib               // For class CPlainText, class TCharFormat
 LIBRARY         form.lib                // For class CTextLayout
 LIBRARY         eikctl.lib              // For class CRichText
-LIBRARY         FavouritesEngine.lib    // For class CFavouritesItem, etc.
+LIBRARY         favouritesengine.lib    // For class CFavouritesItem, etc.
 LIBRARY         sendui.lib              // For class CSendUi, class CMessageData
 #ifndef RD_VIRTUAL_PHONEBOOK
-LIBRARY         PbkView.lib             // For class RPbkViewResourceFile, class CPbkDataSaveAppUi
-LIBRARY         PbkEng.lib              // For class CPbkContactEngine, class CPbkFieldInfo
+LIBRARY         pbkview.lib             // For class RPbkViewResourceFile, class CPbkDataSaveAppUi
+LIBRARY         pbkeng.lib              // For class CPbkContactEngine, class CPbkFieldInfo
 #endif // !RD_VIRTUAL_PHONEBOOK
-LIBRARY         CentralRepository.lib   // For class CRepository
-LIBRARY         CenRepNotifHandler.lib  // For CRepository things
+LIBRARY         centralrepository.lib   // For class CRepository
+LIBRARY         cenrepnotifhandler.lib  // For CRepository things
 #ifdef __VOIP
 #ifndef RD_VOIP_REL_2_2
-LIBRARY         RCSE.lib
+LIBRARY         rcse.lib
 #else // RD_VOIP_REL_2_2
 LIBRARY         serviceprovidersettings.lib
 #endif // !RD_VOIP_REL_2_2
@@ -131,14 +131,14 @@
 LIBRARY         efsrv.lib               // For file handling operations
 LIBRARY         apparc.lib              // For Application lauching
 LIBRARY         apmime.lib              // For mime type handling (class TDataType)
-LIBRARY         SysUtil.lib             // For checking the filesystem space
+LIBRARY         sysutil.lib             // For checking the filesystem space
 LIBRARY         estor.lib               // For class RDesReadStream in GameHandler
-LIBRARY         PlatformEnv.lib         // For finding correct paths for files (class PathInfo)
+LIBRARY         platformenv.lib         // For finding correct paths for files (class PathInfo)
 #ifdef RD_CONTENTNOTIFICATION
 LIBRARY         contentnotification.lib // For notifying Media Gallery about new content.
 #endif
-LIBRARY         SWInstCli.lib           // For Application installer launching
-LIBRARY         CharConv.lib            // For class CCnvCharacterSetConverter
+LIBRARY         swinstcli.lib           // For Application installer launching
+LIBRARY         charconv.lib            // For class CCnvCharacterSetConverter
 #ifdef __DRM
 LIBRARY         DRMCommon.lib
 LIBRARY         DcfRep.lib
@@ -150,7 +150,7 @@
 LIBRARY         aknnotify.lib           // For Global note (class CAknGlobalNote)
 LIBRARY         aknskins.lib            // Skins support
 
-LIBRARY         EGUL.LIB
+LIBRARY         egul.lib
 
 #ifdef __KEEP_DRM_CONTENT_ON_PHONE
 LIBRARY         distributablechecker.lib    // generic API for determining if content is protected
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/inc/DocDefaultHandler.h
--- a/commonuis/CommonUi/inc/DocDefaultHandler.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/inc/DocDefaultHandler.h	Thu Aug 19 10:11:06 2010 +0300
@@ -228,6 +228,16 @@
         *               constant declared in CDocumentHandler.h
         */
         TInt SetSrcFileName( const TDesC& aFileName );
+        
+        /**
+        * Set source file.
+        *
+        * @param aFile Source file handle
+        *
+        * @return       KErrNone if success. If fail, a fail reason
+        *               constant declared in CDocumentHandler.h
+        */
+        TInt SetSrcFile( const RFile& aFile );
 
         /**
         * Set destination file name.
@@ -696,7 +706,14 @@
         * Source filename
         */
         TFileName iSourceFile;
-
+        
+        /**
+        * Source file handle
+        */
+        RFile iFile;
+        
+        TBool iFileHandleSet;
+        
         /**
         * Request status for the latest operation.
         */
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/inc/DocHandlerBase.h
--- a/commonuis/CommonUi/inc/DocHandlerBase.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/inc/DocHandlerBase.h	Thu Aug 19 10:11:06 2010 +0300
@@ -129,6 +129,16 @@
         *                   constant declared in CDocumentHandler.h
         */
         virtual TInt SetSrcFileName( const TDesC& aFileName ) = 0;
+        
+        /**
+        * Set the source file where the content must be fetched.
+        *
+        * @param aFile Source file handle
+        *
+        * @return           KErrNone if success. If fail, a fail reason 
+        *                   constant declared in CDocumentHandler.h
+        */
+        virtual TInt SetSrcFile( const RFile& aFile ) = 0;
 
         /**
         * Set the root path of the memory where the file should be moved.
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/src/DocDefaultHandler.cpp
--- a/commonuis/CommonUi/src/DocDefaultHandler.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/src/DocDefaultHandler.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -106,7 +106,8 @@
         iStatus( KErrNone ),
         iUid( aUid ),
         iOpenService( NULL ),
-        iMMCSaveAllowed ( ETrue )
+        iMMCSaveAllowed ( ETrue ),
+        iFileHandleSet( EFalse )
     {
     }
     
@@ -550,6 +551,13 @@
     return SetAndReturnStatus( KErrNone );
     }
 
+TInt CDocDefaultHandler::SetSrcFile( const RFile& aFile )
+	{
+	TInt err = iFile.Duplicate( aFile );
+	iFileHandleSet = ( err == KErrNone ) ? ETrue : EFalse;
+	return SetAndReturnStatus( KErrNone );
+	}
+
 // ---------------------------------------------------------
 // CDocDefaultHandler::SetDestName()
 // Check the name and set iDestFile.
@@ -1657,43 +1665,49 @@
         TBuf<6> ext;
 
 		CContent* content = NULL;
-        TRAPD(err,content = CContent::NewL( iSourceFile ));
-
-		if(err == KErrNone)
-			{	
-			CleanupStack::PushL(content);
-			content->GetAttribute( ContentAccess::EIsProtected, ret  );
-			if ( ret )
+		if( iFileHandleSet )
+			{
+		    content = CContent::NewL( iFile );
+		    iFile.Close();
+		    iFileHandleSet = EFalse;
+			}
+		else
+			{
+		    content = CContent::NewL( iSourceFile );
+			}
+		
+		CleanupStack::PushL(content);
+		content->GetAttribute( ContentAccess::EIsProtected, ret  );
+		if ( ret )
+			{
+			content->GetAttribute( EFileType, ret );
+            
+			#ifdef _DEBUG             
+			RDebug::Print( _L("DocumentHandler: CDocDefaultHandler::CheckFileNameExtensionL: GetAttribute called, ret =%d"), ret);
+			#endif 
+    
+			if ( ret == EOma1Dcf )
 				{
-				content->GetAttribute( EFileType, ret );
-            
-				#ifdef _DEBUG             
-				RDebug::Print( _L("DocumentHandler: CDocDefaultHandler::CheckFileNameExtensionL: GetAttribute called, ret =%d"), ret);
-				#endif 
-    
-				if ( ret == EOma1Dcf )
+				// change extension to .dcf
+				ext.Copy( KOma1DcfExtension );         
+				ReplaceExtension( aFileName, ext );            
+				CleanupStack::PopAndDestroy();  // content
+				return;            
+				}
+			else if ( ret == EOma2Dcf )
+	            {
+		        // change extension to .odf if not already .o4a, .o4v or .odf
+			    ext.Copy( KOma2DcfExtension );
+				if ( NeedsToReplaceDcf2Extension( aFileName ) )
 					{
-					// change extension to .dcf
-					ext.Copy( KOma1DcfExtension );         
-					ReplaceExtension( aFileName, ext );            
-					CleanupStack::PopAndDestroy();  // content
-					return;            
-					}
-				else if ( ret == EOma2Dcf )
-	                {
-		            // change extension to .odf if not already .o4a, .o4v or .odf
-			        ext.Copy( KOma2DcfExtension );
-				    if ( NeedsToReplaceDcf2Extension( aFileName ) )
-					    {
-						ReplaceExtension( aFileName, ext );
-	                    }
-		            CleanupStack::PopAndDestroy();  // content
-			        return;            
-				    }
+				    ReplaceExtension( aFileName, ext );
+	                }
+		        CleanupStack::PopAndDestroy();  // content
+			    return;            
 				}
-			CleanupStack::PopAndDestroy();  // content
 			}
-        }
+		CleanupStack::PopAndDestroy();  // content
+		}
 
     //if mime type=oma 2 dcf check extension separately
     if ( aDataType.Des8().FindF( KOma2DcfContentType ) != KErrNotFound )
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/src/DocumentHandler.cpp
--- a/commonuis/CommonUi/src/DocumentHandler.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/src/DocumentHandler.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -445,6 +445,7 @@
 	TFileName filenameold;
     aFileOld.FullName( filenameold );
     iHandler->SetSrcFileName( filenameold );
+    iHandler->SetSrcFile( aFileOld );
 
     // If aFileNameNew is not set, use source file name
     if (aFileNameNew.Length() != 0)
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/src/FindItemDialog.cpp
--- a/commonuis/CommonUi/src/FindItemDialog.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/src/FindItemDialog.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -991,10 +991,42 @@
             }
         // Phone number cmds
         case EFindItemCmdCall:
-            { // bit awkward but correct functionality provided.
-            TKeyEvent keyEvent;
-            keyEvent.iCode = EKeyPhoneSend;
-            OfferKeyEventL( keyEvent, EEventKey );
+            {
+            if ( !iHideCallSubMenu )
+                { // bit awkward but correct functionality provided.
+                TKeyEvent keyEvent;
+                keyEvent.iCode = EKeyPhoneSend;
+                OfferKeyEventL( keyEvent, EEventKey );
+                }
+            else
+                {
+                if ( !iDialData )
+                    {
+                    break;
+                    }
+                FormatDialDataL( aCommandId );
+
+                CAiwGenericParamList& paramList =
+                    iServiceHandler->InParamListL();
+
+                if ( iFindItemVoIPExtension->VoIPProfilesExistL() &&
+                    ( iSearchCase ==
+                    CFindItemEngine::EFindItemSearchMailAddressBin ||
+                    iSearchCase == KSearchTelInternetNumber ) )
+                    {
+                    //voip
+                    iDialData->SetCallType( CAiwDialData::EAIWVoiP );
+                    }
+
+                iDialData->FillInParamListL( paramList );
+
+                iServiceHandler->ExecuteServiceCmdL(
+                    KAiwCmdCall,
+                    paramList,
+                    iServiceHandler->OutParamListL(),
+                    0, // No options used.
+                    NULL ); // Dial results are not wanted.
+                }
             break;
             }
         // fix for FAMZ-7JVQ4Y
@@ -1277,7 +1309,7 @@
             }
         else if (
             iSearchCase & CFindItemEngine::EFindItemSearchPhoneNumberBin &&
-            !iHideCallMenu )
+            !iHideCallMenu && !iHideCallSubMenu )
             {
             aMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue );
             aMenuPane->AddMenuItemsL(
@@ -1341,6 +1373,18 @@
         }
     }
 
+
+// -----------------------------------------------------------------------------
+// CFindItemDialog::SetCallSubMenuVisibility
+// Sets AIW submenu visibility
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void CFindItemDialog::SetCallSubMenuVisibility( TBool aVisible )
+    {
+    iHideCallSubMenu = !aVisible;
+    }
+
+
 // -----------------------------------------------------------------------------
 // CFindItemDialog::OfferKeyEventL
 //  Handles key events
diff -r a1caeb42b3a3 -r fcdfafb36fe7 commonuis/CommonUi/src/FindItemMenu.cpp
--- a/commonuis/CommonUi/src/FindItemMenu.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/src/FindItemMenu.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -623,19 +623,17 @@
                     tempBuf);
                 index = EFindItemCmdGoToUrl;
 
-                if ( !iIsContextMenu )
-                    {
-                    // Add bookmark
-                    iCoeEnv->ReadResourceL(
-                        tempBuf, R_FINDITEMMENU_ADD_BOOKMARK );
-                    AddMenuItemL(
-                        *iMenuPane,
-                        EFindItemCmdAddToBookmark,
-                        index,
-                        0,
-                        tempBuf );
-                    index = EFindItemCmdAddToBookmark;
-                    }
+                // Add bookmark
+                iCoeEnv->ReadResourceL(
+                    tempBuf, R_FINDITEMMENU_ADD_BOOKMARK );
+                AddMenuItemL(
+                    *iMenuPane,
+                    EFindItemCmdAddToBookmark,
+                    index,
+                    0,
+                    tempBuf );
+                index = EFindItemCmdAddToBookmark;
+                   
                 }
             else
                 {
@@ -647,18 +645,16 @@
                     tempBuf );
                 index = EFindItemCmdGoToRstp;
 
-                if ( !iIsContextMenu )
-                    {
-                    iCoeEnv->ReadResourceL(
-                        tempBuf, R_FINDITEMMENU_ADD_TO_GALLERY );
-                    AddMenuItemL(
-                        *iMenuPane,
-                        EFindItemCmdAddToGallery,
-                        index,
-                        0,
-                        tempBuf );
-                    index = EFindItemCmdAddToGallery;
-                    }
+                iCoeEnv->ReadResourceL(
+                    tempBuf, R_FINDITEMMENU_ADD_TO_GALLERY );
+                AddMenuItemL(
+                    *iMenuPane,
+                    EFindItemCmdAddToGallery,
+                    index,
+                    0,
+                    tempBuf );
+                index = EFindItemCmdAddToGallery;
+                  
                 }
             break;
             }
@@ -842,8 +838,6 @@
 
      // Add to contacts
      if ( ( itemType != CItemFinder::EUriScheme ) &&
-        !( itemType == CItemFinder::EUrlAddress &&
-        iIsContextMenu ) &&
         ( ( ( ( !iIsSenderKnown &&
         iSenderDescriptor->Length() ) ||
         iCallbackNumber ) &&
@@ -893,7 +887,8 @@
     if ( ( !iHideCallMenu ||
         ( iFindItemVoIPExtension->IsVoIPSupported() &&
         iFindItemVoIPExtension->VoIPProfilesExistL() ) ) &&
-        iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) )
+        iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) &&
+        !iHideCallSubMenu )
         {
         iMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue );
         iMenuPane->AddMenuItemsL(
@@ -902,6 +897,18 @@
         }
     }
 
+
+// -----------------------------------------------------------------------------
+// CFindItemMenu::SetCallSubMenuVisibility
+// Sets AIW submenu visibility
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void CFindItemMenu::SetCallSubMenuVisibility( TBool aVisible )
+    {
+    iHideCallSubMenu = !aVisible;
+    }
+
+
 EXPORT_C void CFindItemMenu::HandleItemFinderCommandL( TInt aCommand )
     {
     switch ( aCommand )
diff -r a1caeb42b3a3 -r fcdfafb36fe7 lafagnosticuifoundation/cone/src/COEMAIN.CPP
--- a/lafagnosticuifoundation/cone/src/COEMAIN.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/lafagnosticuifoundation/cone/src/COEMAIN.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -231,6 +231,9 @@
 	case KErrServerTerminated:
 		return;
 	default:
+#ifdef _DEBUG
+	    RDebug::Print( _L("CCoeEnv's iStatus = %d"), iStatus.Int() );
+#endif
 		Panic(ECoePanicWservBlindCommandFailed);
 		}
 	TWsEvent event;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 lafagnosticuifoundation/cone/src/COEPRIV.CPP
--- a/lafagnosticuifoundation/cone/src/COEPRIV.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/lafagnosticuifoundation/cone/src/COEPRIV.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -66,6 +66,8 @@
 
 void CCoeRedrawer::RunL()
 	{
+    User::LeaveIfError( iStatus.Int() );
+
 	TWsRedrawEvent redraw;
 	iWsSession.GetRedraw(redraw);
 	const TUint handle = redraw.Handle();
@@ -104,3 +106,21 @@
 	{
 	iWsSession.RedrawReadyCancel();
 	}
+
+/**
+  Log the error (debug builds) before panicking.
+  The panic code is consistent with that in CCoeEnv::RunL().
+ */
+TInt CCoeRedrawer::RunError( TInt aError )
+    {
+#ifdef _DEBUG
+    RDebug::Print( _L("CCoeRedrawer's iStatus = %d"), iStatus.Int() );
+#endif
+
+    Panic( ECoePanicWservBlindCommandFailed );
+    aError = KErrNone;
+
+    return aError;
+    }
+
+
diff -r a1caeb42b3a3 -r fcdfafb36fe7 lafagnosticuifoundation/cone/src/coepriv.h
--- a/lafagnosticuifoundation/cone/src/coepriv.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/lafagnosticuifoundation/cone/src/coepriv.h	Thu Aug 19 10:11:06 2010 +0300
@@ -35,11 +35,14 @@
 public:
 	CCoeRedrawer(RWsSession& aWsSession);
 	~CCoeRedrawer();
+
 private:
 	void Queue();
 	// from CActive
 	virtual void RunL();
 	virtual void DoCancel();
+	virtual TInt RunError( TInt aError );
+
 private:
 	RWsSession& iWsSession;
 	TBool iFirstRunL;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/Group/Psln.mmp
--- a/psln/Group/Psln.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/Group/Psln.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -99,13 +99,13 @@
 LIBRARY                 mgfetch.lib
 LIBRARY                 aknskinsrv.lib
 LIBRARY                 aknskins.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 aknnotify.lib
 LIBRARY                 hlplch.lib
-LIBRARY                 drmhelper.lib
+LIBRARY                 DrmHelper.lib
 LIBRARY                 pslnengine.lib
 LIBRARY                 pslnframework.lib
-LIBRARY                 cdlengine.lib
+LIBRARY                 CdlEngine.lib
 LIBRARY                 aknicon.lib
 LIBRARY                 ecom.lib
 LIBRARY                 centralrepository.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/PslnFramework/PslnFramework.mmp
--- a/psln/PslnFramework/PslnFramework.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/PslnFramework/PslnFramework.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 LIBRARY     apparc.lib
 LIBRARY     avkon.lib
 LIBRARY     bafl.lib
-LIBRARY     commonengine.lib           // for RConeResourceLoader
+LIBRARY     CommonEngine.lib           // for RConeResourceLoader
 LIBRARY     cone.lib
 LIBRARY     ecom.lib
 LIBRARY     efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/PslnGSPlugin/group/PslnGSPlugin.mmp
--- a/psln/PslnGSPlugin/group/PslnGSPlugin.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/PslnGSPlugin/group/PslnGSPlugin.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -56,15 +56,15 @@
 LIBRARY             apparc.lib
 LIBRARY             avkon.lib
 LIBRARY             bafl.lib
-LIBRARY             commonengine.lib
+LIBRARY             CommonEngine.lib
 LIBRARY             cone.lib
 LIBRARY             ecom.lib
 LIBRARY             efsrv.lib
 LIBRARY             eikcoctl.lib
 LIBRARY             eikcore.lib
 LIBRARY             euser.lib
-LIBRARY             GSEcomPlugin.lib
-LIBRARY             GSFramework.lib
+LIBRARY             gsecomplugin.lib
+LIBRARY             gsframework.lib
 LIBRARY             ws32.lib
 
 // End of File
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp
--- a/psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -38,9 +38,9 @@
 APP_LAYER_SYSTEMINCLUDE
 
 LIBRARY                 euser.lib
-LIBRARY                 profileengine.lib
-LIBRARY                 profileEng.lib
-LIBRARY                 drmhelper.lib
+LIBRARY                 ProfileEngine.lib
+LIBRARY                 profileeng.lib
+LIBRARY                 DrmHelper.lib
 #ifdef RD_CONTENTNOTIFICATION
 LIBRARY                 contentnotification.lib
 #endif //RD_CONTENTNOTIFICATION
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/Src/PslnScreenSaverContainer.cpp
--- a/psln/Src/PslnScreenSaverContainer.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/Src/PslnScreenSaverContainer.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -123,6 +123,7 @@
             delete itemBuf;
             }
         }
+    iListBox->HandleItemAdditionL();
 
     // Create pre- and post-text icons.
     CPslnFWIconHelper* iconHelper = CPslnFWIconHelper::NewL();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/help/data/xhtml.zip
Binary file psln/help/data/xhtml.zip has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/pslnengine/group/PslnEngine.mmp
--- a/psln/pslnengine/group/PslnEngine.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/pslnengine/group/PslnEngine.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -52,10 +52,10 @@
 LIBRARY                 efsrv.lib
 LIBRARY                 apparc.lib
 LIBRARY                 featmgr.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 centralrepository.lib
 LIBRARY                 aknskinsrv.lib
-LIBRARY                 drmhelper.lib
+LIBRARY                 DrmHelper.lib
 LIBRARY                 platformenv.lib
 LIBRARY                 gfxtrans.lib
 LIBRARY                 caf.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/pslnengine/src/PslnModel.cpp
--- a/psln/pslnengine/src/PslnModel.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/pslnengine/src/PslnModel.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1839,6 +1839,7 @@
             {
             iScreenSaverInfo = CPslnScreenSaverInfo::NewL();
             }
+        iScreenSaverInfo->iFileName->Des().Zero();
         
         //backup current screensaver settings
         error = iScreenSaverRepository->Get(
@@ -1908,7 +1909,7 @@
             previewSsType );
 
         //restore the screen saver settings.
-        if ( previewSsType == KPslnSsObject )
+        if ( iScreenSaverInfo->iFileName->Des().Compare( KNullDesC ) )
             {
             error = iScreenSaverRepository->Set(
                 KScreenSaverPluginName,
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp
--- a/psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,10 +64,10 @@
 LIBRARY                 featmgr.lib
 LIBRARY                 cone.lib
 LIBRARY                 efsrv.lib
-LIBRARY                 commonengine.lib
-LIBRARY                 cdlengine.lib
+LIBRARY                 CommonEngine.lib
+LIBRARY                 CdlEngine.lib
 LIBRARY                 centralrepository.lib
-LIBRARY                 drmhelper.lib
+LIBRARY                 DrmHelper.lib
 LIBRARY                 hlplch.lib
 LIBRARY                 mgfetch.lib
 LIBRARY                 aknskinsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp
--- a/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -121,21 +121,23 @@
                 res = iDRMHelper->CanSetAutomated(
                     aSelectedFiles->MdcaPoint( index ),
                     canBeAutomated );
-                if ( !res && !canBeAutomated )
+                if ( res == KErrNone && !canBeAutomated )
                     {
                     ShowErrorNoteL( R_PSLN_SLIDE_SET_DRM_ERROR );
-                    }
-                else if( res == KErrUnderflow )
-                    {
-                    ShowErrorNoteL( R_PSLN_SLIDE_SET_IMAGE_CORRUPTED );
+                    return EFalse;
                     }
-                else if ( ( res != KErrNone ) || !canBeAutomated )
+                else if ( res != KErrNone )
                     {
-                    if ( iDRMHelper )
+                    if ( res == KErrUnderflow )
                         {
-                        iDRMHelper->HandleErrorL(
-                            res, 
+                        // Do not show error note for corrupted image and let it pass.
+                        canBeAutomated = ETrue;
+                        }
+                    else
+                        {
+                        iDRMHelper->HandleErrorL( res,
                             aSelectedFiles->MdcaPoint( index ) );
+                        return EFalse;
                         }
                     }
                 else
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp
--- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -76,20 +76,20 @@
 LIBRARY         eikcore.lib 
 LIBRARY         eikcoctl.lib 
 LIBRARY         ws32.lib 
-LIBRARY         aknskins.lib 
+LIBRARY         aknskins.lib
 LIBRARY         apfile.lib 
 LIBRARY         apgrfx.lib
 LIBRARY         avkon.lib 
 LIBRARY         aknnotifierwrapper.lib 
-LIBRARY         commonengine.lib 
-LIBRARY         aknicon.lib 
+LIBRARY         CommonEngine.lib
+LIBRARY         aknicon.lib
 LIBRARY         egul.lib 
 LIBRARY         fbscli.lib
 LIBRARY         eiksrvc.lib
 LIBRARY         efsrv.lib
 LIBRARY         bafl.lib
-LIBRARY         cdlengine.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         CdlEngine.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         eikdlg.lib
 LIBRARY         eiksrv.lib
 LIBRARY         ecom.lib
@@ -102,11 +102,11 @@
 LIBRARY         syslangutil.lib
 LIBRARY         centralrepository.lib
 LIBRARY         akntransitionutils.lib
-LIBRARY         widgetregistryclient.lib
-LIBRARY         akndynamicsoftnoteeventmanager.lib
-LIBRARY         ecompluginnotifier.lib
+LIBRARY         WidgetRegistryClient.lib
+LIBRARY         AknDynamicSoftNoteEventManager.lib
+LIBRARY         EComPluginNotifier.lib
 LIBRARY         touchfeedback.lib
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 LIBRARY         aknlistloadertfx.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp
--- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1131,7 +1131,9 @@
     TBool isNumber = EFalse;
     numCategory = (TChar(aChar)).GetBdCategory();
     isNumber = ((numCategory == TChar::EEuropeanNumber) || (numCategory == TChar::EArabicNumber) ||
-               (numCategory == TChar::EEuropeanNumberTerminator) || (aChar == 0x2E) || 
+               (numCategory == TChar::EEuropeanNumberTerminator) || 
+               ( numCategory == TChar::EEuropeanNumberSeparator ) ||
+               (aChar == 0x2E) || 
                (aChar == 0x2A) || (aChar == 0x3D) || (aChar == 0x2F));
     return isNumber;
 }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/AknCapServer/src/aknKeyFilter.cpp
--- a/uifw/AknGlobalUI/AknCapServer/src/aknKeyFilter.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/src/aknKeyFilter.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -330,7 +330,8 @@
                {
                thread.SetProcessPriority(EPriorityForeground);  
                }
-               
+            thread.Close();
+
             // start different fullscreen effect when launching app by KUidApaMessageSwitchOpenFile
             GfxTransEffect::BeginFullScreen(
                 AknTransEffect::EApplicationActivate,
@@ -350,7 +351,8 @@
                {
                thread.SetProcessPriority( EPriorityForeground );  
                }
-                           
+            thread.Close();
+
             // idle will bring itself foreground when getting the message below
             task.SendMessage( KUidApaMessageSwitchOpenFile , KNullDesC8 );
             
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/OldStyleNotif/Inc/AknSystemListPopup.h
--- a/uifw/AknGlobalUI/OldStyleNotif/Inc/AknSystemListPopup.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Inc/AknSystemListPopup.h	Thu Aug 19 10:11:06 2010 +0300
@@ -24,6 +24,7 @@
 #include <eikcmobs.h>
 #include <AknNotifyStd.h>
 #include "AknListQueryNotificationDialog.h"
+#include "AknNotifierControllerPlugin.h"
 
 NONSHARABLE_CLASS(CAknGlobalListQuerySubject): 
     public CBase, 
@@ -31,7 +32,7 @@
     public MAknListQueryNotificationCallback
     {
 public:
-    static CAknGlobalListQuerySubject* NewL();
+    static CAknGlobalListQuerySubject* NewL(MAknKeyLockController* aKeyLockController);
     virtual ~CAknGlobalListQuerySubject();
     
     // From MEikSrvNotifierBase.
@@ -45,9 +46,14 @@
     
     // From MAknListQueryNotificationCallback.
     void QueryDismissedL(TInt aResult);
+    
+    TBool IsKeyLockEnable()
+        {
+        return iKeyLockController->IsKeyLockEnabled();
+        }
 
 private:
-    CAknGlobalListQuerySubject();
+    CAknGlobalListQuerySubject(MAknKeyLockController* aKeyLockController);
     void ConstructL();
 
 private:
@@ -66,6 +72,9 @@
     TBool iAppsKeySuppressed;
     
     CEikonEnv* iStoredEikonEnv;
+    
+    MAknKeyLockController* iKeyLockController;
+    
     };
 
 #endif // __AKNSYSTEMLISTPOPUP_H__
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -19,6 +19,7 @@
 #include "AknListQueryNotificationDialog.h"
 #include "AknNotifyPlugin.hrh"
 #include "avkon.hrh"
+#include "AknSystemListPopup.h"
 
 CAknListQueryNotificationDialog::CAknListQueryNotificationDialog( 
     TInt* aIndex,
@@ -121,7 +122,16 @@
     if (iPointerUpEaten && AknLayoutUtils::PenEnabled() && aButtonId == EAknSoftkeyOk)
         {
         iPointerUpEaten = EFalse;
-        return EFalse;
+        //Fix the problem where the pointer up event is handled to active the power menu item
+        //when lock screen happans before releasing the tap on power menu item
+        if(((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable())
+            {
+            aButtonId = EAknSoftkeyCancel;
+            }
+        else
+            {
+            return EFalse;
+            }
         }
     
     TInt ret = -1;
@@ -140,7 +150,8 @@
 void CAknListQueryNotificationDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
     {
     iPointerUpEaten = EFalse;
-    if (aPointerEvent.iType == TPointerEvent::EButton1Up && !IsFocused())
+    
+    if (aPointerEvent.iType == TPointerEvent::EButton1Up && (!IsFocused() || ((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable()))
         {
         iPointerUpEaten = ETrue;
         }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemListPopup.cpp
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemListPopup.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemListPopup.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -40,17 +40,17 @@
 const TInt KCharsInTInt = 4; // TInt32 takes 4 chars.
 const TInt KArrayGranularity = 3;
 
-CAknGlobalListQuerySubject* CAknGlobalListQuerySubject::NewL()
+CAknGlobalListQuerySubject* CAknGlobalListQuerySubject::NewL(MAknKeyLockController* aKeyLockController)
     {
-    CAknGlobalListQuerySubject* self = new (ELeave) CAknGlobalListQuerySubject(); 
+    CAknGlobalListQuerySubject* self = new (ELeave) CAknGlobalListQuerySubject(aKeyLockController); 
     CleanupStack::PushL(self);
     self->ConstructL(); 
     CleanupStack::Pop(self);
     return self;
     }
 
-CAknGlobalListQuerySubject::CAknGlobalListQuerySubject()
-: iPending(EFalse)
+CAknGlobalListQuerySubject::CAknGlobalListQuerySubject(MAknKeyLockController* aKeyLockController)
+:iPending(EFalse),iKeyLockController(aKeyLockController)
     {
     iStoredEikonEnv = CEikonEnv::Static();
     }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/OldStyleNotif/Src/OldStylePlugin.cpp
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/OldStylePlugin.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/OldStylePlugin.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -146,7 +146,7 @@
     // ----------------------------
     // Global list query.
     // ----------------------------
-    CAknGlobalListQuerySubject* listQuerySubject = CAknGlobalListQuerySubject::NewL();
+    CAknGlobalListQuerySubject* listQuerySubject = CAknGlobalListQuerySubject::NewL(keyLockNotifier);
     
     CleanupStack::PushL(listQuerySubject);
     subjects->AppendL(listQuerySubject);
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp
--- a/uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -69,19 +69,19 @@
 LIBRARY         eikcore.lib
 LIBRARY         eiksrv.lib
 LIBRARY         avkon.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         apgrfx.lib
 LIBRARY         eiksrvui.lib
 LIBRARY         eikctl.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         featmgr.lib
 LIBRARY         aknskins.lib
 LIBRARY         aknnotifyplugin.lib
 LIBRARY         aknnotifierwrapper.lib
 LIBRARY         gdi.lib
 LIBRARY         aknlayout2.lib       
-LIBRARY         aknlayout2scalable.lib
-LIBRARY         aknnotify.lib 
+LIBRARY         AknLayout2Scalable.lib
+LIBRARY         aknnotify.lib
 LIBRARY         mediatorclient.lib
 LIBRARY         apparc.lib
 LIBRARY         centralrepository.lib
@@ -89,7 +89,7 @@
 LIBRARY         fbscli.lib
 LIBRARY         aknicon.lib
 LIBRARY         svgengine.lib
-LIBRARY         akndynamicsoftnoteeventmanager.lib
+LIBRARY         AknDynamicSoftNoteEventManager.lib
 
 LIBRARY         gfxtrans.lib
 LIBRARY         akntransitionutils.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/EABI/AVKONU.DEF
--- a/uifw/AvKon/EABI/AVKONU.DEF	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/EABI/AVKONU.DEF	Thu Aug 19 10:11:06 2010 +0300
@@ -4603,4 +4603,5 @@
 	_ZN26CAknRadioButtonSettingPage15ProcessCommandLEi @ 4602 NONAME
 	_ZThn84_N20CAknPopupSettingPage15ProcessCommandLEi @ 4603 NONAME
 	_ZThn84_N26CAknRadioButtonSettingPage15ProcessCommandLEi @ 4604 NONAME
+	_ZN14CAknSignalPane12ShowUmaIconLEi @ 4605 NONAME
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/EABI/AknNotifyU.DEF
--- a/uifw/AvKon/EABI/AknNotifyU.DEF	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/EABI/AknNotifyU.DEF	Thu Aug 19 10:11:06 2010 +0300
@@ -150,3 +150,5 @@
 	_ZN22CAknGlobalListMsgQueryD2Ev @ 149 NONAME
 	_Z13AknTracePrint11TRefByValueIK7TDesC16Ez @ 150 NONAME
 	_Z13AknTracePrintPKcz @ 151 NONAME
+	_ZN16CAknSignalNotify12SetUmaStateLEi @ 152 NONAME
+
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/akncompamode/group/akncompamode.mmp
--- a/uifw/AvKon/akncompamode/group/akncompamode.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/akncompamode/group/akncompamode.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -69,10 +69,10 @@
 LIBRARY         bafl.lib
 LIBRARY         egul.lib
 LIBRARY         aknskins.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         touchfeedback.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         ecom.lib
 LIBRARY         centralrepository.lib
-LIBRARY         AknLayout2.lib
+LIBRARY         aknlayout2.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/akncompamode/gs/group/akncompags.mmp
--- a/uifw/AvKon/akncompamode/gs/group/akncompags.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/akncompamode/gs/group/akncompags.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,14 +58,14 @@
 LIBRARY   eikcore.lib
 LIBRARY   egul.lib
 LIBRARY   eikdlg.lib            // eikon dialogs
-LIBRARY   CentralRepository.lib
+LIBRARY   centralrepository.lib
 
 LIBRARY   CommonEngine.lib      // For RConeResourceLoader
 LIBRARY   aknskinsrv.lib        // for enhanced skinning
 LIBRARY   aknskins.lib          // for enhanced skinning
 LIBRARY   hlplch.lib            // for "Help" options menu
-LIBRARY   GSFramework.lib       // For base classes
-LIBRARY   GSListBox.lib         // For CGSListBoxItemTextArray
-LIBRARY   GSEcomPlugin.lib
+LIBRARY   gsframework.lib       // For base classes
+LIBRARY   gslistbox.lib         // For CGSListBoxItemTextArray
+LIBRARY   gsecomplugin.lib
 
 // End of File
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/akncompamode/src/akncompakb.cpp
--- a/uifw/AvKon/akncompamode/src/akncompakb.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/akncompamode/src/akncompakb.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -270,11 +270,13 @@
     // disabled whenever screen mode changes to compa-mode by AknCapServer.
     if (iFlags.iInAknCapSrv && iFlags.iEffectsDisa != aDisable)
         {
+        TInt err = KErrNone;
         if (iCompaSrvSession.Handle() == KNullHandle)
             {
-	        User::LeaveIfError( iCompaSrvSession.Connect() );
+	        err = iCompaSrvSession.Connect();
             }
-        if (iCompaSrvSession.Handle() != KNullHandle)
+        
+        if (err == KErrNone && iCompaSrvSession.Handle() != KNullHandle)
             {
             if (aDisable)
                 {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/aknconf/group/aknconf.mmp
--- a/uifw/AvKon/aknconf/group/aknconf.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/aknconf/group/aknconf.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -73,7 +73,7 @@
 LIBRARY		   cone.lib
 LIBRARY		   eikcore.lib
 LIBRARY		   avkon.lib
-LIBRARY		   commonengine.lib
+LIBRARY		   CommonEngine.lib
 LIBRARY		   efsrv.lib 
 LIBRARY		   estor.lib
 LIBRARY        aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/aknhlist/group/aknhlist.mmp
--- a/uifw/AvKon/aknhlist/group/aknhlist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/aknhlist/group/aknhlist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -71,8 +71,8 @@
 LIBRARY                 avkon.lib
 LIBRARY                 eikcoctl.lib
 LIBRARY                 cone.lib
-LIBRARY                 aknlayout2scalable.lib
-LIBRARY                 cdlengine.lib
+LIBRARY                 AknLayout2Scalable.lib
+LIBRARY                 CdlEngine.lib
 LIBRARY                 aknskins.lib
 LIBRARY                 ws32.lib 
 LIBRARY                 egul.lib
@@ -83,7 +83,7 @@
 
 LIBRARY                 aknphysics.lib    
 library                 touchfeedback.lib
-LIBRARY                 AknNotify.lib // akntrace
+LIBRARY                 aknnotify.lib // akntrace
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 LIBRARY         aknlistloadertfx.lib
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp
--- a/uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1054,7 +1054,7 @@
         if ( handler->iTreeListView->SingleClickEnabled() 
              && !handler->iEnableEvents )
             {
-            handler->iTreeListView->EnableHighlight(ETrue);
+            handler->iTreeListView->EnableHighlight( ETrue, ETrue );
             }
         // Pressed down highlight if item still pressed down
         if ( !handler->iFlags.IsSet( EFlagButtonUpReceived )
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/aknphysics/src/aknphysicsengine.cpp
--- a/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -60,7 +60,11 @@
 CAknPhysicsEngine::~CAknPhysicsEngine()
     {
     DeletePhysics();
-    delete iAlfClient;
+    if ( iAlfClient )
+        {
+        iAlfClient->Close();
+        delete iAlfClient;
+        }       
     }
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/animdllinc/AknAnimKeySound.h
--- a/uifw/AvKon/animdllinc/AknAnimKeySound.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/animdllinc/AknAnimKeySound.h	Thu Aug 19 10:11:06 2010 +0300
@@ -131,7 +131,7 @@
     * @param key code to be checked.
     * @return ETrue if blocked.
     */
-    static TBool IsBlockedKeyCode( TInt aScanCode );
+    static TBool IsBlockedKeyCode( TBool aSupportQuerty , TInt aScanCode );
 
     /**
     * Checks if key code is non-blocked.
@@ -201,6 +201,9 @@
     // Extension for window group information.
     MAnimGeneralFunctionsWindowExtension* iExt;      
     
+	//support querty keypad
+    TBool iSupportQuertyKey; 
+    
     // Pointer event handling ongoing, block key events
     TBool iBlockKeyEvents;
     
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/animdllsrc/AknAnimDll.mmp
--- a/uifw/AvKon/animdllsrc/AknAnimDll.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/animdllsrc/AknAnimDll.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -45,7 +45,7 @@
 LIBRARY         euser.lib
 LIBRARY         centralrepository.lib
 LIBRARY         featmgr.lib
-LIBRARY         HWRMLightClient.lib 
+LIBRARY         hwrmlightclient.lib
 LIBRARY         tactileclickplugin.lib
 
 EXPORTUNFROZEN
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/animdllsrc/AknAnimKeySound.cpp
--- a/uifw/AvKon/animdllsrc/AknAnimKeySound.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/animdllsrc/AknAnimKeySound.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -258,6 +258,10 @@
         iPendingEvent = CAknPendingKeyEvent::NewL(iFunctions, iNoPowerKeyScanCode);
         }
 
+    
+    iSupportQuertyKey = 
+               FeatureManager::FeatureSupported( KFeatureIdQwertyInput );
+    
     FeatureManager::UnInitializeLib();
     
     // Get extension for querying and manipulating the window and screen attributes.
@@ -287,8 +291,12 @@
 // CAknAnimKeySound::IsBlockedKeyCode
 // -----------------------------------------------------------------------------
 //
-TBool CAknAnimKeySound::IsBlockedKeyCode( TInt aScanCode )
+TBool CAknAnimKeySound::IsBlockedKeyCode( TBool aSupportQuerty , TInt aScanCode )  
     {
+    if( aSupportQuerty )
+        {
+        return EFalse;
+        }
     for ( TInt ii=0; ii < KBlockedKeyCodeTableSize; ii++ )
         {
         if ( aScanCode == KBlockedKeyCodes[ii] )
@@ -738,7 +746,7 @@
             {
             TInt scan = aRawEvent.ScanCode() & 0xFFFF;
             if ( !NonBlockedKeyCode( scan ) 
-                && iKeyPressed && iEnableKeyBlock && IsBlockedKeyCode( scan ) )
+                && iKeyPressed && iEnableKeyBlock && IsBlockedKeyCode(iSupportQuertyKey, scan ) )
                 {
                 blockEvent = ETrue;
                 }
@@ -764,7 +772,7 @@
             {
             TInt scan = aRawEvent.ScanCode() & 0xFFFF;
             if ( !NonBlockedKeyCode( scan ) && iKeyPressed != scan && 
-                 iEnableKeyBlock && IsBlockedKeyCode( scan ) )
+                 iEnableKeyBlock && IsBlockedKeyCode(iSupportQuertyKey, scan ) )
                 {
                 // If down event is not passed forward, then 
                 // repeat events are not passed either.
@@ -777,7 +785,7 @@
             {
             TInt scan = aRawEvent.ScanCode() & 0xFFFF;
             if ( !NonBlockedKeyCode( scan ) && iKeyPressed != scan && 
-                 iEnableKeyBlock && IsBlockedKeyCode( scan ) )
+                 iEnableKeyBlock && IsBlockedKeyCode(iSupportQuertyKey, scan ) )
                 {
                 // Do not need to block key-up events - there's not a problem 
                 // if there's an unexpected key-up events delivery to an app
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/bwins/AKNNOTIFYU.DEF
--- a/uifw/AvKon/bwins/AKNNOTIFYU.DEF	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/bwins/AKNNOTIFYU.DEF	Thu Aug 19 10:11:06 2010 +0300
@@ -124,3 +124,5 @@
 	?ShowListMsgQueryL@CAknGlobalListMsgQuery@@QAEXPBVMDesC16Array@@AAVTRequestStatus@@ABVTDesC16@@2HHHH2HHW4TTone@CAknQueryDialog@@@Z @ 123 NONAME ; void CAknGlobalListMsgQuery::ShowListMsgQueryL(class MDesC16Array const *, class TRequestStatus &, class TDesC16 const &, class TDesC16 const &, int, int, int, int, class TDesC16 const &, int, int, enum CAknQueryDialog::TTone)
 	?AknTracePrint@@YAXPBDZZ @ 124 NONAME ; void AknTracePrint(const char* aFmt, ...)
 	?AknTracePrint@@YAXV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 125 NONAME ; void AknTracePrint(TRefByValue<const TDesC16> aFmt, ...)
+	?SetUmaStateL@CAknSignalNotify@@QAEXH@Z @ 126 NONAME ; void CAknSignalNotify::SetUmaStateL(int)
+
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/bwins/AVKONU.def
--- a/uifw/AvKon/bwins/AVKONU.def	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/bwins/AVKONU.def	Thu Aug 19 10:11:06 2010 +0300
@@ -3469,4 +3469,5 @@
 	?IsSmiley@CAknSmileyManager@@QBEHVTChar@@@Z @ 3468 NONAME ; int CAknSmileyManager::IsSmiley(class TChar) const
 	?ProcessCommandL@CAknRadioButtonSettingPage@@MAEXH@Z @ 3469 NONAME ; void CAknRadioButtonSettingPage::ProcessCommandL(int)
 	?ProcessCommandL@CAknPopupSettingPage@@MAEXH@Z @ 3470 NONAME ; void CAknPopupSettingPage::ProcessCommandL(int)
+	?ShowUmaIconL@CAknSignalPane@@QAEXH@Z @ 3471 NONAME ; void CAknSignalPane::ShowUmaIconL(int)
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/conf/s60/avkon_101F876E.crml
Binary file uifw/AvKon/conf/s60/avkon_101F876E.crml has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/group/Iconlist.txt
--- a/uifw/AvKon/group/Iconlist.txt	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/group/Iconlist.txt	Thu Aug 19 10:11:06 2010 +0300
@@ -838,3 +838,10 @@
 /1,8 qgn_stat_hdmi_connect.svg
 
 /1,8 qgn_stat_joint_im_uni.svg
+
+/c8,8 qgn_indi_signal_uma_attach.svg
+/c8,8 qgn_indi_signal_uma_context.svg
+/c8,8 qgn_indi_signal_uma_icon.svg
+/c8,8 qgn_indi_signal_uma_multipdp.svg
+/c8,8 qgn_indi_signal_uma_noservice.svg
+/c8,8 qgn_indi_signal_uma_suspended.svg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/group/avkon.mmp
--- a/uifw/AvKon/group/avkon.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/group/avkon.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -286,10 +286,10 @@
 SOURCE          akncombinedpane.cpp
 
 LIBRARY         FontProvider.lib
-LIBRARY         FontUtils.lib
+LIBRARY         fontutils.lib
 
-LIBRARY         EUSER.LIB
-LIBRARY         EIKCORE.LIB
+LIBRARY         euser.lib
+LIBRARY         eikcore.lib
 LIBRARY         cone.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikctl.lib
@@ -297,12 +297,12 @@
 LIBRARY         bafl.lib
 LIBRARY         gdi.lib
 LIBRARY         fbscli.lib
-LIBRARY         APGRFX.LIB
+LIBRARY         apgrfx.lib
 LIBRARY         ws32.lib
 LIBRARY         eikdlg.lib
 LIBRARY         bitgdi.lib
 LIBRARY         etext.lib
-LIBRARY         BMPANIM.LIB
+LIBRARY         bmpanim.lib
 LIBRARY         fepbase.lib
 LIBRARY         form.lib
 LIBRARY         estor.lib
@@ -310,28 +310,28 @@
 LIBRARY         phoneclient.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib // Global Note
-LIBRARY         INSOCK.LIB // For IP address copying in CAknIpFieldSettingPage
+LIBRARY         insock.lib // For IP address copying in CAknIpFieldSettingPage
 LIBRARY         efsrv.lib
 LIBRARY         eiksrvc.lib
-LIBRARY         AknSkins.lib // Skins support
+LIBRARY         aknskins.lib // Skins support
 LIBRARY         linebreak.lib
-LIBRARY         FeatMgr.lib
-LIBRARY         NumberConversion.lib
-LIBRARY         findutil.lib
+LIBRARY         featmgr.lib
+LIBRARY         numberconversion.lib
+LIBRARY         FindUtil.lib
 LIBRARY         aknpictograph.lib
 LIBRARY         CdlEngine.lib
-LIBRARY         AknIcon.lib
-LIBRARY         ECom.lib
+LIBRARY         aknicon.lib
+LIBRARY         ecom.lib
 LIBRARY         oommonitor.lib
 LIBRARY         akncapserverclient.lib
-LIBRARY         Apmime.lib
+LIBRARY         apmime.lib
 LIBRARY         servicehandler.lib
 LIBRARY         numbergrouping.lib
-LIBRARY         AknLayout2.lib
+LIBRARY         aknlayout2.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         centralrepository.lib
 LIBRARY         cenrepnotifhandler.lib
-LIBRARY         PtiEngine.lib
+LIBRARY         ptiengine.lib
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 LIBRARY         aknlistloadertfx.lib
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
@@ -344,7 +344,7 @@
 LIBRARY         tacticon.lib
 LIBRARY         viewcli.lib
 LIBRARY         aknphysics.lib
-LIBRARY         HWRMLightClient.lib
+LIBRARY         hwrmlightclient.lib
 LIBRARY         aiwdialdata.lib
 
 DEFFILE AVKON.def
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/group/bld.inf
--- a/uifw/AvKon/group/bld.inf	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/group/bld.inf	Thu Aug 19 10:11:06 2010 +0300
@@ -64,18 +64,24 @@
 ../srcdata/AvkonSystemSounds/battery_low.wav		/epoc32/data/z/resource/avkonsystemsounds/battery_low.wav
 ../srcdata/AvkonSystemSounds/default_beep.wav		/epoc32/data/z/resource/avkonsystemsounds/default_beep.wav
 ../srcdata/AvkonSystemSounds/battery_dead.wav		/epoc32/data/z/resource/avkonsystemsounds/battery_dead.wav
+../srcdata/AvkonSystemSounds/confirmation.wav		/epoc32/data/z/resource/avkonsystemsounds/confirmation.wav
+../srcdata/AvkonSystemSounds/warning.wav		/epoc32/data/z/resource/avkonsystemsounds/warning.wav
 
 ../srcdata/AvkonSystemSounds/volume_min.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/volume_min.wav
 ../srcdata/AvkonSystemSounds/volume_max.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/volume_max.wav
 ../srcdata/AvkonSystemSounds/battery_low.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/battery_low.wav
 ../srcdata/AvkonSystemSounds/default_beep.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/default_beep.wav
 ../srcdata/AvkonSystemSounds/battery_dead.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/battery_dead.wav
+../srcdata/AvkonSystemSounds/confirmation.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/confirmation.wav
+../srcdata/AvkonSystemSounds/warning.wav		/epoc32/release/winscw/udeb/z/resource/avkonsystemsounds/warning.wav
 
 ../srcdata/AvkonSystemSounds/volume_min.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/volume_min.wav
 ../srcdata/AvkonSystemSounds/volume_max.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/volume_max.wav
 ../srcdata/AvkonSystemSounds/battery_low.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/battery_low.wav
 ../srcdata/AvkonSystemSounds/default_beep.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/default_beep.wav
 ../srcdata/AvkonSystemSounds/battery_dead.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/battery_dead.wav
+../srcdata/AvkonSystemSounds/confirmation.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/confirmation.wav
+../srcdata/AvkonSystemSounds/warning.wav		/epoc32/release/winscw/urel/z/resource/avkonsystemsounds/warning.wav
 
 
 PRJ_MMPFILES
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/group/smiley.mif
Binary file uifw/AvKon/group/smiley.mif has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/inc/AknSmileyModel.h
--- a/uifw/AvKon/inc/AknSmileyModel.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/inc/AknSmileyModel.h	Thu Aug 19 10:11:06 2010 +0300
@@ -177,8 +177,15 @@
 
     TChar SmileyCode(TInt aIndex, TInt aVariant=0) const;
     TChar SmileyCode(const CAknSmileyIcon* aSmileyIcon) const;
+
     void LoadStillImagesL(const TDesC& aText);
+    void PlayAnimationL(const TDesC& aText, TInt aRepeat=0, TInt aDelay=0);
+    void StopAnimation(const TDesC& aText);
+    
+private:
     void LoadStillImageL(TChar aChar);
+    void PlayAnimationL(TChar aChar, TInt aRepeat=0, TInt aDelay=0);
+    void StopAnimation(TChar aChar);
 
 private:
     const TDesC& Text(TInt aIndex, TInt aVariant=0) const;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/inc/AknTabGrpGraphics.h
--- a/uifw/AvKon/inc/AknTabGrpGraphics.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/inc/AknTabGrpGraphics.h	Thu Aug 19 10:11:06 2010 +0300
@@ -115,21 +115,6 @@
     */
     void SetTabGroupBackgroundParent( TRect aParent );
 
-#if 0 // not used
-    /**
-    * This method draws the tab background bitmap using SVG graphics.
-    * The tab combination is given as bitmap id which refers to old style
-    * tab bitmaps.
-    *
-    * @param  aAvkonBitmapId  Bitmap index (@see avkon.mbg).
-    *
-    * @return  Struct which contains both the bitmap and the mask.
-    *          Ownership is transferred to the caller.
-    */
-    CAknTabGroupGraphics::SAknTabGroupBackground CreateTabGroupBackgroundL(
-        TInt aAvkonBitmapId );
-        
-#endif
     /**
     * Draw modes of the tab background graphics.
     */ 
@@ -187,7 +172,7 @@
     * @param  aTabsHidden      Specifies where hidden tabs are drawn.
     * @param  aAnimation       Specifies the used animation.
     */
-    void DrawTabGroupBackgroundL(
+    void DrawTabGroupBackground(
         TTabDrawMode aTabDrawMode,
         TBool aLongTabs,
         TInt aNumberOfTabs,
@@ -195,7 +180,8 @@
         CBitmapContext* aGc,
         SAknTabGroupBackgroundLayout& aLayout,
         TTabsHidden aTabsHidden,
-        TTabAnimationType aAnimation = ENoAnimation ) const;
+        TTabAnimationType aAnimation = ENoAnimation,
+        TInt aHighlightTab = 0 ) const;
 
     /**
     * Draws narrow tab background from given parameters.
@@ -213,7 +199,7 @@
     *                          @c EFalse, then the layout is calculated
     *                          to the @c aLayout. 
     */
-    void DrawTabGroupNarrowBackgroundL(
+    void DrawTabGroupNarrowBackground(
         TTabDrawMode aTabDrawMode,
         TBool aLongTabs,
         TInt aNumberOfTabs,
@@ -337,70 +323,6 @@
     CAknTabGroupGraphics::SAknTabGroupBackgroundLayout
         ThreeLongTabNarrowBackground( TInt aActiveTab ) const;
 
-    /**
-    * Methods to draw normal tab backgrounds.
-    */
-    void DrawTwoTabBackground( TTabDrawMode aDrawMode,
-                               TInt aActiveTab,
-                               CBitmapContext* aGc,
-                               SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawThreeTabBackground( TTabDrawMode aDrawMode,
-                                 TInt aActiveTab,
-                                 CBitmapContext* aGc,
-                                 SAknTabGroupBackgroundLayout& aLayout,
-                                 TTabsHidden aTabsHidden,
-                                 TTabAnimationType aAnimation = ENoAnimation ) const;
-
-    void DrawFourTabBackground( TTabDrawMode aDrawMode,
-                                TInt aActiveTab,
-                                CBitmapContext* aGc,
-                                SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawTwoLongTabBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawThreeLongTabBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    /**
-    * Methods to draw narrow tab backgrounds.
-    */
-    void DrawTwoTabNarrowBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawThreeTabNarrowBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawFourTabNarrowBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawTwoLongTabNarrowBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
-
-    void DrawThreeLongTabNarrowBackground(
-        TTabDrawMode aDrawMode,
-        TInt aActiveTab,
-        CBitmapContext* aGc,
-        SAknTabGroupBackgroundLayout& aLayout ) const;
 
     /**
     * Draws single tab graphics for an active tab.
@@ -435,6 +357,21 @@
                          TBool aFaded = EFalse ) const;
     
     /**
+     * Draws single tab graphics for a Highlight tab.
+     * 
+     * @param  aDrawMode  Mode with which the background is drawn.
+     * @param  aLeft      Rectangle of the left part of the tab.
+     * @param  aMiddle    Rectangle of the middle part of the tab.
+     * @param  aRight     Rectangle of the right part of the tab.
+     * @param  aGc        Graphics context used in drawing.
+     */
+    void DrawHighlightTabL( TTabDrawMode aDrawMode,
+                            TRect aLeft,
+                            TRect aMiddle,
+                            TRect aRight,
+                            CBitmapContext* aGc ) const;
+    
+    /**
     * Draws single tab part graphics for a passive tab.
     * Used in drawing the hidden tab bits.
     * 
@@ -458,6 +395,73 @@
     * Helper method to get the narrow tab container rect.
     */
     TRect NarrowParentRect() const;
+    
+    /**
+    * Sets the layout for tab background according to specified parameters. 
+    * Used in DrawTabGroupBackground/DrawTabGroupNarrowBackground
+    * 
+    * @param  aLayout[in,out]  Tab group background layout used in drawing.
+    *                          If the @c aLayout's @c iUse parameter is
+    *                          @c EFalse, then the layout is calculated
+    *                          to the @c aLayout. 
+    * @param  aNumberOfTabs    Number of tabs visible in the tab group (not
+    *                          the total number of tabs in the tab group).
+    * @param  aLongTabs        Active tab number in relation to the first tab
+    *                          shown. This value can be from one to
+    *                          @c aNumberOfTabs.
+    * @param  aLongTabs        Specifies whether or not long tabs are used.
+    * @param  aIsNarrow        Specifies whether or not narrow tabs are used.
+    * @param  aAnimation       Specifies the used animation.
+    */
+    void CAknTabGroupGraphics::ReviseLayoutForTabBackground(
+            SAknTabGroupBackgroundLayout& aLayout,
+            TInt aNumberOfTabs,
+            TBool aLongTabs,
+            TInt aActiveTab,
+            TBool aIsNarrow,
+            TTabAnimationType aAnimation
+            ) const;
+    
+    /**
+    * Sets active tab flag for the layout. 
+    * Used in DrawTabGroupBackground/DrawTabGroupNarrowBackground
+    * 
+    * @param  aLayout[in,out]  Tab group background layout used in drawing.
+    *                          If the @c aLayout's @c iUse parameter is
+    *                          @c EFalse, then the layout is calculated
+    *                          to the @c aLayout. 
+    * @param  aActiveTab       Active tab number in relation to the first tab
+    *                          shown. This value can be from one to
+    *                          @c aNumberOfTabs.
+    */
+    void ReviseLayoutUseFlag(
+            SAknTabGroupBackgroundLayout& aLayout,
+            TInt aActiveTab
+            ) const;
+    
+    /**
+    * Processes the instructions and draw the tab background according to instructions.
+    * Instructions are created according to drawing sequence.
+    * Used in DrawTabGroupBackground/DrawTabGroupNarrowBackground
+    * 
+    * @param aInstructions      The instructions for drawing tabs.
+    * @param aNumOfIns          The number of instructions.
+    * @param aTabDrawMode       Mode with which the background is drawn.
+    * @param aLayout[in,out]    Tab group background layout used in drawing.
+    *                           If the @c aLayout's @c iUse parameter is
+    *                           @c EFalse, then the layout is calculated
+    *                           to the @c aLayout.       
+    * @param  aGc               Graphics context used in drawing the background.
+    * 
+    */
+    void ProcessDrawTabInstructions(
+            struct TTabInstruction *aInstructions,
+            TInt aNumOfIns,
+            TTabDrawMode aTabDrawMode,
+            SAknTabGroupBackgroundLayout& aLayout,
+            CBitmapContext* aGc
+            ) const;
+    
 
 private: // Member data.
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp
--- a/uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -48,7 +48,7 @@
 
 LIBRARY         centralrepository.lib
 LIBRARY         aknnotify.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         platformenv.lib // PathInfo
 LIBRARY         efsrv.lib // TDriveUnit
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/notifsrc/AknSignalNotify.cpp
--- a/uifw/AvKon/notifsrc/AknSignalNotify.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/notifsrc/AknSignalNotify.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -215,4 +215,17 @@
     StartOrUpdateL( pckg, resp );
     }
 
+// ---------------------------------------------------------------------------
+// CAknSignalNotify::SetUmaStateL
+// Sets an UMA icon to the signal pane.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CAknSignalNotify::SetUmaStateL(TInt aUmaState)
+    {
+    if (( aUmaState >= EAknSignalUmaIndicatorOff ) && 
+        ( aUmaState <= EAknSignalUmaIndicatorMultipdp ))
+        {
+        SetStateL( aUmaState );
+        }
+    }
 // End of File
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/rom/avkon.iby
--- a/uifw/AvKon/rom/avkon.iby	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/rom/avkon.iby	Thu Aug 19 10:11:06 2010 +0300
@@ -47,6 +47,8 @@
 data=ZRESOURCE\avkonsystemsounds\default_beep.wav RESOURCE_FILES_DIR\avkonsystemsounds\default_beep.wav
 data=ZRESOURCE\avkonsystemsounds\battery_dead.wav RESOURCE_FILES_DIR\avkonsystemsounds\battery_dead.wav
 data=ZRESOURCE\avkonsystemsounds\battery_low.wav  RESOURCE_FILES_DIR\avkonsystemsounds\battery_low.wav
+data=ZRESOURCE\avkonsystemsounds\confirmation.wav  RESOURCE_FILES_DIR\avkonsystemsounds\confirmation.wav
+data=ZRESOURCE\avkonsystemsounds\warning.wav  RESOURCE_FILES_DIR\avkonsystemsounds\warning.wav
 
 
 #include "aknglobalui.iby"
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknAdaptiveSearchGrid.cpp
--- a/uifw/AvKon/src/AknAdaptiveSearchGrid.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknAdaptiveSearchGrid.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1241,7 +1241,12 @@
             }
         }
     _AKNTRACE_FUNC_EXIT;
-    }       
+    }     
+
+static CAknButton* GetButtonHelper( RPointerArray<CAknButton> &aButtonArray, TInt aIndex )
+    {
+    return ( aIndex < aButtonArray.Count() && aIndex >= 0 ) ? aButtonArray[aIndex] : NULL;
+    }
 
 // -----------------------------------------------------------------------------
 // CAknAdaptiveSearchGrid::UpdateVisibleButtonsL()
@@ -1274,8 +1279,11 @@
         CAknButton* tmpButton = NULL;    
         for( TInt i = 0; i < iButtonArray.Count(); i++ )
             {
-            tmpButton = static_cast<CAknButton*>( iButtonArray[i] );            
-            tmpButton->MakeVisible( EFalse );
+            tmpButton = GetButtonHelper( iButtonArray, i );
+            if ( NULL != tmpButton )
+                {
+                tmpButton->MakeVisible( EFalse );
+                }
             }
                 
         TInt tempTotalGridButtons = iTotalGridButtons - KCloseAndClearButtonCount;               
@@ -1283,7 +1291,12 @@
             {       
             for ( TInt i = 0; i < tempTotalGridButtons; i++ )
                 {
-                button = static_cast<CAknButton*>( iButtonArray[tempTotalGridButtons-i-1] );
+                button = GetButtonHelper( iButtonArray, tempTotalGridButtons-i-1 );
+                if ( NULL == button )
+                    {
+                    continue;
+                    }
+                
                 TInt charPosition = numOfChars-i-1-shift_Ind;
                 if ( charPosition >= 0 ) 
                     {
@@ -1299,7 +1312,7 @@
                         button->SetIconSize( iButtonIconSize );                                      
                         }
                     else
-                        {
+                        { 
                         if( bState->Icon() )
                             {
                             bState->SetIcon( NULL );          
@@ -1356,8 +1369,13 @@
                 TInt offset = tempTotalGridButtons - charsOnLastPage;   
                 
                 for ( TInt i = tempTotalGridButtons-1 ; i >= 0 ; --i )
-                    {
-                    button = static_cast<CAknButton*>(iButtonArray[i+shift_Ind]);
+                    {                  
+                    button = GetButtonHelper( iButtonArray, i+shift_Ind );
+                    if ( NULL == button )
+                        {
+                        continue;
+                        }
+                
                     if( i < offset )
                         {
                         button->MakeVisible( EFalse );                  
@@ -1414,8 +1432,13 @@
                 for ( TInt i = 0; i < numOfChars; i++ )
                     {
                     if ( ( i >= start) && (i < end) )
-                        {   
-                        button = static_cast<CAknButton*>(iButtonArray[i-start-shift_Ind]);
+                        {                      
+                        button = GetButtonHelper( iButtonArray, i-start-shift_Ind );
+                        if ( NULL == button )
+                            {
+                            continue;
+                            }
+                    
                         bState = button->State();               
                         if( ptr.Mid(i, 1) == KSpaceCharacter )
                             {  
@@ -1468,8 +1491,12 @@
                         }
                     for ( TInt i = tempTotalGridButtons; i < tempTotalGridButtons+iNumOfCols; i++ )
                         {
-                        button = static_cast<CAknButton*>(iButtonArray[i]);
-                        button->MakeVisible( EFalse );  
+                        button = GetButtonHelper( iButtonArray, i );
+                        if ( NULL != button )
+                            {
+                            button->MakeVisible( EFalse );  
+                            }
+                        
                         }           
                 }               
             }        
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknAppUi.cpp
--- a/uifw/AvKon/src/AknAppUi.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknAppUi.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -77,6 +77,7 @@
 #include <PtiKeyMappings.h> 
 
 #include <akntoolbar.h>
+#include <akntoolbarextension.h>
 #include <eikdialg.h>
 
 #ifdef RD_SCALABLE_UI_V2
@@ -1815,12 +1816,18 @@
 
 EXPORT_C void CAknAppUi::PrepareToExit()
     {
-    // Hide application toolbar to prevent it from showing 
-    // after views are deleted    
+    //
+    // Hide application toolbar extension view (by toolbar extension)
+    //
     if ( CurrentFixedToolbar() )
         {
-        CurrentFixedToolbar()->SetToolbarVisibility( EFalse );   
+        CAknToolbarExtension* toolbarExt = CurrentFixedToolbar()->ToolbarExtension();
+        if ( toolbarExt && toolbarExt->IsShown() )
+            {
+            toolbarExt->SetShown( EFalse );
+            }
         }
+
     if( IsForeground() && Document() )
         {
         //only if focused, otherwise next app HandleForeground may never come.
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknBitmapAnimation.cpp
--- a/uifw/AvKon/src/AknBitmapAnimation.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknBitmapAnimation.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -557,7 +557,7 @@
 LOCAL_C TInt WaitForUiEffect(TAny* aArg)
 	{
 	CAknBitmapAnimation* self = (CAknBitmapAnimation*)aArg;
-	self->StartAnimationL();
+	TRAP_IGNORE(self->StartAnimationL());
 	return EFalse;
 	}
 #endif
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknCharMap.cpp
--- a/uifw/AvKon/src/AknCharMap.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknCharMap.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -396,7 +396,9 @@
         void SwitchEmotionVisibilityL();
         TBool NeedEmotionSwitchIcon() const;
         HBufC* ReadEmotionHBufCL();
-        void LoadEmotionTumbnails(const TDesC& aChars);
+        void LoadEmotionTumbnails(const TDesC& aText);
+        void PlayAnimationL(const TDesC& aText);
+        void StopAnimation(const TDesC& aText);
         void SetEmotionSize(const TSize& aSize);
         TBool IsEmotionChar(TChar aChar);
         TChar SwitchToSctChar();
@@ -438,6 +440,9 @@
         // Indicates whether menu sct is highlighted or not.
         TBool iMenuSctHighlighted;
         
+        // flag for focus status of char map dialog
+        TBool iCharMapFocusGained;
+        
     public: // for Emotion
         HBufC* iCharsSmiley;
         CSmileyModel* iSmileyModel;
@@ -1071,8 +1076,8 @@
         // start complex dynamic logic to locate title rect when emotion is unable
         TInt orientation = mirrored ? -1 : 1;
         TInt newLeft = titleRect.iTl.iX + orientation*rect.Width()/2;
-        TPoint titleTL( newLeft, titleRect.iTl.iY );
-        titleRect.SetRect( titleTL, titleRect.Size() );
+        TPoint titlePoint( newLeft, titleRect.iTl.iY );
+        titleRect.SetRect( titlePoint, titleRect.Size() );
         }
     AknLayoutUtils::LayoutLabel(iTitle, titleRect, textlayout.LayoutLine());
 
@@ -1496,11 +1501,24 @@
     return charsSmiley;
     }
 
-void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aChars)
+void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aText)
     {
     //If emotion tumbbails can't be load, 
     // no emotion tumbnail will be dispalyed.
-    TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aChars) );
+    TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aText) );
+    }
+
+const TInt KAnimationRepeat = 30;
+const TInt KAnimationDelay = 150*1000;
+
+void CAknCharMapExtension::PlayAnimationL(const TDesC& aText)
+    {
+    iSmileyModel->PlayAnimationL(aText, KAnimationRepeat, KAnimationDelay);
+    }
+
+void CAknCharMapExtension::StopAnimation(const TDesC& aText)
+    {
+    iSmileyModel->StopAnimation(aText);
     }
 
 void CAknCharMapExtension::SetEmotionSize(const TSize& aSize)
@@ -2100,10 +2118,6 @@
         iShowCasesRef = &iSpecialCharCases;
         iShowPagesRef = &iSpecialCharPages;
         
-        // default
-        iSpecialCharCase = EAknSCTLowerCase;
-        iChars = iCharsBufferLower;
-        
         if(iExtension->iCharsSmiley && iExtension->IsShowingEmotion())
             {
             iChars = iExtension->iCharsSmiley;
@@ -2128,6 +2142,11 @@
             {
             iChars = iExtension->iCharsQwerty;
             }
+        else
+            {
+            iSpecialCharCase = EAknSCTLowerCase;
+            iChars = iCharsBufferLower;
+            }
         }
 
     // calculate page count for all pages
@@ -2173,9 +2192,7 @@
         UpdateScrollIndicatorL();
         }
     
-    iExtension->LoadEmotionTumbnails(*iChars);
-    
-    SetSmileyAnimationActivityInCurrentPageL(ETrue);
+    Extension()->LoadEmotionTumbnails(*iChars);
     
     }
 
@@ -2364,7 +2381,14 @@
             {
             iExtension->iKeyBrdEvent = ETrue;
             iExtension->iHighlightVisible = ETrue;
-            iCursorPos = TPoint( 0, 0 );
+            if ( LengthOfRecentChar() == 0 && CurrentPage() == 1 )
+            	{
+                iCursorPos = TPoint( 0, 1 );
+            	}
+            else
+            	{
+                iCursorPos = TPoint( 0, 0 );
+            	}
             DrawCursor();
             return EKeyWasConsumed;
             }
@@ -2764,8 +2788,6 @@
         // Sets the character case because the buffer content may have changed.
         SetCharacterCaseL(iSpecialCharCase);
         
-        SetSmileyAnimationActivityInCurrentPageL(ETrue);
-        
         TInt cursorIndexAfterSwitch;
         if ( !iExtension->iKeyBrdEvent )
             {
@@ -2789,6 +2811,8 @@
         // the new first row is the top row on the page where the new focus is.
         TInt pageVolume = iMaxColumns * iExtension->iMaxVisibleRows;
         iFirstVisibleRow = (cursorIndexAfterSwitch / pageVolume * pageVolume) / iMaxColumns;
+        
+        SetSmileyAnimationActivityInCurrentPageL(ETrue);
 
         // the cursor positions are relative to current page
         TInt cursorIndexAfterSwitchInPage = cursorIndexAfterSwitch - (iMaxColumns * iFirstVisibleRow);
@@ -2863,11 +2887,13 @@
 
     else if(aType == KEikMessageFadeAllWindows) // focus gained // KEikMessageWindowsFadeChange
         {
+        Extension()->iCharMapFocusGained = ETrue;
         SetSmileyAnimationActivityInCurrentPageL(ETrue);
         }
     
     else if(aType == KAknMessageFocusLost) // focus lost
         {
+        Extension()->iCharMapFocusGained = EFalse;
         SetSmileyAnimationActivityInCurrentPageL(EFalse);
         
         if ( iExtension->iHighlightVisible )
@@ -3444,15 +3470,17 @@
 
     TPoint pos = iGridTopLeft;
     TSize size(iGridItemWidth*iMaxColumns+1, iGridItemHeight);
+    
+    // eliminate the overlap area between menu sct and the first menu item.
+    if ( Extension()->iMenuSct )
+        {
+        // provide a dirty fix for Menu SCT, since Layout data is not suitable for this
+        size = TSize( Rect().Width()- 1, iGridItemHeight - 1 );
+        }
     if(iIsMirrored)
         {
         pos.iX += iGridItemWidth - size.iWidth;
         }
-    // eliminate the overlap area between menu sct and the first menu item.
-    if ( Extension()->iMenuSct )
-        {
-        size.iHeight--;
-        }
 
     AknsDrawUtils::Background(skin, cc, this, aGc, TRect(pos,size));
 
@@ -4851,20 +4879,29 @@
         firstCellLayRect.LayoutRect(gridRect,
             AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,0,0));
 
+        TAknLayoutRect rightCellLayRect;
+        rightCellLayRect.LayoutRect(gridRect,
+            AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,1,0));
         TRect firstCellRect;
+
+        // Cell width.
+        iGridItemWidth =
+            rightCellLayRect.Rect().iTl.iX - firstCellLayRect.Rect().iTl.iX;
+        if (iGridItemWidth < 0)
+            {
+            iGridItemWidth = -iGridItemWidth;
+            }
+        
         if ( Extension()->iMenuSct )
             {
             firstCellRect = TRect( TPoint(0, 0),
-                 TSize( firstCellLayRect.Rect().Width(), Rect().Height() ) );
+                 TSize( iGridItemWidth, Rect().Height() ) );
             }
         else
             {
             firstCellRect = firstCellLayRect.Rect();
             }
 
-        TAknLayoutRect rightCellLayRect;
-        rightCellLayRect.LayoutRect(gridRect,
-            AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,1,0));
 
         TInt firstVisibleIndex = iFirstVisibleRow * iMaxColumns;
         // Max columns.
@@ -4874,14 +4911,6 @@
         // Max visible rows.
         iExtension->iMaxVisibleRows = gridRect.Height() / firstCellRect.Height();
 
-        // Cell width.
-        iGridItemWidth =
-            rightCellLayRect.Rect().iTl.iX - firstCellLayRect.Rect().iTl.iX;
-        if (iGridItemWidth < 0)
-            {
-            iGridItemWidth = -iGridItemWidth;
-            }
-
         // Cell height.
         if ( Extension()->iMenuSct )
             {
@@ -5653,6 +5682,11 @@
         {
         resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_CHINESE;
         }
+    else if (FeatureManager::FeatureSupported(KFeatureIdKorean))
+        {
+        // Added korea character support
+        resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_KOREAN;
+        }
 
     CCoeEnv::Static()->CreateResourceReaderLC( reader, resourceId );
     ConstructFromResourceL( reader );
@@ -5853,7 +5887,7 @@
             }
         
         CAknCharMapHistory::THistoryFilter historyFilter;
-        if(iExtension->IsEmotionEnabled())
+        if(Extension()->IsEmotionEnabled())
             {
             historyFilter = CAknCharMapHistory::EHistoryFilterMixed;
             }
@@ -5886,21 +5920,32 @@
                 {
                 iShowCasesRef = &iSpecialCharCases;
                 iShowPagesRef = &iSpecialCharPages;
-                iChars = iCharsBufferLower;
+
                 if (iCharsBufferUpper && iSpecialCharCase==EAknSCTUpperCase)
+                    {
                     iChars = iCharsBufferUpper;
+                    }
                 else if (iCharsBufferNumeric && iSpecialCharCase==EAknSCTNumeric)
+                    {
                     iChars = iCharsBufferNumeric;
+                    }
                 else if (iCharsBufferFull && iSpecialCharCase==EAknSCTFullCase)
+                    {
                     iChars = iCharsBufferFull;
+                    }
                 else if (iCharsBufferHalf && iSpecialCharCase==EAknSCTHalfCase)
+                    {
                     iChars = iCharsBufferHalf;
+                    }
                 else if (iExtension->iCharsQwerty && iSpecialCharCase==EAknSCTQwerty)
+                    {
                     iChars = iExtension->iCharsQwerty;
-
-                if(iChars == iCharsBufferLower)
+                    }
+                else
                     {
+                    // default
                     iSpecialCharCase = EAknSCTLowerCase;
+                    iChars = iCharsBufferLower;
                     }
                 }
             // mark that iChars doesn't point to HBufC
@@ -5957,7 +6002,10 @@
         iExtension->iFlags |= EAknCharMapCharsAllocated; // mark that iChars points to HBufC
         }
     
-    iExtension->LoadEmotionTumbnails(*iChars);
+    Extension()->LoadEmotionTumbnails(*iChars);
+    
+    // control will never get focus event while it is in EditMenu mode
+    Extension()->iCharMapFocusGained = ETrue;
 
     // The "PlayAnimationL" in "SetSmileyAnimationActivityInCurrentPageL"
     // will leave. If we ignore it, just no animation is played.
@@ -6214,9 +6262,15 @@
 
 TBool CAknCharMap::IsJapaneseSctUi() const
     {
+    //Japanese feature for SCT will not be supported since TB9.2 PS2,
+    //so it always return EFalse.
     return EFalse;
     }
 
+TBool CAknCharMap::IsKoreanSctUi() const
+    {
+    return FeatureManager::FeatureSupported( KFeatureIdKorean );
+    }
 // -----------------------------------------------------------------------------
 // CAknCharMap::TitleWithSelectingSpecialChar()
 // Return the title string with the selecting special characters
@@ -6708,37 +6762,22 @@
         }
     }
 
-const TInt KAnimationRepeat = 30;
-const TInt KAnimationDelay = 1000*1000;
-
 void CAknCharMap::SetSmileyAnimationActivityInCurrentPageL(TBool aIsActive)
     {
-    TInt begin = iFirstVisibleRow * iMaxColumns;
-    TInt end = iExtension->iMaxVisibleRows * iMaxColumns + begin;
-    if( end > iChars->Length() ) 
-        {
-        end = iChars->Length();
-        }
-
-    for( TInt i(begin); i<end; i++ )
-        {
-        TChar code = (*iChars)[i];
-        CAknSmileyIcon* icon = iExtension->EmotionIcon(code);
-        if( !icon ) 
-            {
-            continue;
-            }
-
-        if( ( aIsActive ) && 
-           ( Extension()->IsShowingEmotion() || Extension()->iMenuSctHighlighted) 
-           )
-            {
-            icon->PlayAnimationL( KAnimationRepeat, KAnimationDelay );
-            }
-        else
-            {
-            icon->StopAnimation();
-            }
+    TInt pos = iFirstVisibleRow * iMaxColumns;
+    TInt maxLength = iChars->Length() - pos;
+    TInt length = iExtension->iMaxVisibleRows * iMaxColumns;
+    if(length > maxLength) length = maxLength;
+
+    const TPtrC textInCurrentPage = iChars->Mid(pos, length);
+    
+    if(Extension()->iCharMapFocusGained && aIsActive)
+        {
+        Extension()->PlayAnimationL(textInCurrentPage);
+        }
+    else
+        {
+        Extension()->StopAnimation(textInCurrentPage);
         }
     }
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknIncallStatusBubble.cpp
--- a/uifw/AvKon/src/AknIncallStatusBubble.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknIncallStatusBubble.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -938,7 +938,9 @@
         AknLayoutScalable_Apps::call_type_pane( isLandscape ) );
     TRect callTypeIndicationRect( callTypeIndicationLayoutRect.Rect() );
     
-    TBool hideTypeIndication = isLandscape && !AknStatuspaneUtils::HDLayoutActive();
+    TBool hideTypeIndication = isLandscape 
+            && !AknStatuspaneUtils::HDLayoutActive() 
+            && !AknStatuspaneUtils::FlatLayoutActive();
     	
     if ( iFlags & ESBVideo )
         {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknListBoxSettingPage.cpp
--- a/uifw/AvKon/src/AknListBoxSettingPage.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknListBoxSettingPage.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -183,15 +183,17 @@
         {   
         TKeyEvent event;
         event.iCode = EKeyOK;      
+        
         // restore highlight with simulated key event
-        TKeyResponse response = 
-            ListBoxControl()->OfferKeyEventL( event, EEventKey );        
-        
-        if ( response == EKeyWasConsumed )
-            {
-            highLightEnabled = ETrue;
-            }
-        }    
+        TRAP_IGNORE
+		    (
+            TKeyResponse response = ListBoxControl()->OfferKeyEventL( event, EEventKey );
+            if ( response == EKeyWasConsumed )
+                {
+                highLightEnabled = ETrue;
+                }
+            );
+        }
     return highLightEnabled;
     }
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknPhoneNumberEditor.cpp
--- a/uifw/AvKon/src/AknPhoneNumberEditor.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknPhoneNumberEditor.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -375,7 +375,7 @@
         }
     if ( cousorChanged )
     	{
-        ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged );
+        ReportAknEdStateEvent( MAknEdStateObserver::EAknCursorPositionChanged );
     	}
     // see if we want to remember the old cursor X position
     if ( targetPosUsed )
@@ -421,7 +421,7 @@
         }    
     if ( ! IsFocused() )
         {
-        TRAP_IGNORE( ReportAknEdStateEventL( MAknEdStateObserver::EAknSyncEdwinState ) );
+        ReportAknEdStateEvent( MAknEdStateObserver::EAknSyncEdwinState );
         }
     if ( aDrawNow )
         DrawNow();
@@ -500,7 +500,7 @@
     {
     iModel->SetRealCursorPosition(aCursorPos);
     iModel->SetAnchorPosition( aAnchorPos );
-    ReportAknEdStateEventL( 
+    ReportAknEdStateEvent( 
             MAknEdStateObserver::EAknCursorPositionChanged );
     }
 
@@ -510,7 +510,7 @@
     iModel->SetRealCursorPosition( aCursorPos );
     if ( aSelect )
         iModel->SetAnchorPosition( anchor );
-    ReportAknEdStateEventL( 
+    ReportAknEdStateEvent( 
         MAknEdStateObserver::EAknCursorPositionChanged );
     }
 
@@ -644,7 +644,7 @@
     iModel->SetRealCursorPosition( iModel->Uncompensate( aCursorSelection.iCursorPos ) );
     iModel->SetAnchorPosition( iModel->Uncompensate( aCursorSelection.iAnchorPos  ) );
     
-    ReportAknEdStateEventL( 
+    ReportAknEdStateEvent( 
             MAknEdStateObserver::EAknCursorPositionChanged );
     DrawNow();
     }
@@ -1126,6 +1126,19 @@
 //
 EXPORT_C void CAknPhoneNumberEditor::CcpuPasteL()
     {
+    // When we paste the buffer to phone number editor, we must get the buffer from clipboard first 
+    // and then insert buffer to phone number editor. As the main job of CcpuCanPaste() is getting and 
+    // checking the buffer in clipboard, so we must call CcpuCanPaste() first.
+    // If iExtension->iPasteText is not NULL, it means CcpuCanPaste() has been called before and the 
+    // buffer in clipboard is valid. No need to call it once again. 
+    if ( !iExtension->iPasteText )
+        {
+        // If the return value of CcpuCanPaste is EFalse, iExtension->iPasteText must be NULL,
+        // else if the return value of CcpuCanPaste is ETure, iExtension->iPasteText must not be NULL.
+        // So we don't need to check if the return value is ETure or EFalse, 
+        // we will check iExtension->iPasteText instead of that.
+        CcpuCanPaste();
+        }
     if ( iExtension->iPasteText )
         {
         iModel->Paste( iExtension->iPasteText->Des() );
@@ -1253,8 +1266,8 @@
     TUint cap = iExtension->iExtendedInputCapabilities->Capabilities();
     cap &= ~CAknExtendedInputCapabilities::EInputEditorDisableVKB;
     iExtension->iExtendedInputCapabilities->SetCapabilities( cap );
-    TRAP_IGNORE( ReportAknEdStateEventL( 
-    		     MAknEdStateObserver::EAknActivatePenInputRequest ) );
+    ReportAknEdStateEvent( 
+    		     MAknEdStateObserver::EAknActivatePenInputRequest );
     }
 
 // --------------------------------------------------------------------------
@@ -1266,14 +1279,14 @@
     TUint cap = iExtension->iExtendedInputCapabilities->Capabilities();
     cap |= CAknExtendedInputCapabilities::EInputEditorDisableVKB;
     iExtension->iExtendedInputCapabilities->SetCapabilities( cap );
-    ReportAknEdStateEventL( MAknEdStateObserver::EAknClosePenInputRequest );
+    ReportAknEdStateEvent( MAknEdStateObserver::EAknClosePenInputRequest );
     }
 
 // --------------------------------------------------------------------------
 // CAknPhoneNumberEditor::ReportAknEdStateEventL
 // --------------------------------------------------------------------------
 //
-void CAknPhoneNumberEditor::ReportAknEdStateEventL( 
+void CAknPhoneNumberEditor::ReportAknEdStateEvent( 
          MAknEdStateObserver::EAknEdwinStateEvent aStateEvent )
     {
     CAknEdwinState* edwinState = STATIC_CAST( CAknEdwinState*,State(KNullUid) );
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknPopupField.cpp
--- a/uifw/AvKon/src/AknPopupField.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknPopupField.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -932,7 +932,7 @@
                 && iExtension && iExtension->iSingleClickEnabled )
             {
             // Edit mode to view while popup is open -> first cancel popup
-            AttemptExitL( EFalse );
+            TRAP_IGNORE(AttemptExitL( EFalse ));
             }
         else
             {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknPreviewPopUp.cpp
--- a/uifw/AvKon/src/AknPreviewPopUp.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknPreviewPopUp.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -669,12 +669,27 @@
 // -----------------------------------------------------------------------------
 //
 TKeyResponse CAknPreviewPopUp::OfferKeyEventL( const TKeyEvent& /*aKeyEvent*/,
-                                               TEventCode /*aType*/ )
+                                               TEventCode aType )
     {
+    TKeyResponse ret ( EKeyWasNotConsumed );
+
     if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
         {
-        iCloseMenu = ETrue; 
-        iController.HidePopUp();
+        if ( !( iFlags & CAknPreviewPopUpController::EConsumeKeys ) )
+            {
+            iCloseMenu = ETrue;
+            iController.HidePopUp();
+            }
+        else
+            {
+            if ( aType == EEventKey || aType == EEventKeyUp )
+                {
+                iCloseMenu = ETrue;
+                iController.HidePopUp();
+
+                ret = EKeyWasConsumed;
+                }
+            }
         }
 
     if ( CapturesPointer() )
@@ -682,7 +697,7 @@
         SetPointerCapture( EFalse );
         }
 
-    return EKeyWasNotConsumed;
+    return ret;
     }
     
 // -----------------------------------------------------------------------------
@@ -852,9 +867,9 @@
 // CAknPreviewPopUp::CleanLocalRef
 // -----------------------------------------------------------------------------
 //
-void CAknPreviewPopUp::CleanLocalRef( TAny* any )
+void CAknPreviewPopUp::CleanLocalRef( TAny* aParam )
     {
-    static_cast<CAknPreviewPopUp*>( any )->iIsDeleted = NULL;
+    static_cast<CAknPreviewPopUp*>( aParam )->iIsDeleted = NULL;
     }
 
 //  End of File  
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknProgressDialog.cpp
--- a/uifw/AvKon/src/AknProgressDialog.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknProgressDialog.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -77,7 +77,7 @@
 	key.iCode=EKeyEscape;
 	key.iModifiers=0;
 	key.iScanCode = EStdKeyNull;
-	iAknProgressDialog->OfferKeyEventL(key, EEventKey);
+	TRAP_IGNORE(iAknProgressDialog->OfferKeyEventL(key, EEventKey));
 	}
 	
 CAknProgressDialog::CCancelWhileHidden::CCancelWhileHidden(CAknProgressDialog* aAknProgressDialog)
@@ -226,7 +226,7 @@
             MakeVisible(ETrue);
    			CCoeControl* cba = ButtonGroupContainer().ButtonGroup()->AsControl();
 			iEikonEnv->RemoveFromStack(cba);
-			__ASSERT_DEBUG_NO_LEAVE(iEikonEnv->EikAppUi()->AddToStackL(cba, ECoeStackPriorityCba, ECoeStackFlagRefusesFocus));	// Won't fail since we just removed it (and array will not reallocate)
+			TRAP_IGNORE(iEikonEnv->EikAppUi()->AddToStackL(cba, ECoeStackPriorityCba, ECoeStackFlagRefusesFocus));	// Won't fail since we just removed it (and array will not reallocate)
 			cba->DrawableWindow()->SetOrdinalPosition(0);
             cba->MakeVisible(ETrue);
             ReportUserActivity();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknQueryControl.cpp
--- a/uifw/AvKon/src/AknQueryControl.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknQueryControl.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -79,7 +79,7 @@
 
 #include "akntrace.h"
 const TInt KPinCodeTacticonInterval = 30000000; // 30s
-const TInt KPinCodeMaxTacticons = 10;
+const TInt KPinCodeMaxTacticons = 5;
 /*******
  * CAknQueryControlExtension
  */
@@ -3072,8 +3072,11 @@
             DeactivateGc();
 
             // Draw the label after the background.
-            iPrompt->Line( i )->ActivateL(); // Never leaves
-            iPrompt->Line( i )->DrawNow();
+            TRAPD(err, iPrompt->Line( i )->ActivateL()); // Never leaves
+            if (err == KErrNone)
+                {
+                iPrompt->Line( i )->DrawNow();
+                }
             iPrompt->SetLineModified( i, EFalse );
             }
         }
@@ -3385,7 +3388,8 @@
 
 EXPORT_C void CAknQueryControl::HandlePointerEventL(const TPointerEvent& aPointerEvent) 
     { 
-    if ( iEditorFrame.Rect().Contains( aPointerEvent.iPosition ) )
+    if ( iHasEditor && iEditorFrame.Valid() 
+        && iEditorFrame.Rect().Contains( aPointerEvent.iPosition ) )
     	{
 		/*For the events happening inside editor frame's rect, query control will forward
 		the events to editors to handle.This is added to fix bug ESLM-85YFCH:Text editor is hard 
@@ -3788,7 +3792,8 @@
 
 EXPORT_C void CAknExtQueryControl::HandlePointerEventL(const TPointerEvent& aPointerEvent) 
     { 
-	if ( iEditorFrame.Rect().Contains( aPointerEvent.iPosition ) )
+	if ( iHasEditor && iEditorFrame.Valid() 
+	    && iEditorFrame.Rect().Contains( aPointerEvent.iPosition ) )
 		{
 		/*For the events happening inside editor frame's rect, query control will forward
 		the events to editors to handle.This is added to fix bug ESLM-85YFCH:Text editor is hard 
@@ -4074,8 +4079,11 @@
             DeactivateGc();
 
             // Draw the label after the background.
-            iPrompt->Line( i )->ActivateL(); // Never leaves
-            iPrompt->Line( i )->DrawNow();
+            TRAPD(err, iPrompt->Line( i )->ActivateL()); // Never leaves
+            if (err == KErrNone)
+                {
+                iPrompt->Line( i )->DrawNow();
+                }
             iPrompt->SetLineModified( i, EFalse );
             }
         }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknQueryDialog.cpp
--- a/uifw/AvKon/src/AknQueryDialog.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknQueryDialog.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -428,6 +428,9 @@
 
     CAknsFrameBackgroundControlContext* cc = (CAknsFrameBackgroundControlContext*)AknsDrawUtils::ControlContext( this );
     cc->SetCenter(KAknsIIDQsnFrPopupCenterQuery);
+    
+    // Check Query is wait of not.
+    TBool isWaitDialog( ( DialogFlags() & EEikDialogFlagWait ) != 0 );
 
     SetGloballyCapturing(ETrue); 
     TInt ret = CAknDialog::RunLD();
@@ -436,7 +439,12 @@
         {
         soundSystem->PopContext();
         }
-    SetGloballyCapturing(EFalse); 
+    // If wait QueryDialog, instance will be deleted right after RunLD via CBA
+    if ( !isWaitDialog )
+        {
+        SetGloballyCapturing(EFalse); 
+        }
+
     _AKNTRACE_FUNC_EXIT;
     return ret;
     }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknRadioButtonSettingPage.cpp
--- a/uifw/AvKon/src/AknRadioButtonSettingPage.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknRadioButtonSettingPage.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -92,9 +92,10 @@
 
 CAknRadioButtonSettingPageExtension::CAknRadioButtonSettingPageExtension(
     CCoeControl& aOwner ) :
-    iOldFocusedItemIndex(-1), iIsDragged( EFalse ), 
-    iIsValidSelection( ETrue ),
-    iPenDownOnItem ( KErrNotFound )
+    iOldFocusedItemIndex( -1 ),
+    iIsDragged( EFalse ),
+    iPenDownOnItem ( KErrNotFound ),
+    iIsValidSelection( ETrue )
     {
     if ( static_cast<CAknAppUi*>(
             aOwner.ControlEnv()->AppUi() )->IsSingleClickCompatible() )
@@ -524,10 +525,16 @@
 EXPORT_C void CAknRadioButtonSettingPage::HandleResourceChange(TInt aType)
 	{
     if( aType == KAknsMessageSkinChange )
-    	{
-    	TRAP_IGNORE( InitialiseRadioButtonBitmapsL() );    	
-    	}
-	
+        {
+        TRAP_IGNORE( InitialiseRadioButtonBitmapsL() );    	
+        }
+    else if( aType == KEikMessageFadeAllWindows )
+        {
+        if ( iExtension )
+            {
+            iExtension->iIsValidSelection = EFalse;
+            }
+        }
 	CAknListBoxSettingPage::HandleResourceChange(aType);
 	}
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSctDialog.cpp
--- a/uifw/AvKon/src/AknSctDialog.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSctDialog.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -434,10 +434,12 @@
     // to select multiple characters before.
     if (aButtonId == EAknSoftkeyOk || aButtonId == EAknSoftkeySelect || aButtonId == EAknSoftkeyExit)
         {
-        // In Japanese UI, SCT isn't closed by pressing "Select" softkey,
+        // In Korean UI, SCT isn't closed by pressing "Select" softkey,
         // but SCT is closed by pressing "Back"(button id is EAknSoftkeyClose).
+        // Japanese feature for SCT will not be supported since TB9.2 PS2,
+        // so remove the code for Japanese SCT.
         MAknSctFocusHandler* handler = charmapControl->FocusHandler();
-        if (charmapControl->IsJapaneseSctUi() &&
+        if ( charmapControl->IsKoreanSctUi() &&
             aButtonId != EAknSoftkeyExit &&
             handler->FocusedControl() == charmapControl)
             {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknServerApp.cpp
--- a/uifw/AvKon/src/AknServerApp.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknServerApp.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -21,6 +21,7 @@
 
 #include <avkon.hrh>
 #include <aknenv.h>
+#include <aknsgcc.h>
 #include "AknOpenFileServiceImpl.h"
 #include "AknNullServiceImpl.h"
 #include "AknLaunchAppServiceImpl.h"
@@ -38,6 +39,7 @@
 #endif
 	CEikonEnv* eikEnv = CEikonEnv::Static();
 	RWindowGroup& wg = eikEnv->RootWin();
+	CAknSgcClient::UseForegroundPriorityDuringRelinquish( ETrue );
     ConnectNewChildAppL(aAppUid, wg);
     }
 
@@ -50,6 +52,7 @@
 #ifdef AVKON_RDEBUG_INFO
     RDebug::Print(_L("RAknAppServiceBase::Close"));
 #endif
+    CAknSgcClient::UseForegroundPriorityDuringRelinquish( EFalse );
     REikAppServiceBase::Close();
     }
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSettingItemList.cpp
--- a/uifw/AvKon/src/AknSettingItemList.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSettingItemList.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -111,7 +111,7 @@
 // -------------------------------
 //
 
-NONSHARABLE_CLASS( CAknSettingItemExtension ) : CBase
+NONSHARABLE_CLASS( CAknSettingItemExtension ) : public CBase
     {
     public:
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSettingPage.cpp
--- a/uifw/AvKon/src/AknSettingPage.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSettingPage.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -592,7 +592,7 @@
 
 	iEikonEnv->EikAppUi()->RemoveFromStack(this);
 
-    AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL );
+    TRAP_IGNORE(AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL ));
     
 	if (iMenuBar)
 		{
@@ -921,7 +921,8 @@
         iCba = CEikButtonGroupContainer::NewL( CEikButtonGroupContainer::ECba,
             CEikButtonGroupContainer::EHorizontal, 
             this, resourceId, *this, CEikButtonGroupContainer::EIsEmbedded | 
-            CEikButtonGroupContainer::EAddToStack );
+            CEikButtonGroupContainer::EAddToStack | 
+            CEikButtonGroupContainer::EAlwaysShown );
 	    }
 	
 	iExtension->CreateBackgroundContextL();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSignalIcon.cpp
--- a/uifw/AvKon/src/AknSignalIcon.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSignalIcon.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -652,6 +652,62 @@
                                              KRgbGray );          
                 break;        
     
+            case EAknSignalUmaIndicatorOff:
+                // default icon
+                AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon,
+                        KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask,
+                        AknIconUtils::AvkonIconFileName(),
+                        EMbmAvkonQgn_prop_signal_icon,
+                        EMbmAvkonQgn_prop_signal_icon_mask, KRgbGray );
+                break;
+
+            case EAknSignalUmaIndicatorAvailable:
+                AknsUtils::CreateColorIconL( skin,
+                        KAknsIIDQgnIndiSignalUmaIcon,
+                        KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask,
+                        AknIconUtils::AvkonIconFileName(),
+                        EMbmAvkonQgn_indi_signal_uma_icon,
+                        EMbmAvkonQgn_indi_signal_uma_icon_mask,
+                        KRgbGray );                         
+                break;
+                
+            case EAknSignalUmaIndicatorAttached:
+            case EAknSignalUmaIndicatorEstablishingContext:
+                AknsUtils::CreateColorIconL(skin,
+                        KAknsIIDQgnIndiSignalUmaAttach,
+                        KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask,
+                        AknIconUtils::AvkonIconFileName(),
+                        EMbmAvkonQgn_indi_signal_uma_attach,
+                        EMbmAvkonQgn_indi_signal_uma_attach_mask, KRgbGray );                  
+                break;
+                
+            case EAknSignalUmaIndicatorContext:
+                AknsUtils::CreateColorIconL(skin,
+                        KAknsIIDQgnIndiSignalUmaContext,
+                        KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask,
+                        AknIconUtils::AvkonIconFileName(),
+                        EMbmAvkonQgn_indi_signal_uma_context,
+                        EMbmAvkonQgn_indi_signal_uma_context_mask, KRgbGray );                   
+                break;
+                
+            case EAknSignalUmaIndicatorSuspended:
+                AknsUtils::CreateColorIconL(skin,
+                        KAknsIIDQgnIndiSignalUmaSuspended,
+                        KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask,
+                        AknIconUtils::AvkonIconFileName(),
+                        EMbmAvkonQgn_indi_signal_uma_suspended,
+                        EMbmAvkonQgn_indi_signal_uma_suspended_mask, KRgbGray );                                   
+                break;
+                
+            case EAknSignalUmaIndicatorMultipdp:
+                AknsUtils::CreateColorIconL(skin,
+                        KAknsIIDQgnIndiSignalUmaMultipdp,
+                        KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask,
+                        AknIconUtils::AvkonIconFileName(),
+                        EMbmAvkonQgn_indi_signal_uma_multipdp,
+                        EMbmAvkonQgn_indi_signal_uma_multipdp_mask, KRgbGray );                      
+                        break;
+                        
             // Default in all situations
             default:
                 AknsUtils::CreateColorIconL( skin,
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSkinnableClock.cpp
--- a/uifw/AvKon/src/AknSkinnableClock.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSkinnableClock.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -417,7 +417,7 @@
     homeTime.HomeTime();
     if (iFace)
         {
-        iFace->DrawTimeToBitmapL(rect, gc, homeTime);
+        TRAP_IGNORE(iFace->DrawTimeToBitmapL(rect, gc, homeTime));
         }
     }
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSkinnableClockFace.cpp
--- a/uifw/AvKon/src/AknSkinnableClockFace.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSkinnableClockFace.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -90,11 +90,6 @@
     locale.Refresh();
     TDigitType digitType( locale.DigitType() );
 
-    if ( uiLanguage == ELangUrdu )
-        {
-        return EFalse;
-        }
-
     return ( AknTextUtils::DigitModeQuery() &&
              digitType != EDigitTypeDevanagari );
     }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSmileyImage.cpp
--- a/uifw/AvKon/src/AknSmileyImage.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSmileyImage.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -234,15 +234,15 @@
     if(iImageSkinItemId.iMinor > 0)
         {
         MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-        TRAPD(err, AknsUtils::CreateColorIconL(skin, iImageSkinItemId, 
-                                               KAknsIIDQsnTextColors,EAknsCIQsnTextColorsCG19, 
-                                               iFrame,iFrameMask, 
-                                               smileyMifName, iImageMifPkgItemId,iImageMifPkgItemId, 
-                                               AKN_LAF_COLOR(215)));
+        TRAP_IGNORE(AknsUtils::CreateColorIconL(skin, iImageSkinItemId, 
+                                                KAknsIIDQsnTextColors,EAknsCIQsnTextColorsCG19, 
+                                                iFrame,iFrameMask, 
+                                                smileyMifName, iImageMifPkgItemId,iImageMifPkgItemId, 
+                                                AKN_LAF_COLOR(215)));
         }
     else
         {
-        TRAPD(err, AknIconUtils::CreateIconL(iFrame,iFrameMask,smileyMifName,iImageMifPkgItemId,iImageMifPkgItemId));
+        TRAP_IGNORE(AknIconUtils::CreateIconL(iFrame,iFrameMask,smileyMifName,iImageMifPkgItemId,iImageMifPkgItemId));
         }
     
     if(iIsAnimation) // the first frame of animation svg is blank without correct content
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSmileyModel.cpp
--- a/uifw/AvKon/src/AknSmileyModel.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSmileyModel.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1025,12 +1025,40 @@
         }
     }
 
+void CSmileyModel::PlayAnimationL(const TDesC& aText, TInt aRepeat, TInt aDelay)
+    {
+    for(TInt i(0); i<aText.Length(); i++)
+        {
+        PlayAnimationL(aText[i], aRepeat, aDelay);
+        }
+    }
+
+void CSmileyModel::StopAnimation(const TDesC& aText)
+    {
+    for(TInt i(0); i<aText.Length(); i++)
+        {
+        StopAnimation(aText[i]);
+        }
+    }
+
 void CSmileyModel::LoadStillImageL(TChar aChar)
     {
     CSmileyIcon* icon = static_cast<CSmileyIcon*>(Smiley(aChar));
     iSmileyLoader.AddTaskL(icon);
     }
 
+void CSmileyModel::PlayAnimationL(TChar aChar, TInt aRepeat, TInt aDelay)
+    {
+    CSmileyIcon* icon = static_cast<CSmileyIcon*>(Smiley(aChar));
+    if(icon) icon->PlayAnimationL(aRepeat, aDelay);
+    }
+
+void CSmileyModel::StopAnimation(TChar aChar)
+    {
+    CSmileyIcon* icon = static_cast<CSmileyIcon*>(Smiley(aChar));
+    if(icon) icon->StopAnimation();
+    }
+
 const TDesC& CSmileyModel::Text(TInt aIndex, TInt aVariant) const
     {
     CSmileyIcon* icon = static_cast<CSmileyIcon*>((*this)[aIndex]);
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknSmileyUtils.cpp
--- a/uifw/AvKon/src/AknSmileyUtils.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknSmileyUtils.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -50,9 +50,10 @@
     return FALSE;
     }
 
+const TSize KSize;
 const TSize& CAknSmileyIcon::Size() const
     {
-    return TSize();
+    return KSize;
     }
 
 void CAknSmileyIcon::PlayAnimationL(TInt /*aRepeat*/, TInt /*aDelay*/)
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknTabGrpGraphics.cpp
--- a/uifw/AvKon/src/AknTabGrpGraphics.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknTabGrpGraphics.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,6 +49,76 @@
 //const TUint8 KHiddenFadeBlackMap( 20 );
 //const TUint8 KHiddenFadeWhiteMap( 255 );
 
+
+/****************************** New functions for refactoring tab drawing logic ******************************/
+/**
+ * Specifies the structure of each drawing instruction
+ */
+struct TTabInstruction
+    {
+    // 1 - Active tab, 2 - Passive tab, 3 - HighLight tab, 4 - Bit tab right, 5 - Bit tab left.
+    TInt    iTabStyle;
+
+    // 1 - iFirstTab, 2 - iSecondTab, 3 - iThirdTab, 4 - iFourthTab, 5 - iHiddenTabLeft, 6 - iHiddenTabRight.
+    TInt    iLayoutIdx;
+    
+    // Rect for DrawPassiveTabBit.
+    TRect   iBitTabRect;
+    
+    // Fade for DrawPassiveTab.
+    TBool   iPassiveFade;
+    };
+
+/******************** Three help functions for setting struct TTabInstruction. *******************/
+/**
+ * Composes the instructions used for drawing passive bit tab.
+ * 
+ */
+void AssemblyPassiveTabBitInstruction( 
+    TTabInstruction& instruction,
+    TInt aTabStyle,
+    TRect &aRect )
+    {
+    instruction.iTabStyle = aTabStyle;
+    instruction.iBitTabRect = aRect;
+    }
+
+/**
+ * Composes the instructions used for drawing passive or highlight tab.
+ * 
+ */
+void AssemblyPassiveOrHighlightTabInstruction( 
+    TTabInstruction& instruction,
+    TInt aHighlightTab, 
+    TInt aLayoutIdx, 
+    TBool aFade )
+    {
+    if (aHighlightTab != 0 && aHighlightTab == aLayoutIdx)
+        {
+        //Highlight tab
+        instruction.iTabStyle = 3;
+        }
+    else
+        {
+        instruction.iTabStyle = 2;
+        }
+    instruction.iLayoutIdx = aLayoutIdx;
+    instruction.iPassiveFade = aFade;
+    }
+
+/**
+ * Composes the instructions for drawing active tab.
+ * 
+ */
+void AssemblyActiveTabInstruction(
+    TTabInstruction& instruction,
+    TInt aLayoutIdx )
+    {
+    instruction.iTabStyle = 1;
+    instruction.iLayoutIdx = aLayoutIdx;
+    }
+
+
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
@@ -117,217 +187,11 @@
     iTabGroupBackgroundParent = aParent;
     }
     
-#if 0
-
-CAknTabGroupGraphics::SAknTabGroupBackground CAknTabGroupGraphics::CreateTabGroupBackgroundL( TInt aAvkonBitmapId)
-    {
-    CAknTabGroupGraphics::SAknTabGroupBackground emptyTabGroupBackGround;
-
-    if ( !TabGroupBackgroundAvailable() )
-        {
-        return emptyTabGroupBackGround;
-        }
-
-    TBool longTabs    = EFalse;
-    TInt numberOfTabs = 0;
-    TInt activeTab    = 0;
-
-    switch ( aAvkonBitmapId )
-        {
-        case EMbmAvkonQgn_graf_tab_21:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 2;
-            activeTab    = 1;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_22:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 2;
-            activeTab    = 2;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_31:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 3;
-            activeTab    = 1;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_32:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 3;
-            activeTab    = 2;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_33:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 3;
-            activeTab    = 3;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_41:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 4;
-            activeTab    = 1;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_42:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 4;
-            activeTab    = 2;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_43:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 4;
-            activeTab    = 3;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_44:
-            {
-            longTabs     = EFalse;
-            numberOfTabs = 4;
-            activeTab    = 4;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_long_21:
-            {
-            longTabs     = ETrue;
-            numberOfTabs = 2;
-            activeTab    = 1;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_long_22:
-            {
-            longTabs     = ETrue;
-            numberOfTabs = 2;
-            activeTab    = 2;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_long_31:
-            {
-            longTabs     = ETrue;
-            numberOfTabs = 3;
-            activeTab    = 1;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_long_32:
-            {
-            longTabs     = ETrue;
-            numberOfTabs = 3;
-            activeTab    = 2;
-            break;
-            }
-        case EMbmAvkonQgn_graf_tab_long_33:
-            {
-            longTabs     = ETrue;
-            numberOfTabs = 3;
-            activeTab    = 3;
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-        
-    return CreateTabGroupBackgroundL( longTabs, numberOfTabs, activeTab );
-    }
-
-CAknTabGroupGraphics::SAknTabGroupBackground CAknTabGroupGraphics::CreateTabGroupBackgroundL(
-    TBool aLongTabs, TInt aNumberOfTabs, TInt aActiveTab )
-    {
-    CAknTabGroupGraphics::SAknTabGroupBackground       tabGroupBackGround;
-    CAknTabGroupGraphics::SAknTabGroupBackgroundLayout tabGroupBackGroundLayout;
-
-    AknIconConfig::TPreferredDisplayMode mode;
-    AknIconConfig::PreferredDisplayMode( mode,
-                                         AknIconConfig::EImageTypeOffscreen );
-
-    TDisplayMode bitmapDisplayMode = mode.iBitmapMode;
-    TDisplayMode maskDisplayMode   = EGray256;
-    TSize size( iTabGroupBackgroundParent.Size() );
-
-    // BITMAP
-    tabGroupBackGround.iBitmap = new (ELeave) CFbsBitmap();
-    CleanupStack::PushL( tabGroupBackGround.iBitmap );
-    User::LeaveIfError( tabGroupBackGround.iBitmap->Create( size, bitmapDisplayMode ) );
-    CFbsBitmapDevice* bitmapDevice = CFbsBitmapDevice::NewL( tabGroupBackGround.iBitmap );
-    CleanupStack::PushL( bitmapDevice );
-    CFbsBitGc* bitmapGc;
-    User::LeaveIfError( bitmapDevice->CreateContext( bitmapGc ) );
-
-    // Clear background first...
-    bitmapGc->SetBrushColor( KRgbBlack );
-    bitmapGc->SetBrushStyle( CGraphicsContext::ESolidBrush );
-    bitmapGc->DrawRect( iTabGroupBackgroundParent );
-
-    bitmapGc->SetBrushStyle( CGraphicsContext::ENullBrush );
-    DrawTabGroupBackgroundL( CAknTabGroupGraphics::ENormal,
-                             aLongTabs,
-                             aNumberOfTabs,
-                             aActiveTab,
-                             bitmapGc,
-                             tabGroupBackGroundLayout,
-                             ENone );
-    delete bitmapGc;
-
-    CleanupStack::Pop( 2, tabGroupBackGround.iBitmap );
-    delete bitmapDevice;
-    bitmapGc = NULL;
-    bitmapDevice = NULL;
-
-    // MASK
-    tabGroupBackGround.iMask = new (ELeave) CFbsBitmap();
-    CleanupStack::PushL( tabGroupBackGround.iMask );
-    User::LeaveIfError( tabGroupBackGround.iMask->Create( size, maskDisplayMode ) );
-    bitmapDevice = CFbsBitmapDevice::NewL( tabGroupBackGround.iMask );
-    CleanupStack::PushL( bitmapDevice );
-    User::LeaveIfError( bitmapDevice->CreateContext( bitmapGc ) );
-
-    // Clear background first...
-    bitmapGc->SetBrushStyle( CGraphicsContext::ESolidBrush );
-    if ( maskDisplayMode == EGray256 )
-        {
-        bitmapGc->SetBrushColor( KRgbBlack );
-        }
-    else
-        {
-        bitmapGc->SetBrushColor( KRgbWhite );
-        }
-    bitmapGc->DrawRect( iTabGroupBackgroundParent );
-
-    bitmapGc->SetBrushStyle( CGraphicsContext::ENullBrush );
-    DrawTabGroupBackgroundL( CAknTabGroupGraphics::EMaskOnly,
-                             aLongTabs,
-                             aNumberOfTabs,
-                             aActiveTab,
-                             bitmapGc,
-                             tabGroupBackGroundLayout,
-                             ENone);
-    delete bitmapGc;
-
-    CleanupStack::Pop( 2, tabGroupBackGround.iMask );
-    delete bitmapDevice;
-
-    return tabGroupBackGround;
-    }
-    
-#endif
-
-
 // ---------------------------------------------------------------------------
 // Draws normal tab background from given parameters.
 // ---------------------------------------------------------------------------
 //
-void CAknTabGroupGraphics::DrawTabGroupBackgroundL(
+void CAknTabGroupGraphics::DrawTabGroupBackground(
     TTabDrawMode aTabDrawMode,
     TBool aLongTabs,
     TInt aNumberOfTabs,
@@ -335,91 +199,210 @@
     CBitmapContext* aGc,
     SAknTabGroupBackgroundLayout& aLayout,
     TTabsHidden aTabsHidden,
-    TTabAnimationType aAnimation ) const
+    TTabAnimationType aAnimation,
+    TInt aHighlightTab ) const
     {
-    switch ( aNumberOfTabs )
+    //Set the layout for tab background;
+    ReviseLayoutForTabBackground(aLayout, aNumberOfTabs, aLongTabs, aActiveTab, EFalse, aAnimation);
+    
+    TInt insCnt = 0;
+    TTabInstruction instruction[8];
+    
+    switch (aNumberOfTabs)
         {
         case 2:
             {
-            if ( aLongTabs )
+            if (aActiveTab == 1)
                 {
-                DrawTwoLongTabBackground( aTabDrawMode,
-                                          aActiveTab,
-                                          aGc,
-                                          aLayout );
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 1);
                 }
             else
                 {
-                DrawTwoTabBackground( aTabDrawMode,
-                                      aActiveTab,
-                                      aGc,
-                                      aLayout );
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 2);
                 }
+            }
             break;
-            }
         case 3:
             {
             if ( aLongTabs )
                 {
-                DrawThreeLongTabBackground( aTabDrawMode,
-                                            aActiveTab,
-                                            aGc,
-                                            aLayout );
+                if (aActiveTab == 1)
+                    {
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                    AssemblyActiveTabInstruction(instruction[insCnt++], 1);
+                    }
+                else if ( aActiveTab == 2)
+                    {
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                    AssemblyActiveTabInstruction(instruction[insCnt++], 2);
+                    }
+                else if ( aActiveTab == 3)
+                    {
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                    AssemblyActiveTabInstruction(instruction[insCnt++], 3);
+                    }
                 }
             else
                 {
-                DrawThreeTabBackground( aTabDrawMode,
-                                        aActiveTab,
-                                        aGc,
-                                        aLayout,
-                                        aTabsHidden,
-                                        aAnimation );
+                TInt xOffset(aLayout.iFirstTab.iRight.iBr.iX - aLayout.iSecondTab.iLeft.iTl.iX);
+                
+                if (aActiveTab == 1)
+                    {
+                    if (aTabsHidden == EOnRightSide)
+                        {
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6, ETrue);
+                        }
+                    
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                    AssemblyActiveTabInstruction(instruction[insCnt++], 1);
+                    }
+                else if (aActiveTab == 2)
+                    {
+                    switch (aTabsHidden)
+                        {
+                        case EOnLeftSide:
+                            {
+                            TRect bitRect(aLayout.iHiddenTabLeft.iLeft);
+                            bitRect.Resize(xOffset, 0);
+                            AssemblyPassiveTabBitInstruction(instruction[insCnt++], 5, bitRect);
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5,
+                                    aAnimation != ECycleToLeft ? ETrue : EFalse);
+                            }
+                            break;
+                        case EOnRightSide:
+                            {
+                            TRect bitRect(aLayout.iHiddenTabRight.iRight);
+                            bitRect.Move(-xOffset, 0);
+                            bitRect.Resize(xOffset, 0);
+                            AssemblyPassiveTabBitInstruction(instruction[insCnt++], 4, bitRect);
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6,
+                                    aAnimation != ECycleToRight ? ETrue : EFalse);
+                            }
+                            break;
+                        case EOnBothSides:
+                            {
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5,
+                                    aAnimation != ECycleToLeft ? ETrue : EFalse);
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6,
+                                    aAnimation != ECycleToRight ? ETrue : EFalse);
+                            }
+                            break;
+                        case ETwoOnBothSides:
+                            {
+                            TRect bitRect(aLayout.iHiddenTabLeft.iLeft);
+                            bitRect.Resize(xOffset, 0);
+                            AssemblyPassiveTabBitInstruction(instruction[insCnt++], 5, bitRect);
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5,
+                                    aAnimation != ECycleToLeft ? ETrue : EFalse);
+
+                            bitRect = aLayout.iHiddenTabRight.iRight;
+                            bitRect.Move(-xOffset, 0);
+                            bitRect.Resize(xOffset, 0);
+                            AssemblyPassiveTabBitInstruction(instruction[insCnt++], 4, bitRect);
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6,
+                                    aAnimation != ECycleToRight ? ETrue : EFalse);
+                            }
+                            break;
+                        case ENone:
+                        default:
+                            break;
+                        }
+
+                    if (aAnimation == ECycleToLeft)
+                        {
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, ETrue);
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                        AssemblyActiveTabInstruction(instruction[insCnt++], 1);
+                        }
+                    else if ( aAnimation == ECycleToRight )
+                        {
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, ETrue);
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                        AssemblyActiveTabInstruction(instruction[insCnt++], 3);
+                        }
+                    else
+                        {
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                
+                        if (aAnimation)
+                            {
+                            AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                            }
+                        else
+                            {
+                            AssemblyActiveTabInstruction(instruction[insCnt++], 2);
+                            }
+                        }
+                    }
+                else if (aActiveTab == 3)
+                    {
+                    if (aTabsHidden == EOnLeftSide)
+                        {
+                        AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5, ETrue);
+                        }
+                    
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                    AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                    AssemblyActiveTabInstruction(instruction[insCnt++], 3);
+                    }
                 }
+            }
             break;
-            }
         case 4:
             {
-            DrawFourTabBackground( aTabDrawMode,
-                                   aActiveTab,
-                                   aGc,
-                                   aLayout );
+            if (aActiveTab == 1)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 4, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 1);
+                }
+            else if ( aActiveTab == 2 )
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 4, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 2);
+                }
+            else if ( aActiveTab == 3 )
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 4, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 3);
+                }
+            else if ( aActiveTab == 4 )
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 4);
+                }
+            }
             break;
-            }
         default:
             {
 #ifdef AVKON_RDEBUG_ERROR
-            RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab layout !") );
+            RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab group background !") );
 #endif
+            break;
             }
         }
-
-    if ( !aLayout.iUse )
-        {
-        aLayout.iFirstTab.iActive  = EFalse;
-        aLayout.iSecondTab.iActive = EFalse;
-        aLayout.iThirdTab.iActive  = EFalse;
-        aLayout.iFourthTab.iActive = EFalse;
-
-        if ( aActiveTab == 1 )
-            {
-            aLayout.iFirstTab.iActive = ETrue;
-            }
-        else if ( aActiveTab == 2 )
-            {
-            aLayout.iSecondTab.iActive = ETrue;
-            }
-        else if ( aActiveTab == 3 )
-            {
-            aLayout.iThirdTab.iActive = ETrue;
-            }
-        else if ( aActiveTab == 4 )
-            {
-            aLayout.iFourthTab.iActive = ETrue;
-            }
-        }
+    
+    //Draw tab background according to instructions
+    ProcessDrawTabInstructions(instruction, insCnt, aTabDrawMode, aLayout, aGc);
+    
+    ReviseLayoutUseFlag(aLayout, aActiveTab);
     }
 
-void CAknTabGroupGraphics::DrawTabGroupNarrowBackgroundL(
+void CAknTabGroupGraphics::DrawTabGroupNarrowBackground(
     TTabDrawMode aTabDrawMode,
     TBool aLongTabs,
     TInt aNumberOfTabs,
@@ -427,111 +410,98 @@
     CBitmapContext* aGc,
     SAknTabGroupBackgroundLayout& aLayout ) const
     {
+    //Set the layout for tab background;
+    ReviseLayoutForTabBackground(aLayout, aNumberOfTabs, aLongTabs, aActiveTab, ETrue, ENoAnimation);
+    
+    TInt insCnt = 0;
+    TTabInstruction instruction[6];
+    
     switch ( aNumberOfTabs )
         {
         case 2:
             {
-            if ( aLongTabs )
-                {
-                if ( !aLayout.iUse )
-                    {
-                    aLayout = TwoLongTabNarrowBackground( aActiveTab );
-                    }
-                aLayout.iUse = ETrue;
-                DrawTwoLongTabNarrowBackground( aTabDrawMode,
-                                                aActiveTab,
-                                                aGc,
-                                                aLayout );
-                }
-            else
+            if (aActiveTab == 1)
                 {
-                if ( !aLayout.iUse )
-                    {
-                    aLayout = TwoTabNarrowBackground( aActiveTab );
-                    }
-                aLayout.iUse = ETrue;
-                DrawTwoTabNarrowBackground( aTabDrawMode,
-                                            aActiveTab,
-                                            aGc,
-                                            aLayout );
-                }
-            break;
-            }
-        case 3:
-            {
-            if ( aLongTabs )
-                {
-                if ( !aLayout.iUse )
-                    {
-                    aLayout = ThreeLongTabNarrowBackground( aActiveTab );
-                    }
-                aLayout.iUse = ETrue;
-                DrawThreeLongTabNarrowBackground( aTabDrawMode,
-                                                  aActiveTab,
-                                                  aGc,
-                                                  aLayout );
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 1);
                 }
             else
                 {
-                if ( !aLayout.iUse )
-                    {
-                    aLayout = ThreeTabNarrowBackground( aActiveTab );
-                    }
-                aLayout.iUse = ETrue;
-                DrawThreeTabNarrowBackground( aTabDrawMode,
-                                              aActiveTab,
-                                              aGc,
-                                              aLayout );
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 2);
+                }
+            }
+            break;
+        case 3:
+            {
+            if (aActiveTab == 1)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 1);
                 }
+            else if (aActiveTab == 2)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 2);
+                }
+            else if (aActiveTab == 3)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 3);
+                }
+            }
             break;
-            }
         case 4:
             {
-            if ( !aLayout.iUse )
+            if (aActiveTab == 1)
                 {
-                aLayout = FourTabNarrowBackground( aActiveTab );
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 4, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 1);
+                }
+            else if (aActiveTab == 2)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 4, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 2);
                 }
-            aLayout.iUse = ETrue;
-            DrawFourTabNarrowBackground( aTabDrawMode,
-                                         aActiveTab,
-                                         aGc,
-                                         aLayout );
+            else if (aActiveTab == 3)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 4, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 3);
+                }
+            else if (aActiveTab == 4)
+                {
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse);
+                AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse);
+                AssemblyActiveTabInstruction(instruction[insCnt++], 4);
+                }
+            }
             break;
-            }
         default:
             {
 #ifdef AVKON_RDEBUG_ERROR
-            RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab layout !") );
+            RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab narrow background !") );
 #endif
+            break;
             }
         }
-
-        if ( !aLayout.iUse )
-            {
-            aLayout.iFirstTab.iActive  = EFalse;
-            aLayout.iSecondTab.iActive = EFalse;
-            aLayout.iThirdTab.iActive  = EFalse;
-            aLayout.iFourthTab.iActive = EFalse;
-
-            if ( aActiveTab == 1 )
-                {
-                aLayout.iFirstTab.iActive = ETrue;
-                }
-            else if ( aActiveTab == 2 )
-                {
-                aLayout.iSecondTab.iActive = ETrue;
-                }
-            else if ( aActiveTab == 3 )
-                {
-                aLayout.iThirdTab.iActive = ETrue;
-                }
-            else if ( aActiveTab == 4 )
-                {
-                aLayout.iFourthTab.iActive = ETrue;
-                }
-            }
+    
+    //Draw tab background according to instructions
+    ProcessDrawTabInstructions(instruction, insCnt, aTabDrawMode, aLayout, aGc);
+    
+    ReviseLayoutUseFlag(aLayout, aActiveTab);
     }
 
+
 TBool CAknTabGroupGraphics::TabClickedL( TInt aTabComponent,
                                          const TRect& aTabRect,
                                          const TPoint& aPoint,
@@ -843,91 +813,6 @@
     return aLayout;
     }
 
-void CAknTabGroupGraphics::DrawTwoTabBackground(
-    TTabDrawMode aTabDrawMode,
-    TInt aActiveTab,
-    CBitmapContext* aGc,
-    SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = TwoTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft,
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    }
-
-void CAknTabGroupGraphics::DrawTwoTabNarrowBackground(
-    TTabDrawMode aTabDrawMode,
-    TInt aActiveTab,
-    CBitmapContext* aGc,
-    SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = TwoTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft,
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    }
-
-
 // ---------------------------------------------------------------------------
 // Extracts tab group background layout from layout data for three tab layout.
 // ---------------------------------------------------------------------------
@@ -1333,339 +1218,6 @@
     return aLayout;
     }
 
-
-// ---------------------------------------------------------------------------
-// Draws the tab group background in three tab layout.
-// ---------------------------------------------------------------------------
-//
-void CAknTabGroupGraphics::DrawThreeTabBackground(
-    TTabDrawMode aTabDrawMode,
-    TInt aActiveTab,
-    CBitmapContext* aGc,
-    SAknTabGroupBackgroundLayout& aLayout,
-    TTabsHidden aTabsHidden,
-    TTabAnimationType aAnimation ) const
-    {
-    TInt animActiveTab( aActiveTab );
-    if ( aAnimation && aActiveTab == 2 )
-        {
-        // Move the tab highlight already during the animation.
-        animActiveTab = aAnimation == ECycleToLeft ? aActiveTab - 1 :
-                                                     aActiveTab + 1;
-        }
-
-    // If not given layout, then get the default layout.
-    if ( !aLayout.iUse )
-        {
-        aLayout = ThreeTabBackground( animActiveTab );
-        }
-
-    TInt xOffset( aLayout.iFirstTab.iRight.iBr.iX -
-                      aLayout.iSecondTab.iLeft.iTl.iX );
-    
-    if ( aActiveTab == 1 )
-        {
-        if ( aTabsHidden == EOnRightSide )
-            {
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iHiddenTabRight.iLeft,
-                            aLayout.iHiddenTabRight.iMiddle,
-                            aLayout.iHiddenTabRight.iRight,
-                            aGc,
-                            ETrue );
-            }
-
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 2 )
-        {
-        switch ( aTabsHidden )
-            {
-            case EOnLeftSide:
-                {
-                TRect bitRect( aLayout.iHiddenTabLeft.iLeft );
-                bitRect.Resize( xOffset, 0 );
-                DrawPassiveTabBit( aTabDrawMode,
-                                   ERight,
-                                   bitRect,
-                                   aGc );
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iHiddenTabLeft.iLeft,
-                                aLayout.iHiddenTabLeft.iMiddle,
-                                aLayout.iHiddenTabLeft.iRight,
-                                aGc,
-                                aAnimation != ECycleToLeft ? ETrue : EFalse  );
-                break;
-                }
-            case EOnRightSide:
-                {
-                TRect bitRect( aLayout.iHiddenTabRight.iRight );
-                bitRect.Move( -xOffset, 0 );
-                bitRect.Resize( xOffset, 0 );
-                DrawPassiveTabBit( aTabDrawMode,
-                                   ELeft,
-                                   bitRect,
-                                   aGc );
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iHiddenTabRight.iLeft,
-                                aLayout.iHiddenTabRight.iMiddle,
-                                aLayout.iHiddenTabRight.iRight,
-                                aGc,
-                                aAnimation != ECycleToRight ? ETrue : EFalse  );
-                break;
-                }
-            case EOnBothSides:
-                {
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iHiddenTabLeft.iLeft,
-                                aLayout.iHiddenTabLeft.iMiddle,
-                                aLayout.iHiddenTabLeft.iRight,
-                                aGc,
-                                aAnimation != ECycleToLeft ? ETrue : EFalse  );
-
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iHiddenTabRight.iLeft,
-                                aLayout.iHiddenTabRight.iMiddle,
-                                aLayout.iHiddenTabRight.iRight,
-                                aGc,
-                                aAnimation != ECycleToRight ? ETrue : EFalse  );
-                break;
-                }
-            case ETwoOnBothSides:
-                {
-                TRect bitRect( aLayout.iHiddenTabLeft.iLeft );
-                bitRect.Resize( xOffset, 0 );
-                DrawPassiveTabBit( aTabDrawMode,
-                                   ERight,
-                                   bitRect,
-                                   aGc );
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iHiddenTabLeft.iLeft,
-                                aLayout.iHiddenTabLeft.iMiddle,
-                                aLayout.iHiddenTabLeft.iRight,
-                                aGc,
-                                aAnimation != ECycleToLeft ? ETrue : EFalse );
-
-                bitRect = aLayout.iHiddenTabRight.iRight;
-                bitRect.Move( -xOffset, 0 );
-                bitRect.Resize( xOffset, 0 );
-                DrawPassiveTabBit( aTabDrawMode,
-                                   ELeft,
-                                   bitRect,
-                                   aGc );
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iHiddenTabRight.iLeft,
-                                aLayout.iHiddenTabRight.iMiddle,
-                                aLayout.iHiddenTabRight.iRight,
-                                aGc,
-                                aAnimation != ECycleToRight ? ETrue : EFalse);
-                break;
-                }
-            case ENone:
-            default:
-                {
-                break;
-                }
-            }
-
-        if ( aAnimation == ECycleToLeft )
-            {
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iThirdTab.iLeft,
-                            aLayout.iThirdTab.iMiddle,
-                            aLayout.iThirdTab.iRight,
-                            aGc,
-                            ETrue );
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iSecondTab.iLeft,
-                            aLayout.iSecondTab.iMiddle,
-                            aLayout.iSecondTab.iRight,
-                            aGc );
-             DrawActiveTab( aTabDrawMode,
-                            aLayout.iFirstTab.iLeft,
-                            aLayout.iFirstTab.iMiddle,
-                            aLayout.iFirstTab.iRight,
-                            aGc );
-            }
-        else if ( aAnimation == ECycleToRight )
-            {
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iFirstTab.iLeft,
-                            aLayout.iFirstTab.iMiddle,
-                            aLayout.iFirstTab.iRight,
-                            aGc,
-                            ETrue );
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iSecondTab.iLeft,
-                            aLayout.iSecondTab.iMiddle,
-                            aLayout.iSecondTab.iRight,
-                            aGc );
-            DrawActiveTab( aTabDrawMode,
-                           aLayout.iThirdTab.iLeft,
-                           aLayout.iThirdTab.iMiddle,
-                           aLayout.iThirdTab.iRight,
-                           aGc );
-            }
-        else
-            {
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iFirstTab.iLeft,
-                            aLayout.iFirstTab.iMiddle,
-                            aLayout.iFirstTab.iRight,
-                            aGc );
-    
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iThirdTab.iLeft,
-                            aLayout.iThirdTab.iMiddle,
-                            aLayout.iThirdTab.iRight,
-                            aGc );
-    
-            if ( aAnimation )
-                {
-                DrawPassiveTab( aTabDrawMode,
-                                aLayout.iSecondTab.iLeft,
-                                aLayout.iSecondTab.iMiddle,
-                                aLayout.iSecondTab.iRight,
-                                aGc );
-                }
-            else
-                {
-                DrawActiveTab( aTabDrawMode,
-                               aLayout.iSecondTab.iLeft,
-                               aLayout.iSecondTab.iMiddle,
-                               aLayout.iSecondTab.iRight,
-                               aGc );
-                }
-            }
-        }
-    else if ( aActiveTab == 3 )
-        {
-        if ( aTabsHidden == EOnLeftSide )
-            {
-            DrawPassiveTab( aTabDrawMode,
-                            aLayout.iHiddenTabLeft.iLeft,
-                            aLayout.iHiddenTabLeft.iMiddle,
-                            aLayout.iHiddenTabLeft.iRight,
-                            aGc,
-                            ETrue  );
-            }
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iThirdTab.iLeft,
-                       aLayout.iThirdTab.iMiddle,
-                       aLayout.iThirdTab.iRight,
-                       aGc );
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// Draws the tab group background in three tab narrow layout.
-// ---------------------------------------------------------------------------
-//
-void CAknTabGroupGraphics::DrawThreeTabNarrowBackground(
-    TTabDrawMode aTabDrawMode,
-    TInt aActiveTab,
-    CBitmapContext* aGc,
-    SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = ThreeTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 2 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft,
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 3 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iThirdTab.iLeft,
-                       aLayout.iThirdTab.iMiddle,
-                       aLayout.iThirdTab.iRight,
-                       aGc );
-        }
-    }
-
-
 CAknTabGroupGraphics::SAknTabGroupBackgroundLayout CAknTabGroupGraphics::FourTabBackground(
     TInt aActiveTab ) const
     {
@@ -2140,242 +1692,6 @@
     return aLayout;
     }
 
-void CAknTabGroupGraphics::DrawFourTabBackground( TTabDrawMode aTabDrawMode,
-                                                  TInt aActiveTab,
-                                                  CBitmapContext* aGc,
-                                                  SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = FourTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFourthTab.iLeft,
-                        aLayout.iFourthTab.iMiddle,
-                        aLayout.iFourthTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 2 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFourthTab.iLeft,
-                        aLayout.iFourthTab.iMiddle,
-                        aLayout.iFourthTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft,
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 3 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFourthTab.iLeft,
-                        aLayout.iFourthTab.iMiddle,
-                        aLayout.iFourthTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iThirdTab.iLeft,
-                       aLayout.iThirdTab.iMiddle,
-                       aLayout.iThirdTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 4 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFourthTab.iLeft,
-                       aLayout.iFourthTab.iMiddle,
-                       aLayout.iFourthTab.iRight,
-                       aGc );
-        }
-    }
-
-void CAknTabGroupGraphics::DrawFourTabNarrowBackground( TTabDrawMode aTabDrawMode,
-                                                        TInt aActiveTab,
-                                                        CBitmapContext* aGc,
-                                                        SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = FourTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFourthTab.iLeft,
-                        aLayout.iFourthTab.iMiddle,
-                        aLayout.iFourthTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 2 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFourthTab.iLeft,
-                        aLayout.iFourthTab.iMiddle,
-                        aLayout.iFourthTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode, 
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft,
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 3 )
-        {
-        // Note the drawing order of passive tabs
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFourthTab.iLeft,
-                        aLayout.iFourthTab.iMiddle,
-                        aLayout.iFourthTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iThirdTab.iLeft,
-                       aLayout.iThirdTab.iMiddle,
-                       aLayout.iThirdTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 4 )
-        {
-        // Note the drawing order of passive tabs
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFourthTab.iLeft,
-                       aLayout.iFourthTab.iMiddle,
-                       aLayout.iFourthTab.iRight,
-                       aGc );
-        }
-    }
-
 CAknTabGroupGraphics::SAknTabGroupBackgroundLayout CAknTabGroupGraphics::TwoLongTabBackground(TInt aActiveTab) const
     {
     SAknTabGroupBackgroundLayout aLayout;
@@ -2588,90 +1904,6 @@
     return aLayout;
     }
 
-void CAknTabGroupGraphics::DrawTwoLongTabBackground(
-    TTabDrawMode aTabDrawMode,
-    TInt aActiveTab,
-    CBitmapContext* aGc,
-    SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = TwoLongTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft,
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    }
-
-void CAknTabGroupGraphics::DrawTwoLongTabNarrowBackground(
-    TTabDrawMode aTabDrawMode,
-    TInt aActiveTab,
-    CBitmapContext* aGc,
-    SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = TwoLongTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-                        
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iSecondTab.iLeft, 
-                       aLayout.iSecondTab.iMiddle,
-                       aLayout.iSecondTab.iRight,
-                       aGc );
-        }
-    }
-
 CAknTabGroupGraphics::SAknTabGroupBackgroundLayout CAknTabGroupGraphics::ThreeLongTabBackground(TInt aActiveTab) const
     {
     SAknTabGroupBackgroundLayout aLayout;
@@ -3040,140 +2272,6 @@
     return aLayout;
     }
 
-void CAknTabGroupGraphics::DrawThreeLongTabBackground( TTabDrawMode aTabDrawMode,
-                                                       TInt aActiveTab, CBitmapContext* aGc,
-                                                       SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = ThreeLongTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 2)
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        DrawActiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        }
-    else if ( aActiveTab == 3)
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iThirdTab.iLeft,
-                       aLayout.iThirdTab.iMiddle,
-                       aLayout.iThirdTab.iRight,
-                       aGc );
-        }
-    }
-
-void CAknTabGroupGraphics::DrawThreeLongTabNarrowBackground( TTabDrawMode aTabDrawMode,
-                                                             TInt aActiveTab,
-                                                             CBitmapContext* aGc,
-                                                             SAknTabGroupBackgroundLayout& aLayout ) const
-    {
-    // If not given layout, then get the default layout
-    if ( !aLayout.iUse )
-        {
-        aLayout = ThreeLongTabBackground( aActiveTab );
-        }
-
-    if ( aActiveTab == 1 )
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iFirstTab.iLeft,
-                       aLayout.iFirstTab.iMiddle,
-                       aLayout.iFirstTab.iRight,
-                       aGc );
-        }
-    else if ( aActiveTab == 2)
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iThirdTab.iLeft,
-                        aLayout.iThirdTab.iMiddle,
-                        aLayout.iThirdTab.iRight,
-                        aGc );
-        DrawActiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        }
-    else if ( aActiveTab == 3)
-        {
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iFirstTab.iLeft,
-                        aLayout.iFirstTab.iMiddle,
-                        aLayout.iFirstTab.iRight,
-                        aGc );
-        DrawPassiveTab( aTabDrawMode,
-                        aLayout.iSecondTab.iLeft,
-                        aLayout.iSecondTab.iMiddle,
-                        aLayout.iSecondTab.iRight,
-                        aGc );
-        DrawActiveTab( aTabDrawMode,
-                       aLayout.iThirdTab.iLeft,
-                       aLayout.iThirdTab.iMiddle,
-                       aLayout.iThirdTab.iRight,
-                       aGc );
-        }
-    }
-
-
 // ---------------------------------------------------------------------------
 // Draws single tab graphics for an active tab.
 // ---------------------------------------------------------------------------
@@ -3628,4 +2726,300 @@
     return iTabGroupBackgroundAvailable; // 3
     }
 
+void CAknTabGroupGraphics::DrawHighlightTabL(TTabDrawMode aDrawMode,
+        TRect aLeft, TRect aMiddle, TRect aRight, CBitmapContext* aGc) const
+    {
+    if ( aDrawMode == CAknTabGroupGraphics::ENoDraw )
+        {
+        return;
+        }
+
+    TRect rect( aLeft );
+    CFbsBitmap* activeColorBitmap = new (ELeave) CFbsBitmap();
+    CleanupStack::PushL( activeColorBitmap );
+
+    TDisplayMode screenDisplayMode( iPassiveTabLeft->DisplayMode() );
+    activeColorBitmap->Create( rect.Size(), screenDisplayMode );
+
+    TRgb color;
+    AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), color,
+            KAknsIIDQsnOtherColors, EAknsCIQsnOtherColorsCG25 );
+
+    CFbsBitmapDevice* destinationDevice = CFbsBitmapDevice::NewL( activeColorBitmap );
+    CleanupStack::PushL( destinationDevice );
+    CFbsBitGc* destinationGc;
+    User::LeaveIfError( destinationDevice->CreateContext( destinationGc ) );
+    destinationGc->SetPenColor( color );
+    destinationGc->SetPenStyle( CGraphicsContext::ESolidPen );
+    destinationGc->SetBrushColor( color );
+    destinationGc->SetBrushStyle( CGraphicsContext::ESolidBrush );
+    destinationGc->DrawRect( TRect( activeColorBitmap->SizeInPixels() ) );
+
+    delete destinationGc;
+    CleanupStack::PopAndDestroy( destinationDevice );
+
+    aGc->BitBltMasked( rect.iTl, activeColorBitmap, 
+            TRect( 0, 0, rect.Width(), rect.Height() ), 
+            iPassiveTabLeftMask, ETrue );
+
+    CleanupStack::PopAndDestroy( activeColorBitmap );
+
+    /*********************************************************************/
+
+    rect = aMiddle;
+
+    CFbsBitmap* activeColorBitmapM = new (ELeave) CFbsBitmap();
+    CleanupStack::PushL( activeColorBitmapM );
+
+    activeColorBitmapM->Create( rect.Size(), screenDisplayMode );
+
+    destinationDevice = CFbsBitmapDevice::NewL( activeColorBitmapM );
+    CleanupStack::PushL( destinationDevice );
+    User::LeaveIfError( destinationDevice->CreateContext( destinationGc ) );
+    destinationGc->SetPenColor( color );
+    destinationGc->SetPenStyle( CGraphicsContext::ESolidPen );
+    destinationGc->SetBrushColor( color );
+    destinationGc->SetBrushStyle( CGraphicsContext::ESolidBrush );
+    destinationGc->DrawRect( TRect( activeColorBitmapM->SizeInPixels() ) );
+
+    delete destinationGc;
+    CleanupStack::PopAndDestroy( destinationDevice );
+
+    aGc->BitBltMasked(rect.iTl, activeColorBitmapM, 
+            TRect(0, 0, rect.Width(), rect.Height() ), 
+            iPassiveTabMiddleMask, ETrue );
+    CleanupStack::PopAndDestroy( activeColorBitmapM );
+
+    /*********************************************************************/
+
+    rect = aRight;
+
+    CFbsBitmap* activeColorBitmapR = new (ELeave) CFbsBitmap();
+    CleanupStack::PushL( activeColorBitmapR );
+
+    activeColorBitmapR->Create( rect.Size(), screenDisplayMode );
+
+    destinationDevice = CFbsBitmapDevice::NewL( activeColorBitmapR );
+    CleanupStack::PushL( destinationDevice );
+    User::LeaveIfError( destinationDevice->CreateContext( destinationGc ) );
+    destinationGc->SetPenColor( color );
+    destinationGc->SetPenStyle( CGraphicsContext::ESolidPen );
+    destinationGc->SetBrushColor( color );
+    destinationGc->SetBrushStyle( CGraphicsContext::ESolidBrush );
+    destinationGc->DrawRect( TRect( activeColorBitmapR->SizeInPixels() ) );
+
+    delete destinationGc;
+    CleanupStack::PopAndDestroy( destinationDevice );
+    aGc->BitBltMasked( rect.iTl, activeColorBitmapR, 
+        TRect(0, 0, rect.Width(), rect.Height() ), 
+        iPassiveTabRightMask, ETrue );
+
+    CleanupStack::PopAndDestroy( activeColorBitmapM );
+    }
+
+void CAknTabGroupGraphics::ReviseLayoutForTabBackground(
+    SAknTabGroupBackgroundLayout& aLayout,
+    TInt aNumberOfTabs,
+    TBool aLongTabs,
+    TInt aActiveTab,
+    TBool aIsNarrow,
+    TTabAnimationType aAnimation) const
+    {
+    if (aLayout.iUse)
+        {
+        // aLayout has been set, return directly.
+        return;
+        }
+    
+    if (aIsNarrow)
+        {
+        switch (aNumberOfTabs)
+            {
+            case 2:
+                {
+                aLayout = aLongTabs ? TwoLongTabNarrowBackground(aActiveTab) : TwoTabNarrowBackground(aActiveTab);
+                break;
+                }
+            case 3:
+                {
+                aLayout = aLongTabs ? ThreeLongTabNarrowBackground(aActiveTab) : ThreeTabNarrowBackground(aActiveTab);
+                break;
+                }
+            case 4:
+                {
+                aLayout = FourTabNarrowBackground(aActiveTab);
+                break;
+                }
+            default:
+                {
+#ifdef AVKON_RDEBUG_ERROR
+                RDebug::Print(_L("CAknTabGroupGraphics: Unknown narrow tab layout !"));
+#endif
+                }
+            }
+        aLayout.iUse = ETrue;
+        }
+    else
+        {
+        switch (aNumberOfTabs)
+            {
+            case 2:
+                {
+                aLayout = aLongTabs ? TwoLongTabBackground(aActiveTab) : TwoTabBackground(aActiveTab);
+                break;
+                }
+            case 3:
+                {
+                if (aLongTabs)
+                    {
+                    aLayout = ThreeLongTabBackground(aActiveTab);
+                    }
+                else
+                    {
+                    TInt animActiveTab = aActiveTab;
+                    if (aAnimation && aActiveTab == 2)
+                        {
+                        // Move the tab highlight already during the animation.
+                        animActiveTab = 
+                                aAnimation == ECycleToLeft ? aActiveTab - 1 : aActiveTab + 1;
+                        }
+                    aLayout = ThreeTabBackground(animActiveTab);
+                    }
+                break;
+                }
+            case 4:
+                {
+                aLayout = FourTabBackground(aActiveTab);
+                break;
+                }
+            default:
+                {
+#ifdef AVKON_RDEBUG_ERROR
+                RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab layout !") );
+#endif
+                }
+            }
+        }
+    }
+
+void CAknTabGroupGraphics::ReviseLayoutUseFlag(
+    SAknTabGroupBackgroundLayout& aLayout,
+    TInt aActiveTab) const
+    {
+    if (!aLayout.iUse)
+        {
+        aLayout.iFirstTab.iActive  = EFalse;
+        aLayout.iSecondTab.iActive = EFalse;
+        aLayout.iThirdTab.iActive  = EFalse;
+        aLayout.iFourthTab.iActive = EFalse;
+
+        if (aActiveTab == 1)
+            {
+            aLayout.iFirstTab.iActive = ETrue;
+            }
+        else if (aActiveTab == 2)
+            {
+            aLayout.iSecondTab.iActive = ETrue;
+            }
+        else if (aActiveTab == 3)
+            {
+            aLayout.iThirdTab.iActive = ETrue;
+            }
+        else if (aActiveTab == 4)
+            {
+            aLayout.iFourthTab.iActive = ETrue;
+            }
+        }
+    }
+
+
+#define GET_TABLAYOUT_RECT(idx) do{ \
+        left = aLayout.idx.iLeft; \
+        middle = aLayout.idx.iMiddle; \
+        right = aLayout.idx.iRight; \
+}while (0)
+
+void CAknTabGroupGraphics::ProcessDrawTabInstructions(
+    TTabInstruction *aInstructions,
+    TInt aNumOfIns,
+    TTabDrawMode aTabDrawMode,
+    SAknTabGroupBackgroundLayout& aLayout,
+    CBitmapContext* aGc) const
+    {
+    if (aInstructions == NULL || aNumOfIns <= 0 || aGc == NULL)
+        {
+        return;
+        }
+    
+    for ( TInt i = 0; i < aNumOfIns; i++ )
+        {
+        if ( aInstructions[i].iTabStyle == 5 || aInstructions[i].iTabStyle == 6 )
+            {
+            // Draw passive tab bit.
+            DrawPassiveTabBit(aTabDrawMode, 
+                              aInstructions[i].iTabStyle == 5 ? ELeft : ERight, 
+                              aInstructions[i].iBitTabRect, 
+                              aGc);
+            }
+        else
+            {
+            TBool layoutValid = ETrue;
+            TRect left, middle, right;
+            switch (aInstructions[i].iLayoutIdx)
+                {
+                case 1: 
+                    {
+                    GET_TABLAYOUT_RECT(iFirstTab); 
+                    break;
+                    }
+                case 2: 
+                    {
+                    GET_TABLAYOUT_RECT(iSecondTab); 
+                    break;
+                    }
+                case 3: 
+                    {
+                    GET_TABLAYOUT_RECT(iThirdTab); 
+                    break;
+                    }
+                case 4: 
+                    {
+                    GET_TABLAYOUT_RECT(iFourthTab); 
+                    break;
+                    }
+                case 5: 
+                    {
+                    GET_TABLAYOUT_RECT(iHiddenTabLeft); 
+                    break;
+                    }
+                case 6: 
+                    {
+                    GET_TABLAYOUT_RECT(iHiddenTabRight); 
+                    break;
+                    }
+                default:
+                    {
+                    layoutValid = EFalse;
+                    }
+                }
+            
+            if (layoutValid)
+                {
+                if (aInstructions[i].iTabStyle == 1)
+                    {
+                    DrawActiveTab(aTabDrawMode, left, middle, right, aGc);
+                    }
+                else if (aInstructions[i].iTabStyle == 2)
+                    {
+                    DrawPassiveTab(aTabDrawMode, left, middle, right, aGc, aInstructions[i].iPassiveFade);
+                    }
+                else if (aInstructions[i].iTabStyle == 3)
+                    {
+                    TRAP_IGNORE( DrawHighlightTabL(aTabDrawMode, left, middle, right, aGc) );
+                    }
+                }
+            }
+        }
+    }
+
 // End of file
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknViewAppUi.cpp
--- a/uifw/AvKon/src/AknViewAppUi.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknViewAppUi.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -261,11 +261,18 @@
 	if (iExtension && iExtension->iNavigator )
 	    RemoveFromStack( iExtension->iNavigator );
 #endif // RD_SPLIT_VIEW
-	
-	delete iClearer;
-	delete iShutter;
-	delete iActivationTick;
-	
+
+    // Hide application toolbar to prevent it from showing 
+    // after views are deleted
+    if ( CAknAppUi::CurrentFixedToolbar() )
+        {
+        CAknAppUi::CurrentFixedToolbar()->SetToolbarVisibility( EFalse );
+        }
+
+    delete iClearer;
+    delete iShutter;
+    delete iActivationTick;
+
 	if ( iActivationQueue )
 		{
 		iActivationQueue->ResetAndDestroy();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/AknVolumePopup.cpp
--- a/uifw/AvKon/src/AknVolumePopup.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/AknVolumePopup.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1449,7 +1449,7 @@
    
     if ( iVisible )
         {
-        SetVisibilityL( ETrue );
+        TRAP_IGNORE(SetVisibilityL( ETrue ));
         DrawDeferred();
         }
     }
@@ -1719,7 +1719,7 @@
 EXPORT_C void CAknVolumePopup::UseMutedIcon( TBool aFlag )
     {
     iExt->iUseMutedIcon = aFlag;
-    CreateSpeakerL();
+    TRAP_IGNORE(CreateSpeakerL());
     }
 
 // ---------------------------------------------------------------------------
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknchoicelist.cpp
--- a/uifw/AvKon/src/aknchoicelist.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknchoicelist.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -295,9 +295,6 @@
             {
             TRAP_IGNORE( iList->ScrollBarFrame()->SetScrollBarVisibilityL(
                 CEikScrollBarFrame::EOff, CEikScrollBarFrame::EOff) );
-                
-            // Enable scrolling
-            iList->DisableScrolling( EFalse );   
             }
             
         layoutRect.LayoutRect( rectParent, 
@@ -531,13 +528,6 @@
         
         if ( AknLayoutUtils::PenEnabled() )
             {
-            
-            // Make sure that scrolling is enabled for choicelist
-            if ( iList->ScrollingDisabled() )
-                {
-                iList->DisableScrolling( EFalse );
-                }
-                    
             TRect ctrlArea = iList->Rect();
             
             if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/akngrid.cpp
--- a/uifw/AvKon/src/akngrid.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/akngrid.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -109,11 +109,12 @@
 
     public: // data 
         TInt iFlags;
-        // EMMA-7A8B9F.Ugly hack. Prevent MopSupplyObject being invoked 
-        // from CEikListBox::MopGetObject()
+
+        // This is used to prevent MopSupplyObject being invoked 
+        // from CEikListBox::MopGetObject().
         TBool iIsFromBaseClass;
+
         TPoint iLastPoint;
-        TBool iKineticScrolling;
         TBool iSingleClickEnabled;
     };
 
@@ -122,7 +123,6 @@
     iFlags(0), 
     iIsFromBaseClass( EFalse ),
     iLastPoint( 0, 0 ), 
-    iKineticScrolling( CAknPhysics::FeatureEnabled() ),
     iSingleClickEnabled( iAvkonAppUi->IsSingleClickCompatible() )
     {
     }
@@ -1507,8 +1507,12 @@
         
         // and calculate new top item index
         TInt topItemIndex = newTopRow * iNumOfColsInView ;
-        iView->SetItemOffsetInPixels(0);
-        SetTopItemIndex(topItemIndex);
+        if ( topItemIndex > KErrNotFound 
+             && topItemIndex < iModel->NumberOfItems() )
+            {
+            iView->SetItemOffsetInPixels( 0 );
+            SetTopItemIndex( topItemIndex );
+            }
         }
     _AKNTRACE_FUNC_EXIT;
     }
@@ -1869,7 +1873,6 @@
         // EHXA-7AQ8N4. Only set it to 0 can make scrollbar empty.
         vSbarModel.iScrollSpan = GridModel()->NumberOfItems() >0 ? 
             gridSize.iHeight : 0;
-        vSbarModel.iThumbSpan = gridView->NumberOfRowsInView();
         vSbarModel.iScrollSpan = GridModel()->NumberOfItems() >0 ? 
             gridSize.iHeight*iView->ItemHeight() : 0;
         vSbarModel.iThumbSpan = rect.Height();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/akninfrm.cpp
--- a/uifw/AvKon/src/akninfrm.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/akninfrm.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -353,11 +353,18 @@
         // we need to provide own context if one does not exist
         // because old style drawing did kind of work even
         // without calling SetInputContext( ... )
-        iInputContext = CAknsFrameBackgroundControlContext::NewL(
-            KAknsIIDQsnFrInput, TRect(0,0,0,0), TRect(0,0,0,0), EFalse );
-        iFlags = iFlags | EOwnsInputContext;
-        // also need to provide skin for the editor in this case
-        static_cast<CEikEdwin*>( iField )->SetSkinBackgroundControlContextL( iInputContext );
+        TRAP_IGNORE
+            ( 
+            iInputContext = CAknsFrameBackgroundControlContext::NewL(
+                    KAknsIIDQsnFrInput, TRect(0,0,0,0), TRect(0,0,0,0), EFalse);
+        
+            if (iInputContext)
+                {
+                iFlags = iFlags | EOwnsInputContext;
+                // also need to provide skin for the editor in this case
+                static_cast<CEikEdwin*>( iField )->SetSkinBackgroundControlContextL( iInputContext );  
+                }
+            );
         }
 
     if ( iInputContext )
@@ -509,7 +516,7 @@
         {
         case KAknsMessageSkinChange:
         case KEikDynamicLayoutVariantSwitch:
-            CreateIconL();
+            TRAP_IGNORE(CreateIconL());
             break;
             
         default:
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknkeypad.cpp
--- a/uifw/AvKon/src/aknkeypad.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknkeypad.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -121,7 +121,11 @@
      
      	// Hack
         
-        if ( i == 1)
+        if ( i == 0 ) //Display '.,?' in button 
+            {
+            button->SetUpperAndLowerTextL(_L(".,?"), _L(".,?"));
+            }
+        else if ( i == 1 )
         	{
         	button->SetUpperAndLowerTextL(_L("ABC"), _L("abc"));
        		}
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknmessagequerycontrol.cpp
--- a/uifw/AvKon/src/aknmessagequerycontrol.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknmessagequerycontrol.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -898,7 +898,8 @@
     TAknMultiLineTextLayout multilineLayout = TAknTextComponentLayout::Multiline(textComponentLayoutArray);
     AknLayoutUtils::LayoutEdwin( iEdwin, listPopupInfoPane.Rect(),
         multilineLayout, EAknsCIQsnTextColorsCG19 );
-    //iEdwin->SetRect( listPopupInfoPane.Rect() );
+    // Use list_popup_info_pane as editor's rect
+    iEdwin->SetRect( listPopupInfoPane.Rect() );
     textComponentLayoutArray.Close();
     
     iEdwin->SetBorder( TGulBorder::ENone );
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknnoteattributes.cpp
--- a/uifw/AvKon/src/aknnoteattributes.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknnoteattributes.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -1029,8 +1029,11 @@
             iNoteControl->DeactivateGc();
 
             // Redraw the label after the background
-            iNoteText->Line( i )->ActivateL(); // Never leaves
-            iNoteText->Line( i )->DrawNow();
+            TRAPD(err, iNoteText->Line( i )->ActivateL()); // Never leaves
+            if (err == KErrNone)
+                {
+                iNoteText->Line( i )->DrawNow();
+                }
             iNoteText->SetLineModified( i, EFalse );
             }
         }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknnotecontrol.cpp
--- a/uifw/AvKon/src/aknnotecontrol.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknnotecontrol.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -671,7 +671,7 @@
 
             AknLayoutUtils::LayoutLabel(TextControl()->Line(i),LayoutRect(),
                 AKN_LAYOUT_TEXT_Note_with_an_image_pop_up_window_texts_Line_1(
-                lafIndex.NWIPWindowTextsLine1L(i),lafIndex.NWIPWindowTextsLine1R(i),
+                lafIndex.NWIPWindowTextsLine1Left(i),lafIndex.NWIPWindowTextsLine1Right(i),
                 lafIndex.NWIPWindowTextsLine1B(i),lafIndex.NWIPWindowTextsLine1W(i)));
 
             if (!error)
@@ -916,7 +916,7 @@
             for (TInt i=0; i < KINMaxNumLines; i++)
                 {
                 TAknTextLineLayout lay = AKN_LAYOUT_TEXT_Note_with_an_image_pop_up_window_texts_Line_1(
-                    lafIndex.NWIPWindowTextsLine1L(i),lafIndex.NWIPWindowTextsLine1R(i),
+                    lafIndex.NWIPWindowTextsLine1Left(i),lafIndex.NWIPWindowTextsLine1Right(i),
                     lafIndex.NWIPWindowTextsLine1B(i),lafIndex.NWIPWindowTextsLine1W(i));
                 text.LayoutText(LayoutRect(), lay);
                 TInt width = text.TextRect().Width();
@@ -1161,7 +1161,7 @@
 EXPORT_C void CAknNoteControl::ResetText()
     {
     // This can not Leave so no need to use TRAP 
-    Attributes()->SetTextL(KNullDesC);
+    TRAP_IGNORE(Attributes()->SetTextL(KNullDesC));
     Layout();
     }
 
@@ -1479,16 +1479,16 @@
  * number type indication (NTI). See table in *.lay and
  * LAF specs for working out indexes.
  */
-TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1L(TInt aLineNum) const
+TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1Left(TInt aLineNum) const
     {
     SelfTest();
-    static const TInt  KNWIPWindowTextsLine1IndexL[2][3] = 
+    static const TInt  KNWIPWindowTextsLine1IndexLeft[2][3] = 
     {   
         {0, 0, 0}, //NO NTI
         {0, 0, 2}  //NTI
     }; 
     
-    return KNWIPWindowTextsLine1IndexL[HasNtiIndex()][aLineNum];
+    return KNWIPWindowTextsLine1IndexLeft[HasNtiIndex()][aLineNum];
     }
 
 /**
@@ -1501,18 +1501,18 @@
  * - Dimension 2 is the image width  
  * - Dimension 3 is the image height 
  */
-TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1R(TInt aLineNum) const
+TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1Right(TInt aLineNum) const
     {
     SelfTest();
 
-    static const TInt  KNWIPWindowTextsLine1IndexR[3][5][5] = 
+    static const TInt  KNWIPWindowTextsLine1IndexRight[3][5][5] = 
     {   
         {{0, 0, 0, 0, 0}, {0, 3, 3, 3, 3}, {0, 5, 5, 5, 5}, {0, 7, 7, 7, 7}, {0, 9, 9, 9, 9} }, //FIRST LINE
         {{0, 0, 0, 0, 0}, {0, 3, 3, 3, 3}, {0, 5, 5, 5, 5}, {0, 7, 7, 7, 7}, {0, 9, 9, 9, 9} }, //SECOND LINE
         {{0, 0, 0, 0, 0}, {0, 0, 0, 3, 3}, {0, 0, 0, 5, 5}, {0, 0, 0, 7, 7}, {0, 0, 0, 9, 9} }  //THIRD LINE
     }; 
     
-    return KNWIPWindowTextsLine1IndexR[aLineNum][ImageWidthIndex()][ImageHeightIndex()];
+    return KNWIPWindowTextsLine1IndexRight[aLineNum][ImageWidthIndex()][ImageHeightIndex()];
 
     }
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknqueryeditorindicator.cpp
--- a/uifw/AvKon/src/aknqueryeditorindicator.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknqueryeditorindicator.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -82,7 +82,7 @@
     iState = aState;
     if (Observer())
     	{
-    	Observer()->HandleControlEventL( this, MCoeControlObserver::EEventStateChanged );
+    	TRAP_IGNORE(Observer()->HandleControlEventL( this, MCoeControlObserver::EEventStateChanged ));
     	}
     
     if ( iFlags.IsSet(CAknQueryControl::EEditorIndicatorOff) )
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknsgcc.cpp
--- a/uifw/AvKon/src/aknsgcc.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknsgcc.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -46,7 +46,8 @@
 	EHandlingChange,
 	EInAknSrv,
 	ESystemFaded,
-	ENeverRelinquish
+	ENeverRelinquish,
+	EUseForegroundPriority
 	};
 
 
@@ -618,11 +619,11 @@
 	RThread myThread;
 	TProcessPriority priority = myThread.ProcessPriority();
 
-	if( IsSystemFaded() )
+	if ( IsSystemFaded() || iFlags[EUseForegroundPriority] )
 		{
-		// Solution for EKKG-7RQ9U8:
 		// If the system is faded we have a popup on screen.
-		// Get the process behind the foreground process. 
+		// Get the process behind the foreground process, the
+	    // EUseForegroundPriority should also affect only that process. 
 		TApaTask task = TApaTaskList(iEikonEnv->WsSession()).FindByPos(1);
 
 		// Check if this application is next behind the foreground app.
@@ -657,6 +658,23 @@
 	    }
 	}
 
+void CAknSgcClient::UseForegroundPriorityDuringRelinquish(
+    TBool aUseForeground )
+    {
+    CAknSgcClient* self = Static();
+    if ( self )
+        {
+        if ( aUseForeground )
+            {
+            self->iFlags.Set( EUseForegroundPriority );
+            }
+        else
+            {
+            self->iFlags.Clear( EUseForegroundPriority );
+            }
+        }
+    }
+
 EXPORT_C CAknLayoutConfig& CAknSgcClient::LayoutConfig()
 	{
 	CAknSgcClient* self = Static();
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknsignal.cpp
--- a/uifw/AvKon/src/aknsignal.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknsignal.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -858,6 +858,34 @@
         }
     }
 
+// ---------------------------------------------------------------------------
+// CAknSignalPane::ShowUmaIcon
+// Displays an Uma state icon.
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CAknSignalPane::ShowUmaIconL(TInt aUmaIconState)
+    {
+    // State is not changed if illegal value was given.
+    if (( aUmaIconState >= EAknSignalUmaIndicatorOff ) && 
+        ( aUmaIconState <= EAknSignalUmaIndicatorMultipdp ))
+        {        
+        LoadSignalIconL( aUmaIconState, iSignalIconControl->ColorIndex() );
+        
+        iSignalIconControl->SetDrawBlank( EFalse );
+        
+        if ( aUmaIconState != EAknSignalUmaIndicatorEstablishingContext )
+            {
+            StopTicker();
+            }
+        else if ( aUmaIconState == EAknSignalUmaIndicatorEstablishingContext )
+            {
+            StartTickerL( KAknIndicatorAnimationDelay,
+                                                   KAknIndicatorAnimationInterval );       
+            }
+        }
+
+
+    }
 
 // ---------------------------------------------------------------------------
 // CAknSignalPane::ShowCdmaIcon
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknsignaldataobserver.cpp
--- a/uifw/AvKon/src/aknsignaldataobserver.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknsignaldataobserver.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -133,7 +133,13 @@
 			{
 			// HSPDA
 		    iSignalPane->ShowHsdpaIcon(state.iIconState);
-			}    			
+			}
+        else if (state.iIconState >= EAknSignalUmaIndicatorOff
+                && state.iIconState <= EAknSignalUmaIndicatorMultipdp)
+            {
+            // UMA
+            iSignalPane->ShowUmaIconL(state.iIconState);
+            }    
 		}
 
 	if (!updateAnimation)
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/akntabgrp.cpp
--- a/uifw/AvKon/src/akntabgrp.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/akntabgrp.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -104,6 +104,9 @@
 
     /** Indicates whether or not the tab is shown in long tab group layout. */
     TBool iLongTab;
+    
+    /** Indicates the hilight status of the tab*/
+    TBool iHighlight;
     };
 
 CAknTabExtension* CAknTabExtension::NewL()
@@ -295,6 +298,8 @@
     if ( !iExtension )
         {
         iExtension = CAknTabExtension::NewL();
+        //set the default highlight status of the tab
+        iExtension->iHighlight = EFalse;
         }
 
     iLabel = new (ELeave) CEikLabel;
@@ -807,7 +812,14 @@
 
     }
 
-
+// ---------------------------------------------------------------------------
+// sets the highlight status of a tab
+// ---------------------------------------------------------------------------
+//
+void CAknTab::SetHighlight(TBool aHighlight)
+    {
+    iExtension->iHighlight = aHighlight;
+    }
 // ---------------------------------------------------------------------------
 // Handles size change events in flat status pane layouts.
 // ---------------------------------------------------------------------------
@@ -1033,7 +1045,7 @@
             }
         else
             {
-            if ( iActive )
+            if (iActive || iExtension->iHighlight)
                 {
                 TInt error = AknsUtils::GetCachedColor( skin, color,
                     KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG3 );
@@ -1071,7 +1083,7 @@
                 iColorBitmaps->At(KTabColorBitmapActiveColorIndex) &&
                 iColorBitmaps->At(KTabColorBitmapPassiveColorIndex) )
                 {
-                if( iActive )
+                if (iActive || iExtension->iHighlight)
                     {
                     colorBitmap = iColorBitmaps->At(KTabColorBitmapActiveColorIndex);
                     }
@@ -1262,8 +1274,8 @@
     
     if ( !iColorBitmaps )
     	{
-      LoadColorBitmapL();
-      }
+        TRAP_IGNORE(LoadColorBitmapL());
+    	}
     }
 
 void CAknTab::SetNarrowTabLayout( TBool aNarrow )
@@ -1399,6 +1411,9 @@
 
     /** This is the tab width that is set by the application. */
     TInt   iRequestedTabWidth;
+    
+    /** Indicates whether highlight tab is being drawn or not*/ 
+    TBool iHighlight;
     };
 
 
@@ -1406,6 +1421,8 @@
     {
     iPointerDownTab       = -1;
     iPointerDownXPosition = -1;
+    //Highlight is disabled by default.
+    iHighlight = EFalse;
     }
 
 
@@ -1871,7 +1888,7 @@
         {
         iExtension->iTabBackgroundLayout.iUse = EFalse;
 
-        iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
+        iExtension->iTabSvgGraphics->DrawTabGroupBackground(
             CAknTabGroupGraphics::ENoDraw,
             iLongTabs,
             iNumberOfTabsShown,
@@ -2617,11 +2634,13 @@
 
         if (iExtension->iNarrowTabLayout)
             {
-            iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL(
-                    CAknTabGroupGraphics::ENormal, iLongTabs,
-                    iNumberOfTabsShown, positionActive + 1, &gc,
-                    iExtension->iTabBackgroundLayout);
-
+            iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground(
+                CAknTabGroupGraphics::ENormal,
+                iLongTabs,
+                iNumberOfTabsShown, 
+                positionActive + 1, 
+                &gc,
+                iExtension->iTabBackgroundLayout);
             }
         else
             {
@@ -2631,18 +2650,36 @@
             
             if ( animationOngoing )
                 {
-                animation
-                        = iExtension->iTabCycleAnimationDirection == ELeft
-                                                                           ? CAknTabGroupGraphics::ECycleToLeft
-                                                                              : CAknTabGroupGraphics::ECycleToRight;
+                animation = iExtension->iTabCycleAnimationDirection == ELeft ?
+					CAknTabGroupGraphics::ECycleToLeft : CAknTabGroupGraphics::ECycleToRight;
                 }
-            iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
-                    CAknTabGroupGraphics::ENormal, iLongTabs,
-                    iNumberOfTabsShown, positionActive + 1, &gc,
-                    animationOngoing ? iExtension->iNextTabBackgroundLayout
-                                       : iExtension->iTabBackgroundLayout,
-                    iExtension->iTabsHidden, animation);
-
+
+            if (!iExtension->iHighlight)
+                { 
+                // if highlight is not active
+                iExtension->iTabSvgGraphics->DrawTabGroupBackground(
+                    CAknTabGroupGraphics::ENormal,
+                    iLongTabs,
+                    iNumberOfTabsShown,
+                    positionActive + 1,
+                    &gc,
+                    animationOngoing ? iExtension->iNextTabBackgroundLayout : iExtension->iTabBackgroundLayout,
+                    iExtension->iTabsHidden, 
+					animation);
+                }
+            else
+                {
+                // Highlight is active
+                TInt highlightTab = iExtension->iPointerDownTab - iFirstShownTab + 1; //pointer down tab index w.r.t shown tabs
+                iExtension->iTabSvgGraphics->DrawTabGroupBackground(
+                    CAknTabGroupGraphics::ENormal,
+                    iLongTabs,
+                    iNumberOfTabsShown,
+                    positionActive + 1,
+                    &gc,
+                    animationOngoing ? iExtension->iNextTabBackgroundLayout : iExtension->iTabBackgroundLayout,
+                    iExtension->iTabsHidden, animation, highlightTab );
+                }
             }
         }
     else
@@ -2881,6 +2918,20 @@
                 }
             iExtension->iPointerDownTab       = newTab;
             iExtension->iPointerDownXPosition = aPointerEvent.iPosition.iX;
+            
+            //Activates highlight drawing for pressed tab.
+            if (!iExtension->iHighlight)
+                {
+                iExtension->iHighlight = ETrue;
+                
+                // Set the pressed tab to highlight
+                if ( iExtension->iPointerDownTab >= 0 )
+                    {
+                    iTabArray->At( iExtension->iPointerDownTab )->SetHighlight( ETrue );
+                    }
+                DrawDeferred();
+                }
+            
             return;
             }
         else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
@@ -2910,9 +2961,15 @@
             // if the button up event occurs ouside tabgroup, ignore it.
             if ( !Rect().Contains( aPointerEvent.iPosition ) || iExtension->iPointerDownTab != newTab )
                 {
-                iExtension->iPointerDownTab       = -1;
+                iExtension->iPointerDownTab = -1;
                 iExtension->iPointerDownXPosition = -1;
-                return ;
+                if (iExtension->iHighlight)
+                    {
+                    iExtension->iHighlight = EFalse;
+                    ResetHighlightStatus();
+                    DrawDeferred();
+                    }
+                return;
                 }
 
             if ( newTab != iActiveTab &&
@@ -3020,6 +3077,12 @@
 
             iExtension->iPointerDownTab       = -1;
             iExtension->iPointerDownXPosition = -1;
+            if( iExtension->iHighlight )
+                {
+                iExtension->iHighlight = EFalse;
+                ResetHighlightStatus();
+                DrawDeferred();
+                }
             }
         }
     }
@@ -3388,14 +3451,14 @@
                     ParentRect( iExtension->iNaviArrowsUsed ) );
 
                 iExtension->iTabBackgroundLayout.iUse = EFalse;
-                TRAP_IGNORE( iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
+                iExtension->iTabSvgGraphics->DrawTabGroupBackground(
                                 CAknTabGroupGraphics::ENoDraw,
                                 iLongTabs,
                                 iNumberOfTabsShown,
                                 1,
                                 NULL,
                                 iExtension->iTabBackgroundLayout,
-                                CAknTabGroupGraphics::ENone ) );
+                                CAknTabGroupGraphics::ENone );
                 iExtension->iTabBackgroundLayout.iUse = ETrue;
                 SetDecoratorLayout( EFalse );
                 }
@@ -3403,6 +3466,11 @@
         if ( iExtension )
             {
             iExtension->iNarrowTabLayout = EFalse;
+            if( iExtension->iHighlight )
+                {
+                iExtension->iHighlight = EFalse;
+                ResetHighlightStatus();
+                }
             }
 
         if ( !COMPARE_BOOLS( iMirrored, AknLayoutUtils::LayoutMirrored() ) )
@@ -4043,7 +4111,7 @@
     if ( aNarrow )
         {
         iExtension->iNextTabBackgroundLayout.iUse = EFalse;
-        iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL(
+        iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground(
             CAknTabGroupGraphics::ENoDraw,
             iLongTabs,
             iNumberOfTabsShown,
@@ -4055,7 +4123,7 @@
         if ( !aUseAnimation )
             {
             iExtension->iTabBackgroundLayout.iUse = EFalse;
-            iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL(
+            iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground(
                 CAknTabGroupGraphics::ENoDraw,
                 iLongTabs,
                 iNumberOfTabsShown,
@@ -4068,7 +4136,7 @@
     else
         {
         iExtension->iNextTabBackgroundLayout.iUse = EFalse;
-        iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
+        iExtension->iTabSvgGraphics->DrawTabGroupBackground(
             CAknTabGroupGraphics::ENoDraw,
             iLongTabs,
             iNumberOfTabsShown,
@@ -4079,7 +4147,7 @@
         iExtension->iNextTabBackgroundLayout.iUse = ETrue;
 
         iExtension->iTabBackgroundLayout.iUse = EFalse;
-        iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
+        iExtension->iTabSvgGraphics->DrawTabGroupBackground(
             CAknTabGroupGraphics::ENoDraw,
             iLongTabs,
             iNumberOfTabsShown,
@@ -4444,4 +4512,12 @@
     CancelTabAnimationEventTimer();
     }
 
+void CAknTabGroup::ResetHighlightStatus()
+    {
+    // Resets highlight status to EFalse
+    for( TInt i = 0; i < iTabArray->Count(); i++ )
+        {
+        iTabArray->At(i)->SetHighlight( EFalse );
+        }
+    }
  //  End of File
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/aknutils.cpp
--- a/uifw/AvKon/src/aknutils.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/aknutils.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -5300,8 +5300,21 @@
         CleanupStack::PopAndDestroy(); // wrapWidthArray
         } ); // TRAP end
 
-    // there is no layout for empty popuplist
-    if ( error != KErrNone || popupList )
+    if ( error == KErrNone )
+        {
+        n = 0;
+        for ( i = 0; i < buffer.Length(); i++ )
+            {
+            if ( buffer[i] == '\n' )
+                {
+                n++;
+                }
+            }        
+        }
+    
+    // There is no layout for empty popuplist
+    // The second layout that 2 lines with big font is used for two lines text.
+    if ( n < 3 || error != KErrNone || popupList )
         {
         DrawEmptyListImpl_real_DrawUpToTwoLines( aGc, aText, line1, line2,
                                                  line1length, line2length,
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/src/eikfrlbd.cpp
--- a/uifw/AvKon/src/eikfrlbd.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/src/eikfrlbd.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -2542,12 +2542,13 @@
             }
             
         TRgb color;
-
+        CListBoxView* view = static_cast<CEikListBox*>( Control() )->View();
+        TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; 
         if (aHighlight)
             {
             color = subcellColors->iHighlightedText;
             aGc.SetBrushColor(subcellColors->iHighlightedBack); 
-            if ( AknsUtils::AvkonSkinEnabled() )
+            if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor )
                 {
                 if ( iExtension->iHighlightedTextColor != NULL )
                     {
@@ -2559,7 +2560,7 @@
             {
             color = subcellColors->iText;
             aGc.SetBrushColor(subcellColors->iBack);
-            if ( AknsUtils::AvkonSkinEnabled() )
+            if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor )
                 {
                 if ( iExtension->iTextColor != NULL )
                     {
@@ -2861,12 +2862,8 @@
             & CListItemDrawer::EMarkingModeEnabled 
             && !aProperties.IsSelectionHidden()            
             && iExtension->iMarkingIconArray
-#ifdef RD_TOUCH2_MARKING
             &&  iExtension->iMarkingIconArray->Count() 
-                == KMarkingModeIconArraySize )         
-#else            
-            &&  iExtension->iMarkingIconArray->Count() == 2 )
-#endif // RD_TOUCH2_MARKING        
+                == KMarkingModeIconArraySize )       
         {
         if ( AknLayoutUtils::LayoutMirrored() )
             {
@@ -4455,12 +4452,13 @@
             {
             subcellColors = &aColors;
             }
-
+        CListBoxView* view = listbox->View();
+        TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; 
         if (aHighlight)
             {
             aGc.SetPenColor(subcellColors->iHighlightedText);
             aGc.SetBrushColor(subcellColors->iHighlightedBack); 
-            if ( skinEnabled )
+            if ( skinEnabled && !useOverrideColor )
                 {
                 if ( iExtension->iHighlightedTextColor != NULL )
                     {
@@ -4473,7 +4471,7 @@
             aGc.SetPenColor(subcellColors->iText);
             aGc.SetBrushColor(subcellColors->iBack);
             
-            if ( skinEnabled )
+            if ( skinEnabled && !useOverrideColor )
                 {
                 if ( iExtension->iTextColor != NULL )
                     {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/srcdata/AvkonSystemSounds.ra
--- a/uifw/AvKon/srcdata/AvkonSystemSounds.ra	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/srcdata/AvkonSystemSounds.ra	Thu Aug 19 10:11:06 2010 +0300
@@ -23,6 +23,8 @@
 #define KBatteryLowSoundFile "z:\\resource\\avkonsystemsounds\\battery_low.wav"
 #define KDefaultBeepSoundFile "z:\\resource\\avkonsystemsounds\\default_beep.wav"
 #define KBatteryRechargeSoundFile "z:\\resource\\avkonsystemsounds\\battery_dead.wav"
+#define KConfirmationSoundFile "z:\\resource\\avkonsystemsounds\\confirmation.wav"
+#define KWarningSoundFile "z:\\resource\\avkonsystemsounds\\warning.wav"
 
 
 RESOURCE AVKON_SOUND_INFO_LIST r_avkon_default_sound_list
@@ -59,7 +61,7 @@
 			// 0x76 = 118 => 118-64=54=AUD_TONE_RING_FREQ_F2	 = 1397Hz
 			// 0x11 = 17 = tone_tick = 170ms
 			// 0x0B = 11 = OPCODE_END 
-			file = KDefaultBeepSoundFile;
+			file = KConfirmationSoundFile;
 			volume = 5;
 			},
 		AVKON_SOUND_INFO 
@@ -75,7 +77,7 @@
 			// 0x6C = 108 => 108-64=44=AUD_TONE_RING_FREQ_G1	 = 784Hz
 			// 0x19 = 25 = tone_tick = 250ms
 			// 0x0B = 11 = OPCODE_END 
-			file = KDefaultBeepSoundFile;
+			file = KWarningSoundFile;
 			volume = 5;
 			},
 		AVKON_SOUND_INFO 
@@ -91,7 +93,7 @@
 			// 0x6C = 108 => 108-64=44=AUD_TONE_RING_FREQ_G1	 = 784Hz
 			// 0x19 = 25 = tone_tick = 250ms
 			// 0x0B = 11 = OPCODE_END 
-			file = KDefaultBeepSoundFile;
+			file = KWarningSoundFile;
 			volume = 5;
 			},
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/srcdata/AvkonSystemSounds/confirmation.wav
Binary file uifw/AvKon/srcdata/AvkonSystemSounds/confirmation.wav has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/srcdata/AvkonSystemSounds/warning.wav
Binary file uifw/AvKon/srcdata/AvkonSystemSounds/warning.wav has changed
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/srcdata/avkon.rss
--- a/uifw/AvKon/srcdata/avkon.rss	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/srcdata/avkon.rss	Thu Aug 19 10:11:06 2010 +0300
@@ -5120,7 +5120,12 @@
         // Left down
         AVKON_SKEY_INFO {key=EStdKeyDevice13; sid=EAvkonSIDStandardKeyClick;},
         AVKON_SKEY_INFO {key=EStdKeyDevice13; sid=EAvkonSIDStandardKeyClick; type = ESKeyTypeLong;},
-        AVKON_SKEY_INFO {key=EStdKeyDevice13; sid=EAvkonSIDStandardKeyClick; type = ESKeyTypeRepeat;}
+        AVKON_SKEY_INFO {key=EStdKeyDevice13; sid=EAvkonSIDStandardKeyClick; type = ESKeyTypeRepeat;},
+        
+        //Default keysound for @ key
+        AVKON_SKEY_INFO {key=EStdKeySquareBracketRight; sid=EAvkonSIDStandardKeyClick;},
+        AVKON_SKEY_INFO {key=EStdKeySquareBracketRight; sid=EAvkonSIDStandardKeyClick; type = ESKeyTypeLong;},
+        AVKON_SKEY_INFO {key=EStdKeySquareBracketRight; sid=EAvkonSIDStandardKeyClick; type = ESKeyTypeRepeat;}
 
         };
     }
@@ -9844,6 +9849,8 @@
         MENU_ITEM { command=EPenInputCmdHwrTraining; txt=qtn_tin_option_menu_training;},
 		MENU_ITEM { command=EPenInputCmdVITUT; flags=EEikMenuItemDimmed; txt=qtn_input_switcher_itu_t; },
 		MENU_ITEM { command=EPeninputCmdFSQ; flags=EEikMenuItemDimmed; txt=qtn_input_switcher_fs_qwerty; },
+        MENU_ITEM { command=EPeninputCmdPortraitEditor; flags=EEikMenuItemDimmed; txt=qtn_tin_option_menu_portrait_editor; },
+        MENU_ITEM { command=EPeninputCmdLandscapeEditor; flags=EEikMenuItemDimmed; txt=qtn_tin_option_menu_landscape_editor; },        
         MENU_ITEM { command=EPeninputCmdHwr; flags=EEikMenuItemDimmed; txt=qtn_input_switcher_hwr; },
         MENU_ITEM { command=EFepInputCmdHelp; txt=qtn_options_help; },
         MENU_ITEM { command=EAknCmdEditModeEnglish; flags=EEikMenuItemDimmed; txt=qtn_activate_english_mode; }
@@ -10300,5 +10307,71 @@
 	};
     }
 
+RESOURCE DIALOG r_avkon_special_character_table_dialog_korean
+    {
+    flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
+    buttons = r_avkon_softkeys_select_cancel__select;
+    items=
+        {
+        DLG_LINE
+            {
+            type = EAknCtPopupHeadingPane;
+            id = EAknSCTQueryHeadingId;
+            control = AVKON_HEADING
+                {
+                label = qtn_pop_up_select_character;
+                headinglayout = r_avkon_sct_list_heading_pane;
+                };
+            },
+        DLG_LINE
+            {
+            type = EAknCtSpecialCharacterMap;
+            id = EAknSCTQueryContentId;
+            control = SPECIAL_CHAR_TABLE
+                {
+                contents =
+                    {
+                    SCT_CHAR_SET
+                        {
+                        id = EAknSCTUpperCase;
+                        chars = qtn_sct_kor_special_characters;
+                        },
+                    SCT_CHAR_SET
+                        {
+                        id = EAknSCTLowerCase;
+                        chars = qtn_sct_kor_special_characters;
+                        },
+                    SCT_CHAR_SET
+                        {
+                        id = EAknSCTQwerty;
+                        chars = qtn_sct_kor_special_characters;
+                        }
+                    };
+                };
+            }
+        };
+    }
+
+RESOURCE SPECIAL_CHAR_TABLE r_avkon_menu_sct_row_default_contents_korean
+    {
+    contents =
+        {
+        SCT_CHAR_SET
+            {
+            id = EAknSCTUpperCase;
+            chars = qtn_sct_kor_special_characters;
+            },
+        SCT_CHAR_SET
+            {
+            id = EAknSCTLowerCase;
+            chars = qtn_sct_kor_special_characters;
+            },
+        SCT_CHAR_SET
+            {
+            id = EAknSCTQwerty;
+            chars = qtn_sct_kor_special_characters;
+            }
+        };
+    }
 // End of File
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,7 +67,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,7 +63,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,13 +57,13 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY			commonui.lib
 LIBRARY			apmime.lib 
-LIBRARY			PlatformEnv.lib 
+LIBRARY			platformenv.lib
 LIBRARY			eikctl.lib
 LIBRARY			sysutil.lib 
 LIBRARY                 bafl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,12 +57,12 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY	        commonui.lib 
-LIBRARY         commonengine.lib
+LIBRARY	        commonui.lib
+LIBRARY         CommonEngine.lib
 
 START RESOURCE ../group/bctesteh_reg.rss
 DEPENDS bctesteh.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         cone.lib
 LIBRARY         eikcore.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -60,7 +60,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,13 +58,13 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
 LIBRARY         fbscli.lib
 LIBRARY         akninputlanguage.lib
-LIBRARY		    fontutils.lib 
+LIBRARY		    fontutils.lib
 LIBRARY         uiklaf.lib 
 LIBRARY         gdi.lib 
 LIBRARY         egul.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,11 +59,11 @@
 LIBRARY         aknnotify.lib
 LIBRARY		    bafl.lib
 LIBRARY         bctestutil.lib
-LIBRARY         commonengine.lib
-LIBRARY         AknSkins.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         aknskins.lib
 LIBRARY         egul.lib
-LIBRARY         AknIcon.lib
-LIBRARY         CentralRepository.lib
+LIBRARY         aknicon.lib
+LIBRARY         centralrepository.lib
 
 // Changes for Scalable UI:
 // New registration resource defined.
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -61,7 +61,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY         efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -51,8 +51,8 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -69,8 +69,8 @@
 LIBRARY         eikctl.lib 
 LIBRARY         bafl.lib
 LIBRARY         eikdlg.lib                                                  
-LIBRARY         AknSkins.lib
-LIBRARY         AknIcon.lib
+LIBRARY         aknskins.lib
+LIBRARY         aknicon.lib
 LIBRARY         egul.lib
 LIBRARY         gdi.lib
 LIBRARY         efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,8 +57,8 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -63,8 +63,8 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -60,12 +60,12 @@
 LIBRARY         insock.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
 LIBRARY         estor.lib 
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 LIBRARY         bafl.lib
 
 // Changes for Scalable UI:
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,8 +57,8 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -62,7 +62,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -61,8 +61,8 @@
 LIBRARY         eikctl.lib 
 LIBRARY         bafl.lib
 LIBRARY         eikdlg.lib                                                  
-LIBRARY         AknSkins.lib
-LIBRARY         AknIcon.lib
+LIBRARY         aknskins.lib
+LIBRARY         aknicon.lib
 LIBRARY         egul.lib
 LIBRARY         gdi.lib
 LIBRARY         efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         avkon.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,11 +57,11 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY			AknSkinSrv.lib
+LIBRARY			aknskinsrv.lib
 
 START RESOURCE ../group/bctestserverapp_reg.rss
 DEPENDS bctestserverapp.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,7 +68,7 @@
 LIBRARY         insock.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -61,7 +61,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -60,7 +60,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,12 +57,12 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY         eikctl.lib
-LIBRARY         Lbs.lib
+LIBRARY         lbs.lib
 
 START RESOURCE ../group/BCTestLocation_reg.rss
 DEPENDS bctestlocation.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -52,8 +52,8 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY	    	AknIcon.lib
-LIBRARY         AknSkins.lib
+LIBRARY	    	aknicon.lib
+LIBRARY         aknskins.lib
 LIBRARY         avkon.lib
 LIBRARY         apparc.lib
 LIBRARY         bafl.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY         fontprovider.lib
+LIBRARY         FontProvider.lib
 LIBRARY         fontutils.lib
 LIBRARY         gdi.lib
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,7 +59,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,7 +59,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,7 +58,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,7 +67,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY		efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,13 +58,13 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY		commonui.lib
 LIBRARY		apmime.lib 
-LIBRARY		PlatformEnv.lib 
+LIBRARY		platformenv.lib
 LIBRARY		eikctl.lib
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY		    fontutils.lib 
+LIBRARY		    fontutils.lib
 
 START RESOURCE ../group/BCTestFontInput_reg.rss
 DEPENDS bctestfontinput.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -56,7 +56,7 @@
 APP_LAYER_SYSTEMINCLUDE
 
 LIBRARY         aknhlist.lib
-LIBRARY         aknicon.lib 
+LIBRARY         aknicon.lib
 LIBRARY         akninputlanguage.lib
 LIBRARY         aknnotify.lib
 LIBRARY         aknskins.lib
@@ -84,7 +84,7 @@
 LIBRARY         touchfeedback.lib
 LIBRARY         ws32.lib
 LIBRARY         hwrmhapticsclient.lib
-LIBRARY         AknSkinSrv.lib
+LIBRARY         aknskinsrv.lib
 
 START RESOURCE ../group/bctestmix50_reg.rss
 DEPENDS bctestmix50.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -70,7 +70,7 @@
 LIBRARY         insock.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY			efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,7 +59,7 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         ws32.lib
-LIBRARY         AknSkins.lib
+LIBRARY         aknskins.lib
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -51,7 +51,7 @@
 APP_LAYER_SYSTEMINCLUDE
 
 LIBRARY         aknhlist.lib
-LIBRARY         aknicon.lib 
+LIBRARY         aknicon.lib
 LIBRARY         akninputlanguage.lib
 LIBRARY         aknnotify.lib
 LIBRARY         aknskins.lib
@@ -79,7 +79,7 @@
 LIBRARY         touchfeedback.lib
 LIBRARY         ws32.lib
 LIBRARY         hwrmhapticsclient.lib
-LIBRARY         AknSkinSrv.lib
+LIBRARY         aknskinsrv.lib
 LIBRARY         aknphysics.lib
 LIBRARY         bitgdi.lib
 LIBRARY         eikcoctl.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp
--- a/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY         akncapserverclient.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         bafl.lib 
 
 START RESOURCE ../group/bctestsingleclick_reg.rss
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -82,20 +82,20 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY	        servicehandler.lib  
+LIBRARY	        servicehandler.lib
 LIBRARY	        bafl.lib 
-LIBRARY	        aknkeyrotator.lib
-LIBRARY	        ptiengine.lib 
+LIBRARY	        AknKeyRotator.lib
+LIBRARY	        ptiengine.lib
 LIBRARY	        aknjapanesereading.lib
 LIBRARY	        commondialogs.lib
-LIBRARY	        aknnotify.lib    
+LIBRARY	        aknnotify.lib
 LIBRARY	        gdi.lib          
 LIBRARY	        eikctl.lib       
 LIBRARY	        fbscli.lib 
 LIBRARY	        akncapserverclient.lib
 LIBRARY	        eiksrvc.lib
 LIBRARY	        ecom.lib 
-LIBRARY	        platformEnv.lib 
+LIBRARY	        platformenv.lib
 
 START RESOURCE ../group/bctestdomaiwakn_reg.rss
 DEPENDS bctestdomaiwakn.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -71,14 +71,14 @@
 LIBRARY         bafl.lib
 LIBRARY         fbscli.lib 
 LIBRARY         aknnotify.lib
-LIBRARY         eikalert.lib
+LIBRARY         Eikalert.lib
 LIBRARY         aknnotifyplugin.lib
 LIBRARY         akntransitionutils.lib
 LIBRARY         eikdlg.lib
 LIBRARY         eiksrvui.lib
 LIBRARY         commonui.lib
-LIBRARY         findutil.lib
-LIBRARY         aknicon.lib 
+LIBRARY         FindUtil.lib
+LIBRARY         aknicon.lib
 LIBRARY         eikctl.lib
 LIBRARY         form.lib
 LIBRARY         uiklaf.lib 
@@ -88,12 +88,12 @@
 LIBRARY         numbergrouping.lib
 LIBRARY         pslnframework.lib
 LIBRARY         estor.lib 
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         xnodt.lib
 LIBRARY         ecom.lib 
 LIBRARY         eiksrvc.lib
 LIBRARY         servicehandler.lib
-LIBRARY         sortutil.lib
+LIBRARY         SortUtil.lib
 
 START RESOURCE ../group/bctestdomavkonpsln_reg.rss
 DEPENDS bctestdomavkonpsln.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,8 +59,8 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY         efsrv.lib
-LIBRARY         cdlengine.lib
-LIBRARY         commonengine.lib
+LIBRARY         CdlEngine.lib
+LIBRARY         CommonEngine.lib
 
 START RESOURCE ../group/bctestdomcdl_reg.rss
 DEPENDS bctestdomcdl.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -59,9 +59,9 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY         efsrv.lib
-LIBRARY         menuinterface.lib
+LIBRARY         MenuInterface.lib
 LIBRARY         voiceuinamedialer.lib
-LIBRARY         pbkeng.lib 
+LIBRARY         pbkeng.lib
 LIBRARY         eikdlg.lib 
 LIBRARY         eikctl.lib
 LIBRARY         eikcdlg.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -66,18 +66,18 @@
 LIBRARY	        efsrv.lib
 LIBRARY         fontutils.lib
 LIBRARY         uiklaf.lib 
-LIBRARY         fontprovider.lib
+LIBRARY         FontProvider.lib
 LIBRARY         gdi.lib 
 LIBRARY         bitgdi.lib 
-LIBRARY         aknskinsrv.lib 
+LIBRARY         aknskinsrv.lib
 LIBRARY         fbscli.lib 
 LIBRARY         bafl.lib 
 LIBRARY         aknlayout2.lib
-LIBRARY         aknlayout2adaptation.lib
+LIBRARY         AknLayout2Adaptation.lib
 LIBRARY         aknLayout2hierarchy.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         aknicon.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 
 // New registration resource defined.
 START RESOURCE ../group/bctestdomfntlay_reg.rss
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -71,13 +71,13 @@
 LIBRARY         aknnotifierwrapper.lib 
 LIBRARY         akncapserverclient.lib
 LIBRARY         aknlistloadertfx.lib
-LIBRARY         AknJapaneseReading.lib
+LIBRARY         aknjapanesereading.lib
 
-LIBRARY         AknMemoryCardUi.lib
+LIBRARY         aknmemorycardui.lib
 LIBRARY         aknlayout2.lib
-LIBRARY         aknlayout2adaptation.lib
+LIBRARY         AknLayout2Adaptation.lib
 LIBRARY         aknLayout2hierarchy.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         pslnengine.lib
 
 START RESOURCE ../group/bctestdomnotifier_reg.rss
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -65,7 +65,7 @@
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY         egul.lib
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 
 START RESOURCE ../group/bctestdompopup_reg.rss
 DEPENDS bctestdompopup.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -83,20 +83,20 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
-LIBRARY	        servicehandler.lib  
+LIBRARY	        servicehandler.lib
 LIBRARY	        bafl.lib 
-LIBRARY	        aknkeyrotator.lib
-LIBRARY	        ptiengine.lib 
+LIBRARY	        AknKeyRotator.lib
+LIBRARY	        ptiengine.lib
 LIBRARY	        aknjapanesereading.lib
 LIBRARY	        commondialogs.lib
-LIBRARY	        aknnotify.lib    
+LIBRARY	        aknnotify.lib
 LIBRARY	        gdi.lib          
 LIBRARY	        eikctl.lib       
 LIBRARY	        fbscli.lib 
 LIBRARY	        akncapserverclient.lib
 LIBRARY	        eiksrvc.lib
 LIBRARY	        ecom.lib 
-LIBRARY	        platformEnv.lib 
+LIBRARY	        platformenv.lib
 
 START RESOURCE ../group/bctestdomaiwakn_reg.rss
 DEPENDS bctestdomaiwakn.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,14 +67,14 @@
 LIBRARY         bafl.lib
 LIBRARY         fbscli.lib 
 LIBRARY         aknnotify.lib
-LIBRARY         eikalert.lib
+LIBRARY         Eikalert.lib
 LIBRARY         aknnotifyplugin.lib
 LIBRARY         akntransitionutils.lib
 LIBRARY         eikdlg.lib
 LIBRARY         eiksrvui.lib
 LIBRARY         commonui.lib
-LIBRARY         findutil.lib
-LIBRARY         aknicon.lib 
+LIBRARY         FindUtil.lib
+LIBRARY         aknicon.lib
 LIBRARY         eikctl.lib
 LIBRARY         form.lib
 LIBRARY         uiklaf.lib 
@@ -84,12 +84,12 @@
 LIBRARY         numbergrouping.lib
 LIBRARY         pslnframework.lib
 LIBRARY         estor.lib 
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         xnodt.lib
 LIBRARY         ecom.lib 
 LIBRARY         eiksrvc.lib
 LIBRARY         servicehandler.lib
-LIBRARY         sortutil.lib
+LIBRARY         SortUtil.lib
 
 START RESOURCE ../group/bctestdomavkonpsln_reg.rss
 DEPENDS bctestdomavkonpsln.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -58,8 +58,8 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY         efsrv.lib
-LIBRARY         cdlengine.lib
-LIBRARY         commonengine.lib
+LIBRARY         CdlEngine.lib
+LIBRARY         CommonEngine.lib
 
 START RESOURCE ../group/bctestdomcdl_reg.rss
 DEPENDS bctestdomcdl.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -61,8 +61,8 @@
 LIBRARY         apgrfx.lib
 LIBRARY         bctestutil.lib
 LIBRARY         efsrv.lib
-LIBRARY         menuinterface.lib
-LIBRARY         pbkeng.lib 
+LIBRARY         MenuInterface.lib
+LIBRARY         pbkeng.lib
 LIBRARY         eikdlg.lib 
 LIBRARY         eikctl.lib
 LIBRARY         eikcdlg.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -68,18 +68,18 @@
 LIBRARY	        efsrv.lib
 LIBRARY         fontutils.lib
 LIBRARY         uiklaf.lib 
-LIBRARY         fontprovider.lib
+LIBRARY         FontProvider.lib
 LIBRARY         gdi.lib 
 LIBRARY         bitgdi.lib 
-LIBRARY         aknskinsrv.lib 
+LIBRARY         aknskinsrv.lib
 LIBRARY         fbscli.lib 
 LIBRARY         bafl.lib 
 LIBRARY         aknlayout2.lib
-LIBRARY         aknlayout2adaptation.lib
+LIBRARY         AknLayout2Adaptation.lib
 LIBRARY         aknLayout2hierarchy.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         aknicon.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 
 // New registration resource defined.
 START RESOURCE ../group/bctestdomfntlay_reg.rss
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -75,13 +75,13 @@
 LIBRARY         aknnotifierwrapper.lib
 LIBRARY         akncapserverclient.lib
 LIBRARY         aknlistloadertfx.lib
-LIBRARY         AknJapaneseReading.lib
+LIBRARY         aknjapanesereading.lib
 
-LIBRARY         AknMemoryCardUi.lib
+LIBRARY         aknmemorycardui.lib
 LIBRARY         aknlayout2.lib
-LIBRARY         aknlayout2adaptation.lib
+LIBRARY         AknLayout2Adaptation.lib
 LIBRARY         aknLayout2hierarchy.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         pslnengine.lib
 
 START RESOURCE ../group/bctestdomnotifier_reg.rss
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -67,7 +67,7 @@
 LIBRARY         bctestutil.lib
 LIBRARY	        efsrv.lib
 LIBRARY         egul.lib
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 
 START RESOURCE ../group/bctestdompopup_reg.rss
 DEPENDS bctestdompopup.rsg
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp
--- a/uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -56,17 +56,17 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
-LIBRARY         EUSER.LIB   
-LIBRARY         WS32.LIB
-LIBRARY         CONE.LIB
-LIBRARY         EIKCORE.LIB 
-LIBRARY         AVKON.LIB
-LIBRARY         APPARC.LIB
+LIBRARY         euser.lib
+LIBRARY         ws32.lib
+LIBRARY         cone.lib
+LIBRARY         eikcore.lib
+LIBRARY         avkon.lib
+LIBRARY         apparc.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         efsrv.lib
 LIBRARY	        apgrfx.lib
-LIBRARY         commonengine.lib
-LIBRARY         CentralRepository.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         centralrepository.lib
 LIBRARY         bafl.lib
 LIBRARY         sysutil.lib
 LIBRARY         estor.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp
--- a/uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -44,9 +44,9 @@
 LIBRARY    cone.lib
 LIBRARY    eikcore.lib
 LIBRARY    aknnotify.lib
-LIBRARY    commonengine.lib
+LIBRARY    CommonEngine.lib
 LIBRARY    avkon.lib
-LIBRARY    CentralRepository.lib
+LIBRARY    centralrepository.lib
 LIBRARY    sysutil.lib
 
 #if defined(WINS) && !defined(WINSB)
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/AknButton.cpp
--- a/uifw/EikStd/coctlsrc/AknButton.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/AknButton.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -264,6 +264,9 @@
 
     // Sets bitmaps to resource provider (if one exists)
     void SetProviderPressedBmpsL();
+    
+    //Verify new rectagle size equals to the original
+    TBool TextRectSizeChanged( TRect aNewRect );
    
 private: // Data
 
@@ -293,6 +296,7 @@
     TBool iFeedbackEnabled;
     TAknsItemID iBackgroundSkinIID;
     TRect iBgFrameRect;
+    TRect iTextRect;
     };
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -327,6 +331,7 @@
     iIconSize = layoutRect.Rect().Size();
     iFlags.Set( EUseDefaultIconSize );
     iFlags.Set( EUseDefaultMargins );
+    iTextRect = TRect::EUninitialized;
     }
 
 // -----------------------------------------------------------------------------
@@ -517,6 +522,20 @@
         }
     }
     
+//Verify new rectangle size equals to the original
+TBool CAknButtonExtension::TextRectSizeChanged( TRect aNewRect )
+    {
+    TBool result( ETrue );
+    if ( !iTextRect.IsEmpty() && !aNewRect.IsEmpty() )
+        {
+        if ( iTextRect.Width() == aNewRect.Width() 
+                && iTextRect.Height() == aNewRect.Height() )
+            {
+            result = EFalse;
+            }
+        }
+    return result;
+    }
     
 
 //
@@ -1682,7 +1701,6 @@
         }
     iExtension->HandleFeedbackAreaChange();
     SetFrameIDs(); 
-    ConvertTextToVisualAndClip();
     }
 
 // -----------------------------------------------------------------------------
@@ -2257,7 +2275,6 @@
         TRAP_IGNORE( CreatePressedDownFrameL() );
         }
     SetFrameRects(); 
-    ConvertTextToVisualAndClip(); 
 
     iExtension->HandleFeedbackAreaChange();
     }
@@ -2829,19 +2846,12 @@
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::SetButtonFlags( const TInt aFlags )
-    {
+    {    
     if ( !( iFlags & KAknButtonNoFrame ) )
         {
         if ( aFlags & KAknButtonNoFrame ) 
             {
-            iExtension->iMargins.SetAllValuesTo( 0 );
-            ConvertTextToVisualAndClip();
-            }
-        // aFlags does not include KAknButtonNoFrame
-        else if ( iFlags & KAknButtonTextInsideFrame != 
-                aFlags & KAknButtonTextInsideFrame )
-            {
-            ConvertTextToVisualAndClip(); 
+            iExtension->iMargins.SetAllValuesTo( 0 );         
             }
         }
     if ( aFlags & KAknButtonHitTest )
@@ -2853,14 +2863,6 @@
         {
         TRAP_IGNORE ( CreatePressedDownFrameL() );
         }
-    if ( iFlags & KAknButtonNoFrame && !( aFlags & KAknButtonNoFrame ) )
-        {
-        SetFrameIDs(); 
-        if ( aFlags & KAknButtonTextInsideFrame )
-            {
-            ConvertTextToVisualAndClip(); 
-            }
-        }
     iFlags = aFlags;
     }
 
@@ -2957,7 +2959,7 @@
 EXPORT_C void CAknButton::SetTextFont( const CFont* aFont )
     {
     iFont = aFont;
-    ConvertTextToVisualAndClip(); 
+    ConvertTextToVisualAndClip( iExtension->iTextRect ); 
     }
 
 // -----------------------------------------------------------------------------
@@ -3522,25 +3524,15 @@
 //
 void CAknButton::DrawTextButton( CWindowGc& aGc ) const
     {
+    TRect textRect;
+    
+    TRect iconRect; //this is no use
+    GetCurrentStateTextAndIconRect( iconRect, textRect );
+      
     CAknButtonState* state = State();
-    if ( !state || !state->HasText() )
-        return;
-
-    if ( state->TextChanged() )
+    if ( state->TextChanged() || iExtension->TextRectSizeChanged( textRect ) )
         {
-        ConvertTextToVisualAndClip(); 
-        }
-
-    TRect textRect = iExtension->iMargins.InnerRect( Rect() );
-
-    if ( !( iFlags & KAknButtonNoFrame ) && 
-         ( iFlags & KAknButtonTextInsideFrame ) )
-        {
-        TAknLayoutRect center;
-        center.LayoutRect( Rect(), 
-            AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
-
-        textRect = center.Rect();
+        ConvertTextToVisualAndClip( textRect ); 
         }
     DrawText( aGc, textRect ); 
     }
@@ -3608,13 +3600,13 @@
 //
 void CAknButton::DrawIconButton( CWindowGc& aGc ) const
     {
-    TRect iconRect( iExtension->iMargins.InnerRect( Rect() ) );
+    TRect iconRect;
+    TRect textRect; 
+    GetCurrentStateTextAndIconRect( iconRect, textRect );
     
     aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
 
     const CGulIcon* icon = GetCurrentIcon();
-    if ( !icon )
-        return;
 
     CFbsBitmap* buttonBmp = icon->Bitmap();
     CFbsBitmap* buttonMask = icon->Mask();
@@ -3696,102 +3688,24 @@
     if ( !state  || !state->HasText() )
         {
         return;
-        }
-    if ( state->TextChanged() )
-        {
-        ConvertTextToVisualAndClip(); 
-        }
+        }   
     
     const CGulIcon* icon = GetCurrentIcon();
-    if ( !icon )
-        {
-        return;
-        }
-
-    TRect rect = iExtension->iMargins.InnerRect( Rect() );
+
+   
     TRect iconRect;
     TRect textRect;
+    GetCurrentStateTextAndIconRect( iconRect, textRect );
     
-    if ( !( iFlags & KAknButtonNoFrame ) &&
-          ( iFlags & KAknButtonTextInsideFrame ))
-        {
-        TAknLayoutRect centerLayout;
-        centerLayout.LayoutRect( rect,
-        AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
-        rect = centerLayout.Rect();
-        }
-
     CFbsBitmap* buttonBmp = icon->Bitmap();
     CFbsBitmap* buttonMask = icon->Mask();
     TSize iconSize ( buttonBmp->SizeInPixels());
     
-    // Set rects for icon and text according to their positioning
-    // First icon rect according to icon size - rest is for text
-    
-    switch ( iExtension->iTextAndIconAlignment )        
+   
+    if ( state->TextChanged() || iExtension->TextRectSizeChanged( textRect ) )
         {
-        case EIconBeforeText:
-            if ( AknLayoutUtils::LayoutMirrored() ) 
-                {
-                textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-                rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
-                iconRect.SetRect( rect.iTl.iX + 
-                    rect.Width() -iconSize.iWidth,
-                rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );    
-                }
-            else
-                {
-                iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-                rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
-                textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
-                rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );    
-                }
-            
-            break;
-            
-        case EIconAfterText:
-            if ( AknLayoutUtils::LayoutMirrored() ) 
-                {
-                iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-                rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
-                textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
-                rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );    
-                }
-            else
-                {
-                textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-                rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
-                iconRect.SetRect( rect.iTl.iX + 
-                    rect.Width() -iconSize.iWidth,
-                rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
-                }
-            break;
-        
-        case EIconOverText:
-            iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-            rect.iBr.iX, rect.iTl.iY + iconSize.iHeight );
-            textRect.SetRect( rect.iTl.iX, rect.iTl.iY + iconSize.iHeight,
-            rect.iBr.iX, rect.iBr.iY );
-            break;
-            
-        case EIconUnderText:
-            textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-            rect.iBr.iX, rect.iBr.iY - iconSize.iHeight );
-            iconRect.SetRect( rect.iTl.iX, rect.iBr.iY - iconSize.iHeight,
-            rect.iBr.iX, rect.iBr.iY );
-            break;
-
-        case EOverlay:
-            {
-            textRect = rect;
-            iconRect = rect;
-            }
-            break;
-            
-        default:
-            return;
+        ConvertTextToVisualAndClip( textRect ); 
         }
-
     // Draw icon
     TPoint iconPoint;
     switch ( iExtension->iHorizontalIconAlignment )
@@ -4541,6 +4455,13 @@
         iHelpNote->SetTimeDelayBeforeShow( iHelpNoteWaitInterval );
         iHelpNote->SetTimePopupInView( iHelpNoteInViewInterval );
         iHelpNote->SetTooltipModeL( ETrue );
+        
+        //When state changed, empty rect to enable recalculate the 
+        //visual text if text exists in current state.
+        if ( !(iExtension->iTextRect.IsEmpty()) )
+            {
+            iExtension->iTextRect = TRect::EUninitialized;
+            }
         }
     }
 
@@ -4625,7 +4546,7 @@
 // CAknButton::ConvertTextToVisualAndClip
 // -----------------------------------------------------------------------------
 //
-void CAknButton::ConvertTextToVisualAndClip() const
+void CAknButton::ConvertTextToVisualAndClip( const TRect& aRect ) const
     {
     CAknButtonState* state = State();
     if ( !state || !state->HasText() )
@@ -4637,18 +4558,22 @@
         return;
         }
 
-    TRect textRect = iExtension->iMargins.InnerRect( Rect() );
-
-    if ( !( iFlags & KAknButtonNoFrame ) && 
-         ( iFlags & KAknButtonTextInsideFrame ) )
+    TRect textRect( aRect );
+    //Using given rect to calculate the visual text if it's not empty.
+    if ( !textRect.IsEmpty() )
         {
-        TAknLayoutRect center;
-        center.LayoutRect( Rect(), 
-            AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
-
-        textRect = center.Rect();
+        iExtension->iTextRect = textRect;
         }
-
+    //Calculate text area.
+    //This branch means that it's the first calling after the state changed
+    //or client using new font before this is shown. 
+    else 
+        {
+        TRect iconRect;
+        GetCurrentStateTextAndIconRect( iconRect, textRect );
+        iExtension->iTextRect = textRect;
+        }
+   
     TInt clipWidth = textRect.Width();
 
     const CFont* font = iFont;
@@ -4665,6 +4590,135 @@
         clipWidth,
         clipWidth );
     }
+      
+// -----------------------------------------------------------------------------
+// CAknButton::GetCurrentStateTextAndIconRect()
+// Get rect for icon and text of the current button state .
+// -----------------------------------------------------------------------------
+//
+void CAknButton::GetCurrentStateTextAndIconRect( TRect& aIconRect, 
+        TRect& aTextRect ) const
+    {
+    TRect iconRect( TRect::EUninitialized ) ;
+    TRect textRect( TRect::EUninitialized );
+    
+    CAknButtonState* state = State();
+    
+    //Return directly if no state
+    if ( !state )
+        {
+        aIconRect = iconRect;
+        aTextRect = textRect;
+        return;
+        }
+    
+    TBool hasText( state->HasText() );
+    TBool hasIcon( EFalse );  
+
+    const CGulIcon* icon = GetCurrentIcon();
+    if ( icon )
+        {
+        hasIcon = ETrue;
+        }  
+    
+    TRect rect = iExtension->iMargins.InnerRect( Rect() );    
+    
+    //Icon area is not effected by the frame flags.
+    if ( hasIcon )
+        {
+        iconRect = rect;
+        }
+    
+    if ( !( iFlags & KAknButtonNoFrame ) &&
+          ( iFlags & KAknButtonTextInsideFrame ))
+        {
+        TAknLayoutRect centerLayout;
+        centerLayout.LayoutRect( rect,
+        AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
+        rect = centerLayout.Rect();
+        }
+    
+    if ( hasText )
+        {
+        textRect = rect;
+        }
+ 
+
+    if ( hasText && hasIcon )
+        {
+        CFbsBitmap* buttonBmp = icon->Bitmap();
+        CFbsBitmap* buttonMask = icon->Mask();
+        TSize iconSize ( buttonBmp->SizeInPixels());
+            
+            // Set rects for icon and text according to their positioning
+            // First icon rect according to icon size - rest is for text
+            
+        switch ( iExtension->iTextAndIconAlignment )        
+            {
+            case CAknButton::EIconBeforeText:
+                if ( AknLayoutUtils::LayoutMirrored() ) 
+                    {
+                    textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+                    rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
+                    iconRect.SetRect( rect.iTl.iX + 
+                        rect.Width() -iconSize.iWidth,
+                    rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );    
+                    }
+                else
+                    {
+                    iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+                    rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
+                    textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
+                    rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );    
+                    }
+                
+                break;
+                
+            case CAknButton::EIconAfterText:
+                if ( AknLayoutUtils::LayoutMirrored() ) 
+                    {
+                    iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+                    rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
+                    textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
+                    rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );    
+                    }
+                else
+                    {
+                    textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+                    rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
+                    iconRect.SetRect( rect.iTl.iX + 
+                        rect.Width() -iconSize.iWidth,
+                    rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
+                    }
+                break;
+            
+            case CAknButton::EIconOverText:
+                iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+                rect.iBr.iX, rect.iTl.iY + iconSize.iHeight );
+                textRect.SetRect( rect.iTl.iX, rect.iTl.iY + iconSize.iHeight,
+                rect.iBr.iX, rect.iBr.iY );
+                break;
+                
+            case CAknButton::EIconUnderText:
+                textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+                rect.iBr.iX, rect.iBr.iY - iconSize.iHeight );
+                iconRect.SetRect( rect.iTl.iX, rect.iBr.iY - iconSize.iHeight,
+                rect.iBr.iX, rect.iBr.iY );
+                break;
+
+            case CAknButton::EOverlay:
+                {
+                textRect = rect;
+                iconRect = rect;
+                }
+                break;
+            default:
+                break; //Do nothing.
+            }            
+        }
+    aTextRect = textRect;
+    aIconRect = iconRect;
+    }
 // -----------------------------------------------------------------------------
 // CAknButton::TouchArea
 // Returns the button touchable area.
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EIKCOCTL.MMP
--- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Thu Aug 19 10:11:06 2010 +0300
@@ -155,18 +155,18 @@
 LIBRARY         avkon.lib
 LIBRARY         tagma.lib
 LIBRARY         aknpictograph.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         aknskins.lib
 LIBRARY         bitgdi.lib
 LIBRARY         featmgr.lib
 LIBRARY         aknicon.lib
 LIBRARY         jplangutil.lib
-LIBRARY         NumberGrouping.lib
+LIBRARY         numbergrouping.lib
 LIBRARY         CommonEngine.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         FontProvider.lib
 LIBRARY         EikCoCtlLaf.lib
-LIBRARY         AknCapServerClient.lib
+LIBRARY         akncapserverclient.lib
 LIBRARY         servicehandler.lib
 LIBRARY         hlplch.lib
 LIBRARY         centralrepository.lib
@@ -182,14 +182,14 @@
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 LIBRARY         aknlistloadertfx.lib
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
-LIBRARY         AknLayout2.lib
+LIBRARY         aknlayout2.lib
 LIBRARY         eikdlg.lib
 LIBRARY         akntransitionutils.lib
 DEFFILE EIKCOCTL.DEF
-LIBRARY         fontutils.lib 
+LIBRARY         fontutils.lib
 LIBRARY         aknphysics.lib
 
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 START WINS
 BASEADDRESS     0x40B00000
 END
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EIKEDWIN.CPP
--- a/uifw/EikStd/coctlsrc/EIKEDWIN.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKEDWIN.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -3151,11 +3151,15 @@
                 {
                 TRAP_IGNORE( edwinState->ReportAknEdStateEventL( 
                     MAknEdStateObserver::EAknSyncEdwinState ) );
-                if ( edwinState->Flags() & EAknEditorFlagHideTextView )
+                // if text view is already hidden and editor loses focus, display text view.
+				if ( ( edwinState->Flags() & EAknEditorFlagHideTextView ) &&
+                     ( iEdwinExtension && iEdwinExtension->iTextViewHidden ) )
                     {
                     iTextView->MakeVisible( ETrue );
                     edwinState->SetFlags( edwinState->Flags() & 
                         ~EAknEditorFlagHideTextView );
+                    iEdwinExtension->iTextViewHidden = EFalse;                    
+                    DrawDeferred();
                     }
                 }
             else
@@ -8516,18 +8520,42 @@
         TRAP_IGNORE( ReportChinesePopupEventL( chinesePopup == 0 ) );
         }
     
-    if ( iTextView )
-        {
-        if ( ( aNewFlags & EAknEditorFlagHideTextView )
-                && !( aOldFlags & EAknEditorFlagHideTextView ) )
+    // To reduce power consumption, text view should be hidden when full screen Touch
+    // Input is open and editor is covered by it, for user can not see editor in this 
+    // case. When full screen Touch Input is open, FEP will set flag EAknEditorFlagHideTextView 
+    // to notify editor the text view should be hidden. But we have to check if the feature 
+    // of partial screen input is enabled at the same time, for full screen Touch Input window 
+    // will only occupy part of the screen if the feature is eanbled and editor is still visible 
+    // to user. So editor can only be hidden in such situation: full screen Touch Input is open 
+    // and partial screen feature is disabled.
+    // In the contrary situations (full screen touch input is closed or partial screen 
+    // feature is enabled), text view has to be shown so editor can work as normal.
+    if ( iTextView && iEdwinExtension )
+        {
+        TBool textViewHideEnabled( ( aNewFlags & EAknEditorFlagHideTextView ) &&
+            !( aOldFlags & EAknEditorFlagHideTextView ) );
+
+        TBool textViewHideDisabled( !( aNewFlags & EAknEditorFlagHideTextView ) && 
+            ( aOldFlags & EAknEditorFlagHideTextView ) );
+
+        TBool partialScreenEnabled( ( aNewFlags & EAknEditorFlagEnablePartialScreen ) &&
+            !( aOldFlags & EAknEditorFlagEnablePartialScreen ) );
+
+        TBool partialScreenDisabled( !( aNewFlags & EAknEditorFlagEnablePartialScreen ) && 
+            ( aOldFlags & EAknEditorFlagEnablePartialScreen ) );
+         
+        if ( ( textViewHideEnabled && 
+                !( aNewFlags & EAknEditorFlagEnablePartialScreen ) ) ||
+             ( partialScreenDisabled && ( aNewFlags & EAknEditorFlagHideTextView ) ) )
             {
             iTextView->MakeVisible( EFalse );
-            }
-        else if ( ( aOldFlags & EAknEditorFlagTouchInputModeOpened )
-                && !( aNewFlags & EAknEditorFlagTouchInputModeOpened ) )
+            iEdwinExtension->iTextViewHidden = ETrue;
+            }
+        else if ( iEdwinExtension->iTextViewHidden && ( textViewHideDisabled || partialScreenEnabled ) )
             {
             iTextView->MakeVisible( ETrue );
             DrawNow();
+            iEdwinExtension->iTextViewHidden = EFalse;            
             }
         }
     }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EIKLBI.CPP
--- a/uifw/EikStd/coctlsrc/EIKLBI.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKLBI.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -38,7 +38,7 @@
 #include "laflbx.h"
 #include "akntrace.h"
 
-const TUint KListItemDrawerAllowedFlags = 0x1fff;
+const TUint KListItemDrawerAllowedFlags = 0x3fff;
 
 const TInt KDefaultMarkColumnWidth = 10;
 const TInt KDefaultMarkGutter = 2;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EIKLBV.CPP
--- a/uifw/EikStd/coctlsrc/EIKLBV.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKLBV.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -1500,6 +1500,48 @@
     }
 
 
+// ---------------------------------------------------------------------------
+// Sets all items selected.
+// ---------------------------------------------------------------------------
+//
+void CListBoxView::SelectAllL( TBool aDrawItems )
+    {
+    _AKNTRACE_FUNC_ENTER;
+    
+    __ASSERT_DEBUG( iSelectionIndexes, 
+                    Panic( EEikPanicListBoxNoSelIndexArray ) );
+    __ASSERT_DEBUG( iModel, Panic( EEikPanicListBoxNoModel ) );
+    
+#ifdef RD_UI_TRANSITION_EFFECTS_LIST
+    MAknListBoxTfxInternal* transApi = CAknListLoader::TfxApiInternal( iGc );
+#endif // RD_UI_TRANSITION_EFFECTS_LIST    
+    
+    ClearSelection();
+    TInt numItems = iModel->NumberOfItems();
+    
+    for ( TInt i = 0; i < numItems; i++ )
+        {
+        if ( !iItemDrawer->Properties( i ).IsSelectionHidden() ) 
+            { 
+#ifdef RD_UI_TRANSITION_EFFECTS_LIST
+            if ( transApi )
+                {
+                transApi->Invalidate( MAknListBoxTfxInternal::EListItem, i );
+                }
+#endif // RD_UI_TRANSITION_EFFECTS_LIST
+            
+            iSelectionIndexes->AppendL( i );
+            
+            if ( aDrawItems )
+                {
+                DrawItem( i );
+                }
+            }
+        }
+    _AKNTRACE_FUNC_EXIT;
+    }
+
+
 // class CSnakingListBoxView
 
 EXPORT_C CSnakingListBoxView::CSnakingListBoxView()
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EIKLBX.CPP
--- a/uifw/EikStd/coctlsrc/EIKLBX.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKLBX.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -1046,9 +1046,10 @@
     if ( aExtensionId == MAknMarkingCollection::TYPE )
         {
         a0 = static_cast<MAknMarkingCollection*>( this );
-        }
-
-    return KErrNone;
+        return KErrNone;
+        }
+
+    return KErrNotFound;
     }
 
 
@@ -1115,7 +1116,7 @@
         if ( index >= 0 && 
                 !iListBox.iItemDrawer->Properties( index ).IsSelectionHidden() )
             {
-            iListBox.View()->SelectItemL( iListBox.CurrentItemIndex() );
+            iListBox.View()->SelectItemL( index );
             }
         }
     _AKNTRACE_FUNC_EXIT;
@@ -1129,16 +1130,11 @@
 void CListBoxExt::MarkAllL()
     {
     _AKNTRACE_FUNC_ENTER;
-
-    if ( iListBox.MarkingMode() )
-        {       
-        for ( TInt i = 0; i < iListBox.Model()->NumberOfItems(); ++i )
-            {
-            if ( !iListBox.iItemDrawer->Properties( i ).IsSelectionHidden() )
-                {
-                iListBox.View()->SelectItemL( i );
-                }
-            }
+    
+    if ( iListBox.MarkingMode() && 
+            iListBox.Model()->NumberOfItems() > 0 )
+        {               
+        iListBox.View()->SelectAllL( ETrue );   
         }
     _AKNTRACE_FUNC_EXIT;
     }
@@ -1190,7 +1186,6 @@
     iLongTappedItem = iLastDownTappedItem;
     iLastDownTappedItem = KErrNotFound;
     iItemActionMenu->ShowMenuL( aPenEventScreenLocation, 0 );
-    IgnorePointerEventsUntilUp();
     iOldWinPos = iListBox.DrawableWindow()->OrdinalPosition();
     _AKNTRACE_FUNC_EXIT;
     }
@@ -3421,9 +3416,13 @@
     iView->ClearFlags(CListBoxView::EItemCountModified);
 
 
-    if ( iListBoxExt && iListBoxExt->iLongTappedItem != KErrNotFound )
-        {
-        iListBoxExt->EnableHighlight( EFalse );
+    if ( iListBoxExt->iItemActionMenu &&
+         iListBoxExt->iLongTappedItem != KErrNotFound )
+        {
+        // Item action menu is being shown and it needs to be closed when
+        // items are added or removed to the list array, otherwise the
+        // item specific commands may be targeted to the wrong item. 
+        iListBoxExt->iItemActionMenu->HideMenu();
         }
 
     FireItemChange();
@@ -3508,7 +3507,7 @@
     {
     _AKNTRACE_FUNC_ENTER;
     __ASSERT_DEBUG( iView, Panic( EEikPanicListBoxNoView ) );
-    //fix the bug EGGO-7SQA4S and EVSG-7TD9WZ     
+
     TInt curItemIndex = iView->CurrentItemIndex();
     if(curItemIndex >= 0 && curItemIndex < iModel->NumberOfItems() )
       {
@@ -3516,8 +3515,7 @@
       iView->SetTopItemIndex( newTopItemIndex );
       }
     iView->SetFlags(CListBoxView::EItemCountModified);
-    // following breaks lists in square layout, not needed in SERIES60?
-    //iView->CalcDataWidth();
+
     iView->CalcBottomItemIndex();
     UpdateScrollBarsL();
     UpdateScrollBarThumbs();
@@ -3527,7 +3525,7 @@
     FireItemChange();
     
     if ( iListBoxExt )
-        {    
+        {
         iListBoxExt->CheckScrollBarVisibility();
         // Physics engine world size needs to be updated here, otherwise aknphysics 
         // cone observer may block pointer events on new items. this can happen 
@@ -3536,7 +3534,17 @@
             {
             iListBoxExt->InitPhysicsL();
             }
-        }     
+        
+        if ( iListBoxExt->iItemActionMenu &&
+             iListBoxExt->iLongTappedItem != KErrNotFound )
+            {
+            // Item action menu is being shown and it needs to be closed when
+            // items are added or removed to the list array, otherwise the
+            // item specific commands may be targeted to the wrong item. 
+            iListBoxExt->iItemActionMenu->HideMenu();
+            }
+        }
+
     _AKNTRACE_FUNC_EXIT;
     }
 
@@ -5157,7 +5165,8 @@
             _AKNTRACE("TPointerEvent::EButton1Down");
             // For drag outside listbox
             iListBoxExt->iIsDownOnItem = pointerIsOverAnItem;
-            iListBoxExt->iLastPoint = pointerPos;
+            iListBoxExt->iLastPoint = pointerPos;            
+			iListBoxExt->iLongTappedItem = KErrNotFound;
 
             // update index of the last down tapped item
             iListBoxExt->iLastDownTappedItem = itemIndex;
@@ -6889,8 +6898,12 @@
 
     TBool blockEvent = EFalse;
     
-    TBool allowDragEvent( ( iListBoxFlags & ELeftDownInViewRect ) && !iListBoxExt->iScrollingDisabled );
-
+    // If tap down in listbox area, kinetic scrolling is enabled and style popup menu is not shown,
+    // drag event is sent to listbox.
+    TBool allowDragEvent( ( iListBoxFlags & ELeftDownInViewRect ) 
+            && !iListBoxExt->iScrollingDisabled 
+            && ( iListBoxExt->iSingleClickEnabled 
+                    && iListBoxExt->iLongTappedItem == KErrNotFound ) );
     
     switch ( aPointerEvent.iType )
         {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EIKMENUP.CPP
--- a/uifw/EikStd/coctlsrc/EIKMENUP.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKMENUP.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -6384,6 +6384,10 @@
         {
         resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_CHINESE;
         }
+    if (FeatureManager::FeatureSupported(KFeatureIdKorean))
+        {
+        resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_KOREAN;
+        }
     iExtension->ConstructMenuSctRowL( aSpecialChars, resourceId );
     }
 
@@ -6783,9 +6787,9 @@
 // CEikMenuPane::CleanLocalRef
 // -----------------------------------------------------------------------------
 //
-void CEikMenuPane::CleanLocalRef( TAny* any )
-    {
-    static_cast<CEikMenuPane*>( any )->iIsDeleted = NULL;
+void CEikMenuPane::CleanLocalRef( TAny* aParam )
+    {
+    static_cast<CEikMenuPane*>( aParam )->iIsDeleted = NULL;
     }
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/EikCcpu.cpp
--- a/uifw/EikStd/coctlsrc/EikCcpu.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EikCcpu.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -29,6 +29,9 @@
 const TInt KRightSoftkeyIndex = 2;
 const TInt KNullCommandId = -1;
 
+// declare the function IsCbaEmbeddedInDialog
+TBool IsCbaEmbeddedInDialog( const TInt& aFlags );
+
 /**
 * Internal extension class for CAknCcpuSupport.
 *
@@ -150,7 +153,7 @@
 			if( eikAppUi && eikAppUi->IsDisplayingDialog() && eikAppUi->TopFocusedControl() )
 				{
 				CEikDialog* dlg = eikAppUi->TopFocusedControl()->MopGetObject( dlg );
-				if ( dlg )
+				if ( dlg && IsCbaEmbeddedInDialog( dlg->DialogFlags() ) )
 					{
 					CEikButtonGroupContainer* currentCba = dlg->MopGetObject( currentCba );
 					
@@ -336,3 +339,19 @@
             }
 		}
 	}
+
+/**
+ * To detect if CBA is embedded in the diaplog.
+ * @param aFlags it should be CEikDialog::DialogFlags()
+ * @return if an CBA is embedded in the dialog return ETrue 
+ *         else return EFalse
+ */
+TBool IsCbaEmbeddedInDialog( const TInt& aFlags )
+    {
+    return !( aFlags & EEikDialogFlagFillAppClientRect ) &&
+        !( aFlags & EEikDialogFlagFillScreen ) &&
+        !( aFlags & EEikDialogFlagVirtualInput ) &&
+        !( aFlags & EEikDialogFlagNoEmbeddedSoftkeys );
+    }
+
+
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/aknitemactionmenu.cpp
--- a/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -186,7 +186,8 @@
         {
         if ( !iPopupMenu )
             {
-            iPopupMenu = CAknStylusPopUpMenu::NewL( this, TPoint() );
+            iPopupMenu = CAknStylusPopUpMenu::NewL( this, TPoint(), NULL,
+                    CAknStylusPopUpMenu::EConsumeKeyEvents );
             }
         iPopupMenu->Clear();
         iMenuData->AddMenuItemsToStylusPopupMenuL( iPopupMenu );
@@ -413,6 +414,21 @@
     _AKNTRACE_FUNC_EXIT;
     return markedItems;
     }
+
+
+// ---------------------------------------------------------------------------
+// CAknItemActionMenu::HideMenu
+// ---------------------------------------------------------------------------
+//
+void CAknItemActionMenu::HideMenu()
+    {
+    if ( iPopupMenu && !iProcessingCommand )
+        {
+        iPopupMenu->HideMenu();
+        }
+    }
+
+
 // ---------------------------------------------------------------------------
 // CAknItemActionMenu::CAknItemActionMenu
 // ---------------------------------------------------------------------------
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp
--- a/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -46,11 +46,13 @@
 //
 CAknStylusPopUpMenu::CAknStylusPopUpMenu( MEikMenuObserver* aObserver, 
     const TPoint& aPoint,
-    CAknPreviewPopUpController* aPopup ) 
+    CAknPreviewPopUpController* aPopup,
+    const TInt aFlags )
     : iPosition ( aPoint ),
      iMenuObserver( aObserver ),
      iPreviewPopup( aPopup ),
-     iPositionType( EPositionTypeLeftTop )
+     iPositionType( EPositionTypeLeftTop ),
+     iModeFlags ( aFlags )
     {
     }
 
@@ -83,6 +85,24 @@
     return self;
     }
 
+// ---------------------------------------------------------------------------
+// CAknStylusPopUpMenu::NewL
+// ---------------------------------------------------------------------------
+//
+CAknStylusPopUpMenu* CAknStylusPopUpMenu::NewL( MEikMenuObserver* aObserver,
+        const TPoint& aPoint,
+        CAknPreviewPopUpController* aPopup,
+        const TInt aFlags )
+    {
+    CAknStylusPopUpMenu* self = new ( ELeave ) CAknStylusPopUpMenu( aObserver,
+                                                                    aPoint,
+                                                                    aPopup,
+                                                                    aFlags );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
 
 // ---------------------------------------------------------------------------
 // CAknStylusPopUpMenu::NewL
@@ -181,11 +201,25 @@
     // if contoller exists, re-use it .
     if ( !iController )
         {
-        TRAPD( err, 
-               iController = CAknPreviewPopUpController::NewL( *iContent,
-                       CAknPreviewPopUpController::ELayoutSubMenu | 
-                       CAknPreviewPopUpController::EAutoMirror |
-                       CAknPreviewPopUpController::EDontClose ) );
+        TInt err ( KErrNone );
+
+        if ( iModeFlags & EConsumeKeyEvents )
+            {
+            TRAP( err, iController = CAknPreviewPopUpController::NewL(
+                    *iContent,
+                    CAknPreviewPopUpController::ELayoutSubMenu |
+                    CAknPreviewPopUpController::EAutoMirror |
+                    CAknPreviewPopUpController::EDontClose |
+                    CAknPreviewPopUpController::EConsumeKeys ) );
+            }
+        else
+            {
+            TRAP( err, iController = CAknPreviewPopUpController::NewL(
+                    *iContent,
+                    CAknPreviewPopUpController::ELayoutSubMenu |
+                    CAknPreviewPopUpController::EAutoMirror |
+                    CAknPreviewPopUpController::EDontClose ) );
+            }
         if ( err )
             {
             return;
@@ -485,6 +519,20 @@
         }
     }
 
+
+// ---------------------------------------------------------------------------
+// CAknStylusPopUpMenu::HideMenu
+// ---------------------------------------------------------------------------
+//
+void CAknStylusPopUpMenu::HideMenu()
+    {
+    if ( iController )
+        {
+        iController->HidePopUp();
+        }
+    }
+
+
 // -----------------------------------------------------------------------------
 // CAknStylusPopUpMenu::StartControllerIdleL
 // -----------------------------------------------------------------------------
@@ -535,7 +583,7 @@
 // CAknStylusPopUpMenu::CleanLocalRef
 // -----------------------------------------------------------------------------
 //
-void CAknStylusPopUpMenu::CleanLocalRef( TAny* any )
+void CAknStylusPopUpMenu::CleanLocalRef( TAny* aParam )
     {
-    static_cast<CAknStylusPopUpMenu*>( any )->iIsDeleted = NULL;
+    static_cast<CAknStylusPopUpMenu*>( aParam )->iIsDeleted = NULL;
     }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/eikcba.cpp
--- a/uifw/EikStd/coctlsrc/eikcba.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/eikcba.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -216,7 +216,8 @@
     ECbaItemSpecificSoftkeyInUse, // item specific softkey is in use
     ECbaItemSoftkeyDisabledByClient, // client has disabled item specific softkey
     ECbaMultipleMarkingActive, // multiple marking has changed RSK
-    ECbaCombinePaneUncovered // The combine pane in status pane is invisible.
+    ECbaCombinePaneUncovered, // The combine pane in status pane is invisible.
+    ECbaKeepItemSoftkeyVisible // No auto hide for item specific commands
     };
 
 enum TCbaLayers
@@ -1072,7 +1073,12 @@
         // CBA is embedded in another component (eg. dialog/popup/setting page
         iFlags.Set(ECbaEmbedded);
         }
-
+    
+    if ( aFlags & CEikButtonGroupContainer::EAlwaysShown )
+        {
+        iFlags.Set( ECbaKeepItemSoftkeyVisible  );
+        }
+    
     if ( aFlags & CEikButtonGroupContainer::EParentIsControl )
         {
         iFlags.Set( ECbaParentAsControl );
@@ -2252,6 +2258,30 @@
     if ( iFlags.IsSet( ECbaInsideDialog ) )
         {
         CAknButton* button = static_cast<CAknButton*>( groupCtrl.iControl );
+
+        if ( aCommandId == EAknSoftkeyEmergencyCall )
+            {
+            // Change the button to use "call button" (green) frame graphics
+            // in case of ECS call command to highlight the possibility
+            // of making an emergency call from the query.
+            button->SetBackgroundIds( KAknsIIDQsnFrButtonNormalAnswer,
+                                      KAknsIIDNone,
+                                      KAknsIIDNone,
+                                      KAknsIIDQsnFrButtonPressedAnswer,
+                                      KAknsIIDNone );
+            }
+        else
+            {
+            // Revert the frame graphics back to normal in case that a
+            // new command is added to the stack on top of the emergency
+            // call command (shouldn't happen though).
+            button->SetBackgroundIds( KAknsIIDQsnFrFunctionButtonNormal,
+                                      KAknsIIDQsnFrFunctionButtonPressed,
+                                      KAknsIIDQsnFrFunctionButtonInactive,
+                                      KAknsIIDQsnFrFunctionButtonPressed,
+                                      KAknsIIDQsnFrFunctionButtonInactive );
+            }
+
         button->AddStateL( NULL, NULL, NULL, NULL, *aText, KNullDesC, 0, aCommandId );
             
         if ( aText->Length() == 0 || !aText->Compare( _L(" ") ) )
@@ -2436,6 +2466,16 @@
             groupCtrl.iId     = buttonState->CommandId();
             groupCtrl.iLongId = 0;
                 
+            if ( aCommandId == EAknSoftkeyEmergencyCall )
+                {
+                // Revert the button's frame graphics to the normal ones.
+                button->SetBackgroundIds( KAknsIIDQsnFrFunctionButtonNormal,
+                                          KAknsIIDQsnFrFunctionButtonPressed,
+                                          KAknsIIDQsnFrFunctionButtonInactive,
+                                          KAknsIIDQsnFrFunctionButtonPressed,
+                                          KAknsIIDQsnFrFunctionButtonInactive );
+                }
+                
             if ( buttonState->Text().Length() == 0 ||
                  !buttonState->Text().Compare( _L(" ") ) )
                 {
@@ -2700,25 +2740,15 @@
 
         if ( iFlags.IsSet( ECbaEmbedded ) )
             {
-            TRect rect ( Rect() );
-            TAknLayoutRect layoutRect;
-            layoutRect.LayoutRect(
-                    rect, 
-                    AknLayoutScalable_Avkon::popup_sk_window_g1( 0 ) );
-            
-            // Button widths are calculated based on cba area width
-            // margin width is taken from layout
-            TInt margin = layoutRect.Rect().iTl.iX - rect.iTl.iX;
-            TInt buttonWidth = ( rect.Width() - margin * 2 ) / 2;
-            TSize buttonSize ( buttonWidth, layoutRect.Rect().Height() );
+            // The touch area for the softkeys will be larger than the actual
+            // softkey area (whole CBA area is used).
+            TInt buttonWidth = containerRect.Width() / 2;
+            TSize buttonSize( buttonWidth, containerRect.Height() );
                     
-            button1Rect = TRect(
-                    TPoint( rect.iTl.iX + margin, layoutRect.Rect().iTl.iY ),
-                    buttonSize );
-            button2Rect = TRect( 
-                    TPoint( button1Rect.iBr.iX, layoutRect.Rect().iTl.iY ), 
-                    TPoint( rect.iBr.iX - margin, 
-                            layoutRect.Rect().iBr.iY ) );
+            button1Rect.SetRect( containerRect.iTl, buttonSize );
+            button2Rect.SetRect( TPoint( button1Rect.iBr.iX,
+                                         containerRect.iTl.iY ), 
+                                 containerRect.iBr );
             }
         else if ( AknLayoutFlags() & EAknLayoutCbaInRightPane )
             {
@@ -7801,6 +7831,11 @@
 void CEikCba::UpdateItemSpecificSoftkey( CCoeControl& aControl, TBool aEnable )
     {
     _AKNTRACE_FUNC_ENTER;
+    if ( iFlags.IsSet( ECbaKeepItemSoftkeyVisible  ))
+        {
+        _AKNTRACE_FUNC_EXIT;
+        return;
+        }    
     TBool skEnabled( aControl.IsVisible() && !aControl.IsDimmed() );
     TBool changeState( EFalse );
     if ( !aEnable )
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/coctlsrc/smileymodel.cpp
--- a/uifw/EikStd/coctlsrc/smileymodel.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/smileymodel.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -409,7 +409,7 @@
 
 TBool HavePairedSymbol(const TDesC& aText, TInt aSmileyLength)
     {
-    char stack[5];
+    char stack[CSmileyManager::KMaxLength];
     TInt pos = 0;
     
     TInt i = aText.Length() - 1;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/dlgsrc/EIKDIALG.CPP
--- a/uifw/EikStd/dlgsrc/EIKDIALG.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/dlgsrc/EIKDIALG.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -2465,16 +2465,19 @@
     if ( !isForm )
         {
         SizeChanged();
-    
-        TInt lastPage =  ( iPageSelector->PageContainer()->NumPages() - 1 );
-        TInt pageIndex = 0;
-        CEikDialogPage* page;
-    
-        while ( pageIndex++ <= lastPage )
-            {
-            page = iPageSelector->PageContainer()->Page( pageIndex );
-            page->HandleResourceChange( KEikDynamicLayoutVariantSwitch );
-            }
+		}
+	
+    if( iPageSelector )
+    	{		
+		TInt lastPage =  ( iPageSelector->PageContainer()->NumPages() - 1 );
+		TInt pageIndex = 0;
+		CEikDialogPage* page( NULL );
+	
+		while ( pageIndex++ <= lastPage )
+			{
+			page = iPageSelector->PageContainer()->Page( pageIndex );
+			page->HandleResourceChange( KEikDynamicLayoutVariantSwitch );
+			}   
         }
 
    	if (iExtension)
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/dlgsrc/EIKDLG.MMP
--- a/uifw/EikStd/dlgsrc/EIKDLG.MMP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/dlgsrc/EIKDLG.MMP	Thu Aug 19 10:11:06 2010 +0300
@@ -73,7 +73,7 @@
 LIBRARY         avkon.lib
 LIBRARY         form.lib
 LIBRARY         fepbase.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         gdi.lib
 LIBRARY         aknskins.lib
 LIBRARY         fbscli.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/dlgsrc/EIKDPAGE.CPP
--- a/uifw/EikStd/dlgsrc/EIKDPAGE.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/dlgsrc/EIKDPAGE.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -1384,6 +1384,38 @@
             }
         }
 
+    // If control height is greater then screen. Make sure that edwin's cursor is visible
+    if (controlType == EEikCtEdwin && controlHeight > Rect().Height())
+        {
+        CEikEdwin* edwin = dynamic_cast<CEikEdwin*>(capCtrl->iControl); 
+        if (edwin)
+            {
+            TInt pos = edwin->CursorPos();
+            TRect linerect;
+            TRAP_IGNORE( linerect = edwin->TextLayout()->GetLineRectL(pos, pos) );
+            
+            TPoint capctrlpos = capCtrl->Position();
+            TPoint edwinpos = edwin->Position();
+            if (edwinpos.iY - capctrlpos.iY + (linerect.iTl.iY + linerect.iBr.iY)/2 > Rect().Height()/2) // cursor not fully visible
+                {
+                TInt offset = edwinpos.iY - capctrlpos.iY + (linerect.iTl.iY + linerect.iBr.iY)/2 - Rect().Height()/2;
+                if (topYPosOfControlWhichMustBeViewable + offset + Rect().Height() <= bottomYPosOfControlWhichMustBeViewable)
+                    {
+                    topYPosOfControlWhichMustBeViewable += offset;
+                    bottomYPosOfControlWhichMustBeViewable = topYPosOfControlWhichMustBeViewable + Rect().Height();
+                    }
+                else
+                    {
+                    topYPosOfControlWhichMustBeViewable = bottomYPosOfControlWhichMustBeViewable - Rect().Height();
+                    }
+                }
+            else
+                {
+                bottomYPosOfControlWhichMustBeViewable = topYPosOfControlWhichMustBeViewable + Rect().Height();
+                }
+            }
+        }
+ 
     SetDataPosition( topYPosOfControlWhichMustBeViewable, bottomYPosOfControlWhichMustBeViewable, aForceResize ); 
   
     if ( aLine != iLastExposedLine )
@@ -1937,9 +1969,10 @@
             AknLayoutScalable_Avkon::listscroll_form_pane(),  
             AknLayoutScalable_Avkon::scroll_pane_cp8());
             
-        TRect scrollBarParent( MainPane().Size() );
-    
-        AknLayoutUtils::LayoutVerticalScrollBar(iPageContainer->ScrollBar(), scrollBarParent, layout.LayoutLine());
+		//Using Rect() instead of main pane rect for supporting partial input mode.
+        //TRect scrollBarParent( MainPane().Size() );   
+        AknLayoutUtils::LayoutVerticalScrollBar(iPageContainer->ScrollBar(), Rect(), layout.LayoutLine());
+        
         if(!ScbState() &&  iCurrentLine!=-1 && iCurrentLine < iLines->Count() )
         	{
     		CEikCaptionedControl *ctrl = (*iLines)[iCurrentLine];
@@ -4409,32 +4442,15 @@
     iPageSelector = aPageSelector;
     }
 
-void CEikDialogPageContainer::SetPageFormSized()
+void CEikDialogPageContainer::SetPageFormSized(const TRect& aRect)
     {
     iForm = ETrue;
 
     //
     // Form layout
-    //
-    
-    /** Dialog page container and page have the same size */
-    TRect mainPaneRect;
-    AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-    mainPaneRect = TRect( mainPaneRect.Size() );    // Moving to point (0, 0)
-    TAknLayoutRect formPaneLt;
-    formPaneLt.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_form_pane().LayoutLine() );
-    formPaneLt.LayoutRect( formPaneLt.Rect(), AknLayoutScalable_Avkon::list_form_gen_pane().LayoutLine() );
+    //    
     
-    //
-    // End of form layout
-    //
-
-    if ( formPaneLt.Rect() != Rect() )
-        {
-        // TODO: use static method to do variation between traditional scrolling and panning when available
-        //SetRect( formPaneLt.Rect() );
-        SetRect( mainPaneRect );
-        }
+    SetRect(aRect);
 
     /** Only forms have line highlight animations. Animation creation is delayed
       * here.
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/dlgsrc/EIKDPSEL.CPP
--- a/uifw/EikStd/dlgsrc/EIKDPSEL.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/dlgsrc/EIKDPSEL.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -592,7 +592,7 @@
 
     if ( iIsForm )
         {
-        iPageContainer->SetPageFormSized();
+        iPageContainer->SetPageFormSized(Rect());
         }
     else
         {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/EikStd/srvuisrc/EIKSRVUI.MMP
--- a/uifw/EikStd/srvuisrc/EIKSRVUI.MMP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/EikStd/srvuisrc/EIKSRVUI.MMP	Thu Aug 19 10:11:06 2010 +0300
@@ -71,17 +71,17 @@
 LIBRARY         mediaclientaudio.lib
 LIBRARY         eiksrv.lib
 LIBRARY         avkon.lib
-LIBRARY         eikalert.lib
+LIBRARY         Eikalert.lib
 LIBRARY         apfile.lib
-LIBRARY         cdlengine.lib
-LIBRARY         commonengine.lib
+LIBRARY         CdlEngine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         aknnotify.lib
 LIBRARY         aknskins.lib
 LIBRARY         fbscli.lib
 LIBRARY         featmgr.lib
 LIBRARY         aknicon.lib
 LIBRARY         egul.lib
-LIBRARY         aknlayout2scalable.lib
+LIBRARY         AknLayout2Scalable.lib
 LIBRARY         oodmonitor.lib
 LIBRARY         uiklaf.lib
 LIBRARY         viewcli.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/eikctl/group/eikctl.mmp
--- a/uifw/eikctl/group/eikctl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/eikctl/group/eikctl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -88,18 +88,18 @@
 LIBRARY         insock.lib
 LIBRARY         fepbase.lib
 LIBRARY         avkon.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         aknskins.lib
 LIBRARY         numberconversion.lib
 LIBRARY         aknpictograph.lib
 LIBRARY         aknicon.lib
-LIBRARY         AknLayout2.lib
+LIBRARY         aknlayout2.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         centralrepository.lib
-LIBRARY         Lbs.lib
+LIBRARY         lbs.lib
 LIBRARY         bitgdi.lib
 LIBRARY         cenrepnotifhandler.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 LIBRARY  aknlistloadertfx.lib
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
@@ -109,7 +109,7 @@
 LIBRARY         aknphysics.lib
 
 // For trace log
-LIBRARY         AknNotify.lib
+LIBRARY         aknnotify.lib
 DEFFILE         EIKCTL.DEF
 
 START WINS
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/eikctl/src/EIKCLBD.CPP
--- a/uifw/eikctl/src/EIKCLBD.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/eikctl/src/EIKCLBD.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -2127,15 +2127,19 @@
                 }
             if ( AknsUtils::AvkonSkinEnabled() )
                 {
-                if ( iExtension->iTextColor != NULL )
-                    {
-                    textColor = iExtension->iTextColor;
-                    }
-                
-                if ( aHighlight && iExtension->iHighlightedTextColor != NULL )
-                    {
-                    textColor = iExtension->iHighlightedTextColor;
-                    }
+                CListBoxView* view = listbox->View();
+                TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor;
+                if ( !useOverrideColor )
+                   {                 
+                   if ( iExtension->iTextColor != NULL )
+                       {
+                       textColor = iExtension->iTextColor;
+                       }
+                   if ( aHighlight && iExtension->iHighlightedTextColor != NULL )
+                       {
+                       textColor = iExtension->iHighlightedTextColor;
+                       }
+                   }
                 }
                 
             const CFont* rowAndColFont=RowAndColumnFont(iExtension->iCurrentRow,column);
@@ -2611,15 +2615,15 @@
                     aGc.SetPenColor(aColors.iHighlightedText);
                     aGc.SetBrushColor(aColors.iHighlightedBack);    
                     }
-
-                if ( AknsUtils::AvkonSkinEnabled() )
+                CListBoxView* view = listbox->View();
+                TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor;
+                if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor )
                     {
-                    if (iExtension->iTextColor != NULL)
+                    if ( iExtension->iTextColor != NULL )
                         {
                         aGc.SetPenColor(iExtension->iTextColor);
                         }
-
-                    if (aHighlight && iExtension->iHighlightedTextColor != NULL)
+                    if ( aHighlight && iExtension->iHighlightedTextColor != NULL )
                         {
                         aGc.SetPenColor(iExtension->iHighlightedTextColor);
                         }
@@ -2836,12 +2840,8 @@
                 & CListItemDrawer::EMarkingModeEnabled &&
                 !aProperties.IsSelectionHidden() &&
                 iExtension->iMarkingIconArray &&
-#ifdef RD_TOUCH2_MARKING
                 iExtension->iMarkingIconArray->Count() == 
-                        KMarkingModeIconArraySize )
-#else
-                iExtension->iMarkingIconArray->Count() == 2 )
-#endif // RD_TOUCH2_MARKING            
+                        KMarkingModeIconArraySize )          
             {
             if ( AknLayoutUtils::LayoutMirrored() )
                 {
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/eikctl/src/EIKMFNE.CPP
--- a/uifw/eikctl/src/EIKMFNE.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/eikctl/src/EIKMFNE.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -104,6 +104,128 @@
     User::Panic(KPanicCat, aPanic);
     }
 
+NONSHARABLE_CLASS(CEikTimeEditorExtension) : public CBase, 
+	public CAknExtendedInputCapabilities::MAknEventObserver 
+    {
+public:
+    static CEikTimeEditorExtension* NewL();
+    virtual ~CEikTimeEditorExtension();
+private: 
+    CEikTimeEditorExtension();
+
+    void ConstructL();
+public:
+    /**
+     * From CAknExtendedInputCapabilities::MAknEventObserver
+     * Handle an event
+     *
+     * @since S60 v9.2
+     * @param aEvent An event, see TInputCapabilitiesEvent
+     * @param aParams Event dependent parameters
+     */
+
+    void HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams );
+public:
+    CEikTimeEditor * iEditor;
+    };
+
+CEikTimeEditorExtension* CEikTimeEditorExtension::NewL()
+    {
+	CEikTimeEditorExtension* self = new (ELeave) CEikTimeEditorExtension();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;
+    }
+
+CEikTimeEditorExtension::~CEikTimeEditorExtension()
+    {
+
+    }
+
+CEikTimeEditorExtension::CEikTimeEditorExtension()
+    {
+    }
+
+void CEikTimeEditorExtension::ConstructL()
+    {
+    }
+
+void CEikTimeEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* /*aParams*/ )
+	{
+    switch ( aEvent )
+        {
+        case CAknExtendedInputCapabilities::MAknEventObserver::EChangeAmPm:
+        	if ( iEditor )
+	            {
+        	    iEditor->ChangeAmPm();
+	            }
+            break;
+        }
+    return;
+	}
+
+
+NONSHARABLE_CLASS(CEikTimeAndDateEditorExtension) : public CBase, 
+	public CAknExtendedInputCapabilities::MAknEventObserver 
+    {
+public:
+    static CEikTimeAndDateEditorExtension* NewL();
+    virtual ~CEikTimeAndDateEditorExtension();
+private: 
+    CEikTimeAndDateEditorExtension();
+
+    void ConstructL();
+public:
+    /**
+     * From CAknExtendedInputCapabilities::MAknEventObserver
+     * Handle an event
+     *
+     * @since S60 v9.2
+     * @param aEvent An event, see TInputCapabilitiesEvent
+     * @param aParams Event dependent parameters
+     */
+
+    void HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams );
+public:
+    CEikTimeAndDateEditor * iEditor;
+    };
+
+CEikTimeAndDateEditorExtension* CEikTimeAndDateEditorExtension::NewL()
+    {
+	CEikTimeAndDateEditorExtension* self = new (ELeave) CEikTimeAndDateEditorExtension();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;
+    }
+
+CEikTimeAndDateEditorExtension::~CEikTimeAndDateEditorExtension()
+    {
+
+    }
+
+CEikTimeAndDateEditorExtension::CEikTimeAndDateEditorExtension()
+    {
+    }
+
+void CEikTimeAndDateEditorExtension::ConstructL()
+    {
+    }
+
+void CEikTimeAndDateEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* /*aParams*/ )
+	{
+    switch ( aEvent )
+        {
+        case CAknExtendedInputCapabilities::MAknEventObserver::EChangeAmPm:
+        	if ( iEditor )
+	            {
+        	    iEditor->ChangeAmPm();
+	            }
+            break;
+        }
+    return;
+	}
 NONSHARABLE_CLASS(CEikMfneExtension) : public CBase, public MCoeFepAwareTextEditor 
     {
 public:
@@ -165,6 +287,7 @@
     MTouchFeedback* iFeedback;
     TBool iLaunchPenInputAutomatic;
     TBool iPartialScreenInput;
+    TBool iChangeAmPm;
     };
 
 // Implementation of the extension
@@ -1930,6 +2053,7 @@
                     iExtension->iDisablePenInput = !( iExtension->iFingerSupport );                    
                     iExtension->iFingerParam = aFeatureParam; 
                     iExtension->iHighlightAll = ( iExtension->iFingerSupport &&
+                        !iExtension->iTouchActivated &&
                         aFeatureParam == EnableWithAllHighlight );                  
                     }
                 else
@@ -1967,6 +2091,26 @@
                     ret = KErrGeneral;
                     }
                 break;
+            case EChangeAmPm:
+                if ( iExtension )
+                    {
+                    iExtension->iChangeAmPm = aFeatureParam;
+                    TUint caps( iExtension->iExtendedInputCapabilities->Capabilities() );
+                    if ( aFeatureParam )
+                        {
+                        caps |= CAknExtendedInputCapabilities::EInputEditorAmPm;
+                        }
+                    else
+                        {
+                        caps &= ~CAknExtendedInputCapabilities::EInputEditorAmPm;
+                        }
+                    iExtension->iExtendedInputCapabilities->SetCapabilities( caps );
+                    }
+                else
+                    {
+                    ret = KErrGeneral;
+                    }
+                break;
             default:
                 ret = KErrNotSupported;
                 break;
@@ -2039,6 +2183,16 @@
                     ret = KErrGeneral;
                     }
                 break;
+            case EChangeAmPm:
+                if ( iExtension )
+                    {
+                    aFeatureParam = iExtension->iChangeAmPm;
+                    }
+                else
+                    {
+                    ret = KErrGeneral;
+                    }
+                break;
             default:
                 ret = KErrNotSupported;
                 break;
@@ -2059,7 +2213,8 @@
         EDisablePenInput,
         EFingerSupport,
         ELaunchPenInputAutomatic,
-        EPartialScreenInput
+        EPartialScreenInput,
+        EChangeAmPm
         };
         
     TBool ret = EFalse;
@@ -2448,6 +2603,8 @@
                     }
                 else 
                     {
+
+
                     // Note!! This is taking responsibility away from the CEikMfne Field for drawing
                     // Skin background is drawn for the fields here
                     if( SkinningBackground() && !iFlags[EUseOverrideColors] )
@@ -3150,7 +3307,8 @@
     void SetUninitialised(TBool aUninitialised);
     TBool IsUninitialised() const;
     void RefreshFromLocale(const CFont& aFont);
-
+    void ChangeAmPm();
+    TBool HasAmPm();
 private:
     void AddAmPmFieldsIfNecessaryL(CEikMfne& aOwner, TAmPm aAmPm, TLocalePos aPos);
 private:
@@ -3421,7 +3579,25 @@
         (iAmPm && iAmPm->IsUninitialised());
     }
 
-
+void CTimeEditor::ChangeAmPm()
+	{
+	if ( iAmPm && HasAmPm() )
+		{
+	    if ( iAmPm->IdOfCurrentSymbolicItem() == EPm )
+	    	{
+	        iAmPm->SetCurrentSymbolicItemToId(EAm);
+	    	}
+	    else
+	    	{
+            iAmPm->SetCurrentSymbolicItemToId(EPm);
+	    	}
+		}
+	}
+
+TBool CTimeEditor::HasAmPm()
+	{
+	return iAmPm && ( iFlags&EIn12HourFormat );
+	}
 // CDateEditor
 
 class CDateEditor : public CBase
@@ -3819,7 +3995,9 @@
 EXPORT_C CEikTimeEditor::~CEikTimeEditor()
     {
     AKNTASHOOK_REMOVE();
+    iExtension->iExtendedInputCapabilities->UnregisterObserver(iTimeExtension);
     delete iTimeEditor;
+    delete iTimeExtension;
     }
 
 EXPORT_C void CEikTimeEditor::ConstructL(const TTime& aMinimumTime, const TTime& aMaximumTime, const TTime& aInitialTime, TUint32 aFlags)
@@ -3830,6 +4008,10 @@
     iTimeEditor->ConstructFieldsL(*this, aInitialTime, *Font());
     iTimeEditor->RefreshFromLocale(*Font());
     DoSetMinimumAndMaximum(aMinimumTime, aMaximumTime);
+    iTimeExtension = CEikTimeEditorExtension::NewL();
+    iTimeExtension->iEditor = this;
+    iExtension->iExtendedInputCapabilities->RegisterObserver(iTimeExtension);
+    SetFeature( CEikMfne::EChangeAmPm, iTimeEditor->HasAmPm() );
     }
 
 EXPORT_C void CEikTimeEditor::SetMinimumAndMaximum(const TTime& aMinimumTime, const TTime& aMaximumTime)
@@ -3925,6 +4107,19 @@
     return iTimeEditor->IsUninitialised();
     }
 
+void CEikTimeEditor::ChangeAmPm( )
+	{
+	TInt para( 0 );
+    GetFeature( CEikMfne::EChangeAmPm, para );
+	if ( para )
+		{
+	    iTimeEditor->ChangeAmPm();
+	    DrawDeferred();
+	    TRAP_IGNORE ( ReportEventL( MCoeControlObserver::EEventStateChanged ) );
+        ReportUpdate();
+		}
+	return;
+	}
 // CEikDateEditor
 
 EXPORT_C CEikDateEditor::CEikDateEditor()
@@ -4107,8 +4302,10 @@
 EXPORT_C CEikTimeAndDateEditor::~CEikTimeAndDateEditor()
     {
     AKNTASHOOK_REMOVE();
+    iExtension->iExtendedInputCapabilities->UnregisterObserver(iTimeDateExtension);
     delete iTimeEditor;
     delete iDateEditor;
+    delete iTimeDateExtension;
     }
 
 EXPORT_C void CEikTimeAndDateEditor::ConstructL(const TTime& aMinimumTimeAndDate, const TTime& aMaximumTimeAndDate,
@@ -4154,6 +4351,10 @@
     // do stuff that can only be done when all leaving functions have successfully been done
     if (aInterveningText)
         interveningText->SetText(aInterveningText);
+    iTimeDateExtension = CEikTimeAndDateEditorExtension::NewL();
+    iTimeDateExtension->iEditor = this;
+    iExtension->iExtendedInputCapabilities->RegisterObserver(iTimeDateExtension);
+    SetFeature( CEikMfne::EChangeAmPm, iTimeEditor->HasAmPm() );
     }
 
 EXPORT_C void CEikTimeAndDateEditor::SetMinimumAndMaximum(const TTime& aMinimumTimeAndDate, const TTime& aMaximumTimeAndDate)
@@ -4293,6 +4494,19 @@
     {
     }
 
+void CEikTimeAndDateEditor::ChangeAmPm( )
+	{
+	TInt para( 0 );
+    GetFeature( CEikMfne::EChangeAmPm, para );
+	if ( para )
+		{
+	    iTimeEditor->ChangeAmPm();
+	    DrawDeferred();
+	    TRAP_IGNORE ( ReportEventL( MCoeControlObserver::EEventStateChanged ) );
+        ReportUpdate();
+		}
+	return;
+	}
 
 // CEikDurationEditor
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/eikctl/src/EIKSECED.CPP
--- a/uifw/eikctl/src/EIKSECED.CPP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/eikctl/src/EIKSECED.CPP	Thu Aug 19 10:11:06 2010 +0300
@@ -942,7 +942,8 @@
     editorState->SetFlags( EAknEditorFlagNoLRNavigation |
                            EAknEditorFlagLatinInputModesOnly |
                            EAknEditorFlagNoT9 |
-                           EAknEditorFlagUseSCTNumericCharmap );
+                           EAknEditorFlagUseSCTNumericCharmap |
+                           EAknEditorFlagAvkonSecretEditor );
 
     editorState->SetDefaultInputMode(EAknEditorSecretAlphaInputMode);
     editorState->SetCurrentInputMode(EAknEditorSecretAlphaInputMode);
@@ -1208,7 +1209,7 @@
     TInt textWidth( iRevealSecretText ? 
         iFont->TextWidthInPixels( *iSecCharArr ) : 
         iFont->CharWidthInPixels( KSecretChar ) * pos );
-    TInt x;
+    TInt x( 0 );
     if ( iExtension )
     	{
 		if ( iAlign == CGraphicsContext::ELeft )
@@ -1278,11 +1279,11 @@
         TInt flags( edwinState->Flags() );
         if ( aEnable )
             {
-            flags &= ~EEikEdwinAvkonDisableCursor;
+            flags |= EAknEditorFlagTextCursorVisible;
             }
         else
             {
-            flags |= EEikEdwinAvkonDisableCursor;
+            flags &= ~EAknEditorFlagTextCursorVisible;
             }
         edwinState->SetFlags( flags );
         }    
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/ganes/group/ganes.mmp
--- a/uifw/ganes/group/ganes.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/ganes/group/ganes.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -73,20 +73,20 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY       aknicon.lib
-LIBRARY       AknLayout2.lib       
+LIBRARY       aknlayout2.lib
 LIBRARY       AknLayout2Scalable.lib
 LIBRARY       aknnotify.lib
 LIBRARY       aknphysics.lib
-LIBRARY       aknskins.lib 
+LIBRARY       aknskins.lib
 LIBRARY       aknskinsrv.lib
 LIBRARY       akntouchgesturefw.lib
 LIBRARY       apparc.lib
 LIBRARY       avkon.lib
 LIBRARY       bitgdi.lib
 LIBRARY       CdlEngine.lib 
-LIBRARY       CenrepNotifHandler.lib
+LIBRARY       cenrepnotifhandler.lib
 LIBRARY       centralrepository.lib
-LIBRARY       commonengine.lib
+LIBRARY       CommonEngine.lib
 LIBRARY       cone.lib
 LIBRARY       efsrv.lib 
 LIBRARY       egul.lib
@@ -97,7 +97,7 @@
 LIBRARY       euser.lib
 LIBRARY       fbscli.lib
 LIBRARY       fepbase.lib
-LIBRARY       FeatMgr.lib
+LIBRARY       featmgr.lib
 LIBRARY       gdi.lib
 LIBRARY       imageconversion.lib 
 LIBRARY       libOpenVG.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/ganes/src/HgScroller.cpp
--- a/uifw/ganes/src/HgScroller.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/ganes/src/HgScroller.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -241,9 +241,9 @@
             if( iMarkingObserver )
                 {
                 TRAP_IGNORE( iMarkingObserver->HandleMarkingL( aIndex, ETrue ) );
-                }            
+                }
             }
-        }    
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -592,7 +592,8 @@
 
             if( iDetector 
                     && iSelectedIndex != KErrNotFound 
-                    && !HasHighlight() 
+                    && !HasHighlight()
+                    && !(iFlags & EHgScrollerSelectionMode)
                     && iActionMenu->InitMenuL() )
                 {
                 iDetector->PointerEventL( aEvent );
@@ -1195,7 +1196,7 @@
                 }
             else if( iItemCount )
                 {
-                iSelectedIndex = iCurrentRow;
+                iSelectedIndex = CurrentIndex();
                 FitSelectionToView();
                 iShowHighlight = ETrue;
                 iDrawUtils->EnableMarquee(HasHighlight());
@@ -1732,6 +1733,9 @@
             iScrollbar = CHgScrollbar::NewL(*this);
             InitScrollbarL();
             InitGraphicsL();
+            
+            HandleSizeChanged();
+            DrawDeferred();
             }
         )
     }
@@ -1743,7 +1747,7 @@
 void CHgScroller::HandleLongTapEventL( const TPoint& /*aPenEventLocation*/,
                         const TPoint& aPenEventScreenLocation)
     {
-    if( iActionMenu )
+    if( iActionMenu && !(iFlags & EHgScrollerSelectionMode) )
         {
         iOldWinPos = DrawableWindow()->OrdinalPosition();
         iActionMenu->ShowMenuL(aPenEventScreenLocation);
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/ganes/src/HgVgEGL.cpp
--- a/uifw/ganes/src/HgVgEGL.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/ganes/src/HgVgEGL.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -272,7 +272,8 @@
     eglMakeCurrent(iDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
     eglDestroySurface(iDisplay,iSurface);
     eglDestroyContext( iDisplay, iContextVg );
-    eglTerminate(iDisplay);    
+    eglTerminate(iDisplay);
+    eglReleaseThread();
     }
 
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/ganes/src/HgVgLetterPopup.cpp
--- a/uifw/ganes/src/HgVgLetterPopup.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/ganes/src/HgVgLetterPopup.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -132,15 +132,10 @@
         iDrawBuffer->Clear(iRect.Size(), KRgbBlack);
         
         TAknLayoutText layout;
-        layout.LayoutText(iParentRect, iTextLayout);
+        layout.LayoutText( TRect(TPoint(0,0), iRect.Size()), iTextLayout);
         layout.DrawText(iDrawBuffer->Gc(), aText, ETrue, KRgbWhite);
         
-/*        TInt width = iFont->TextWidthInPixels(aText);
-        TInt height = iFont->HeightInPixels();
-        TPoint pos(iRect.Width() / 2 - width / 2, 
-                iRect.Height() / 2 + height / 2);
-        iDrawBuffer->DrawText(aText, iFont, KRgbWhite, pos);*/
-        iDrawBuffer->GetDrawBufferToVgImage(iRect.Size(), TPoint(0,0), iLetterImage, VG_A_8);
+        iDrawBuffer->GetDrawBufferToVgImage(TRect(TPoint(0,0), iRect.Size()), TPoint(0,0), iLetterImage, VG_A_8);
         }
     }
 
@@ -216,6 +211,7 @@
     {
     iPopupLayout = aPopupLayout;
     iTextLayout = aTextLayout;
+    iTextLayout.Setr(0);
     iTextLayout.Setl(0);
     iTextLayout.Sett(0);
     iParentRect = aParentRect;
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/ganes/src/HgVgMediaWall.cpp
--- a/uifw/ganes/src/HgVgMediaWall.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/ganes/src/HgVgMediaWall.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -159,11 +159,15 @@
     // Set the windows size       
     SetRect ( aRect );
 
-#ifdef MEDIAWALL_ORIENTATION_FIX    
+#ifdef MEDIAWALL_ORIENTATION_FIX
     TSize screenSize = iCoeEnv->ScreenDevice()->SizeInPixels();
     if (aRect == TRect(TPoint(0,0), screenSize) 
             && iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen)
         {
+        TPixelsAndRotation sizeAndRotation;
+        iCoeEnv->ScreenDevice()->GetDefaultScreenSizeAndRotation(sizeAndRotation);
+        iRotatedDraw = sizeAndRotation.iRotation != CFbsBitGc::EGraphicsOrientationNormal;
+        
         Window().FixNativeOrientation();
         }
 #endif
@@ -865,10 +869,11 @@
             handled = ETrue;
             } break;
         case EKeyEnter:
+        case EKeyOK:
             {
             if( iSelectedIndex != KErrNotFound && iSelectionObserver )
                 {
-                TRAP_IGNORE( DoStartOpeningAnimationL( ); )                
+                TRAP_IGNORE( DoStartOpeningAnimationL( ); )
                 return EKeyWasConsumed;
                 }
             return EKeyWasNotConsumed;
@@ -1107,8 +1112,9 @@
         return NULL;
     
 #ifdef MEDIAWALL_ORIENTATION_FIX    
-    return iEGL->GetSurfaceToBitmap(iRect, 
-            iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen);        
+    return iEGL->GetSurfaceToBitmap(
+            iRect, 
+            iRotatedDraw && (iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen) );        
 #else
     return iEGL->GetSurfaceToBitmap(iRect, EFalse);            
 #endif
@@ -1590,7 +1596,8 @@
     
 #ifdef MEDIAWALL_ORIENTATION_FIX
     iScrollBar->EnableLandscapeRendering( 
-            iMediaWallStyle == CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen );
+            iRotatedDraw 
+            && (iMediaWallStyle == CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen) );
 #endif
     
     }
@@ -2439,15 +2446,15 @@
     
     InitScrollBarL(EFalse);
 
-#ifdef MEDIAWALL_ORIENTATION_FIX    
-    iRenderer->EnableLandscapeMode(ETrue);
-    iAlbumLabel->EnableLandscapeRendering(ETrue);
-    iArtistLabel->EnableLandscapeRendering(ETrue);
-    iEmptyLabel->EnableLandscapeRendering(ETrue);
-    iSkinRenderer->EnableLanscapeRendering(ETrue);
-    iScrollBar->EnableLandscapeRendering(ETrue);
-    iHideSKButton->EnableLandscapeRendering(ETrue);
-    iLetterPopup->EnableLandscapeRendering(ETrue);
+#ifdef MEDIAWALL_ORIENTATION_FIX
+    iRenderer->EnableLandscapeMode(iRotatedDraw);
+    iAlbumLabel->EnableLandscapeRendering(iRotatedDraw);
+    iArtistLabel->EnableLandscapeRendering(iRotatedDraw);
+    iEmptyLabel->EnableLandscapeRendering(iRotatedDraw);
+    iSkinRenderer->EnableLanscapeRendering(iRotatedDraw);
+    iScrollBar->EnableLandscapeRendering(iRotatedDraw);
+    iHideSKButton->EnableLandscapeRendering(iRotatedDraw);
+    iLetterPopup->EnableLandscapeRendering(iRotatedDraw);
 #endif
     
     }
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp
--- a/uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -37,7 +37,7 @@
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY             euser.lib
-LIBRARY             stiftestinterface.lib
+LIBRARY             StifTestInterface.lib
 LIBRARY             stiftestengine.lib
 LIBRARY             avkon.lib
 LIBRARY             cone.lib
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/uiklaf/Group/EikCoCtlLaf.MMP
--- a/uifw/uiklaf/Group/EikCoCtlLaf.MMP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/uiklaf/Group/EikCoCtlLaf.MMP	Thu Aug 19 10:11:06 2010 +0300
@@ -87,12 +87,12 @@
 LIBRARY         avkon.lib
 LIBRARY         apgrfx.lib
 LIBRARY         aknnotify.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         eikcore.lib
 LIBRARY         aknskins.lib
-LIBRARY         cdlengine.lib
-LIBRARY		    ESTOR.LIB 
-LIBRARY         Uiklaf.lib
+LIBRARY         CdlEngine.lib
+LIBRARY		    estor.lib
+LIBRARY         uiklaf.lib
 
 deffile EIKCOCTLLAF.DEF
 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/uiklaf/Group/UIKLAF.MMP
--- a/uifw/uiklaf/Group/UIKLAF.MMP	Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/uiklaf/Group/UIKLAF.MMP	Thu Aug 19 10:11:06 2010 +0300
@@ -81,16 +81,16 @@
 LIBRARY         avkon.lib
 LIBRARY         apgrfx.lib
 LIBRARY         aknnotify.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         eikcore.lib
 LIBRARY         aknskins.lib
-LIBRARY         cdlengine.lib
-LIBRARY	        ESTOR.LIB 
+LIBRARY         CdlEngine.lib
+LIBRARY	        estor.lib
 LIBRARY         EikCoCtlLaf.lib
-LIBRARY         FontUtils.lib
+LIBRARY         fontutils.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         FontProvider.lib
-LIBRARY         AknCapServerClient.lib
+LIBRARY         akncapserverclient.lib
 
 #if defined(ARMCC)
 DEFFILE         /epoc32/include/uiklaf/private/eabi/uiklaf.def
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/group/FindUtil.mmp
--- a/uiutils/Findutil/group/FindUtil.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/group/FindUtil.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,7 +49,7 @@
 LIBRARY         euser.lib
 
 #if defined(WINS)
-LIBRARY         FeatMgr.lib
+LIBRARY         featmgr.lib
 #endif
 
 // end of file
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/group/FindUtilImpl.mmp
--- a/uiutils/Findutil/group/FindUtilImpl.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/group/FindUtilImpl.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -48,13 +48,17 @@
 SOURCE          FindUtilKorean.cpp
 
 LIBRARY         euser.lib
-LIBRARY         findutil.lib
+LIBRARY         FindUtil.lib
 LIBRARY         ptiengine.lib
-LIBRARY         commonengine.lib
-LIBRARY         CentralRepository.lib
-LIBRARY         CenRepNotifHandler.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         centralrepository.lib
+LIBRARY         cenrepnotifhandler.lib
 LIBRARY         cone.lib
 LIBRARY         fepbase.lib 
 LIBRARY         avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib 
+LIBRARY         featmgr.lib
+
+DEBUGLIBRARY    charconv.lib
+DEBUGLIBRARY 	efsrv.lib
 
 // end of file
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/group/FindUtilImplChina.mmp
--- a/uiutils/Findutil/group/FindUtilImplChina.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/group/FindUtilImplChina.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -49,11 +49,11 @@
 SOURCE          ChineseFindUtils.cpp
 
 LIBRARY         euser.lib
-LIBRARY         findutil.lib
+LIBRARY         FindUtil.lib
 LIBRARY         ptiengine.lib
-LIBRARY         commonengine.lib
-LIBRARY         CentralRepository.lib
-LIBRARY         CenRepNotifHandler.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         centralrepository.lib
+LIBRARY         cenrepnotifhandler.lib
 LIBRARY         cone.lib
 LIBRARY         fepbase.lib 
 LIBRARY         avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/group/FindUtilImplJapan.mmp
--- a/uiutils/Findutil/group/FindUtilImplJapan.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/group/FindUtilImplJapan.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -47,11 +47,11 @@
 SOURCE          FindUtilJapanese.cpp
 
 LIBRARY         euser.lib
-LIBRARY         findutil.lib
+LIBRARY         FindUtil.lib
 LIBRARY         ptiengine.lib
-LIBRARY         commonengine.lib
-LIBRARY         CentralRepository.lib
-LIBRARY         CenRepNotifHandler.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         centralrepository.lib
+LIBRARY         cenrepnotifhandler.lib
 LIBRARY         cone.lib
 LIBRARY         fepbase.lib 
 LIBRARY         avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/group/FindUtilImplThai.mmp
--- a/uiutils/Findutil/group/FindUtilImplThai.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/group/FindUtilImplThai.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -47,11 +47,11 @@
 SOURCE          FindUtilThai.cpp
 
 LIBRARY         euser.lib
-LIBRARY         findutil.lib
+LIBRARY         FindUtil.lib
 LIBRARY         ptiengine.lib
-LIBRARY         commonengine.lib
-LIBRARY         CentralRepository.lib
-LIBRARY         CenRepNotifHandler.lib
+LIBRARY         CommonEngine.lib
+LIBRARY         centralrepository.lib
+LIBRARY         cenrepnotifhandler.lib
 LIBRARY         cone.lib
 LIBRARY         fepbase.lib 
 LIBRARY         avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib 
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/inc/FindUtilChinese.h
--- a/uiutils/Findutil/inc/FindUtilChinese.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/inc/FindUtilChinese.h	Thu Aug 19 10:11:06 2010 +0300
@@ -283,14 +283,6 @@
     TBool IsChineseWord(const TDesC& aWord);
     
     /**
-     * Find pane text is just Chinese word
-     * 
-     * @param aWord Reference to text for analyse
-     * @return ETrue it is a Chinese word; otherwise EFalse
-     */
-    TBool ChineseWord(const TDesC& aWord);
-
-    /**
      * Find pane text is including stroke symbol
      *
      * @since S60 v3.2
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/inc/FindUtilKorean.h
--- a/uiutils/Findutil/inc/FindUtilKorean.h	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/inc/FindUtilKorean.h	Thu Aug 19 10:11:06 2010 +0300
@@ -24,6 +24,11 @@
 
 #include "FindUtilBase.h"
 
+#ifdef _DEBUG
+#include <f32file.h>
+class CCnvCharacterSetConverter;
+#endif
+
 /**
  *  CFindUtilKorean utils class
  *
@@ -57,6 +62,13 @@
  
     private:
     
+		enum TMatchFlag
+            {
+            EMatchFlagNone = 0x0000,
+            EMatchFlagAsterikInLast = 0x0001,
+            EMatchFlagAsterikInStart = 0x0002
+            };
+			
         CFindUtilKorean();
 
         void ConstructL();
@@ -69,9 +81,10 @@
          * @param aSearchText for text to be used in searching
          * @return ETrue if match found, EFalse otherwise
          */    
-        TBool IsFindMatchL( 
+        TInt IsFindMatch( 
             const TDesC& aItemString, 
-            const TDesC& aSearchText );
+            const TDesC& aSearchText,
+            const TMatchFlag aFlag = EMatchFlagNone);
         
         /**
          * Decomposes given string to plain jamos.
@@ -84,6 +97,8 @@
             const TDesC& aString,
             HBufC* aDecomposedString );
         
+        void DecomposeChar( TChar aChar, TDes& aDecomposedString );
+    
         /**
          * Decomposes hangul syllables to single jamos.
          *
@@ -166,6 +181,27 @@
         							const TDesC& aSearchText, 
         							HBufC*& aNextChars);
 
+    private:
+        
+        void TakeIntoNextCharsL(HBufC*& aNextChars, TChar aChar);
+        
+        void InsertNextCharsL(
+                HBufC*& aNextChars, 
+                TBool& aReAlloced,
+                const TChar& aChar, 
+                const TInt aIndex = KErrNotFound);
+        
+        inline TBool MatchConsonentBased(const TChar& aA, const TChar& aB);
+
+    private:
+        
+        TUid iCurrentProcessUid3;
+        
+#ifdef _DEBUG
+        RFs iFs;
+        CCnvCharacterSetConverter* iConv;
+#endif
+        
     };
 
 #endif // __FINDUTILKOREAN__
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/src/FindUtilChinese.cpp
--- a/uiutils/Findutil/src/FindUtilChinese.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/src/FindUtilChinese.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -875,7 +875,7 @@
         haschineseword = ETrue;
         ret = IncludeString(aItemString, tempBuf);
         
-        if (ret || ChineseWord( tempBuf ))
+        if (ret)
             {
             return ret;
             }
@@ -905,45 +905,50 @@
     if (haschineseword)
         {
         TInt ii=0;
-        TBuf<KMaxWordLength> tmpBuf;
-        tmpBuf.Zero();
-        
-        ////translate the whole searchstring to spelllist
+        TBool leftDifferentChinese = EFalse; 
+		//this is used for fixing for the issue of search string including Chinese characters
         while (ii< tempBuf.Length())
             {
-            
-            //if it is a valid chinese character
             if ((TInt)tempBuf[ii]>= KMinUnicodeHz && (!InputMethodStroke
                     ||(InputMethodStroke && !IsStrokeSymbol(tempBuf[ii]))))
                 {
-                
-                RPointerArray<HBufC> spellList;
-                
-                //translate the chinese charater to spellList( pinyin or stroke )
-                if( DoTranslationL(TInt16(tempBuf[ii]), spellList)
-                    && ( tmpBuf.Length() + spellList[0]->Length() < KMaxWordLength)  )
-                	{
-                    tmpBuf.Append( spellList[0]->Des() );
+                TInt Findcursor = itemString.Locate(tempBuf[ii]);
+                if (Findcursor != KErrNotFound)
+                    {
+                    if ((Findcursor == itemString.Length()-1)&& (ii
+                            ==tempBuf.Length()-1))
+                        {
+                        
+                        if ( leftDifferentChinese || IsChineseWord(
+                            itemString.Left( Findcursor ) ) )
+                            {
+                            //if the different Chinese character at the left or middle, return false.
+                            return EFalse;
+                            }
+                        
+                        return ETrue;
+                        }
+                    itemString.Delete(0, Findcursor+1);
+                    tempBuf.Delete(0, ii+1);
+                    ii=0;
                     }
+                else
+                    {
                     
-                spellList.ResetAndDestroy();
-                spellList.Close();
-                ii++;
+                    if ( IsChineseWord( tempBuf.Left( ii + 1 ) ) )
+                        {
+                        //flag the different Chinese character at the left.
+                        leftDifferentChinese = ETrue;
+                        }
+                    
+                    ii++;
+                    }
                 }
-            //if not, just append it     
             else
                 {
-                if( tmpBuf.Length() + 1 < KMaxWordLength )
-                	{
-                    tmpBuf.Append( tempBuf[ii] );
-                    }
-                    
                 ii++;
                 }
             }
-            
-            tempBuf.Zero();
-            tempBuf.Copy(tmpBuf);
         }
 
     // Array for item string
@@ -1481,32 +1486,6 @@
 
     return IsChineseSearchStr;
     }
-
-// --------------------------------------------------------
-// Find pane text is just Chinese word
-// --------------------------------------------------------
-//
-TBool CFindUtilChinese::ChineseWord(const TDesC& aWord)
-	{
-	TBool isChineseWord = ETrue;
-	const TInt len = aWord.Length();
-	
-    TBool InputMethodStroke = EFalse;
-    if(iLanguage == ELangHongKongChinese && iCurInputMode == 0x0020)
-        {
-        InputMethodStroke = ETrue;
-        }
-	
-	for( TInt i = 0; i < len; i++ )
-		{
-		if( ( ( TInt )aWord[i] < KMinUnicodeHz ) || ( InputMethodStroke && IsStrokeSymbol(aWord[i]) ) )
-			{
-			isChineseWord = EFalse;
-			break;
-			}
-		}
-	return isChineseWord;
-	}
     
 // ---------------------------------------------------------
 // Find pane text is including stroke symbol  
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/src/FindUtilKorean.cpp
--- a/uiutils/Findutil/src/FindUtilKorean.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/src/FindUtilKorean.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -17,6 +17,11 @@
 
 
 #include "FindUtilKorean.h"
+#include <e32svr.h>
+
+#ifdef _DEBUG
+#include <charconv.h>
+#endif
 
 const TInt KSBase = 0xac00; // base address for hangul syllables
 const TInt KLBase = 0x1100; // base address for L-jamo
@@ -93,8 +98,48 @@
 0x1175,
 };
 
+const TUint16 conversionTableFromLJamoToCompatibilityJamo[] = {
+0x3131, /* ? */
+0x3132, /* ? */
+0x3134, /* ? */
+0x3137, /* ? */
+0x3138, /* ? */
+0x3139, /* ? */
+0x3141, /* ? */
+0x3142, /* ? */
+0x3143, /* ? */
+0x3145, /* ? */
+0x3146, /* ? */
+0x3147, /* ? */
+0x3148, /* ? */
+0x3149, /* ? */
+0x314A, /* ? */
+0x314B, /* ? */
+0x314C, /* ? */
+0x314D, /* ? */
+0x314E  /* ? */
+};
+
 #define KCCount (sizeof(conversionTableFromCompatibilityJamoToJamo) / sizeof(TUint16))
 
+#define KCountCompToJamo (sizeof(conversionTableFromCompatibilityJamoToJamo) / sizeof(TUint16))
+
+#define KCountLJamoToComp (sizeof(conversionTableFromLJamoToCompatibilityJamo) / sizeof(TUint16))
+
+#define ISLJamo(a) (KLBase <= a && a <= KLBase + KLCount)
+
+#define IsCompatibilityJamo(a) (0x3130 <= a && a <= 0x318F)
+
+const TInt KNextCharsGranuarity = 20;
+
+const TUid KUidPhoneBook = {0x101F4CCE};
+const TUid KUidPhoneBookServer = {0x10207277};
+const TUid KUidSymbianContactModel = {0x10003A73};
+
+#define IsPhoneBookProcess(a) ( a == KUidSymbianContactModel || a == KUidPhoneBook || a == KUidPhoneBookServer )
+
+
+
 // ============================ MEMBER FUNCTIONS =============================
 
 
@@ -117,6 +162,13 @@
 //
 void CFindUtilKorean::ConstructL()
     {
+#ifdef _DEBUG
+    User::LeaveIfError( iFs.Connect() );
+    iConv = CCnvCharacterSetConverter::NewL();
+    iConv->PrepareToConvertToOrFromL(0x200100FF, iFs);
+#endif
+    
+    iCurrentProcessUid3 = ( RProcess().Type() )[2];
     }
 
 // ---------------------------------------------------------------------------
@@ -133,6 +185,10 @@
 //
 CFindUtilKorean::~CFindUtilKorean()
     {
+#ifdef _DEBUG
+    delete iConv;
+    iFs.Close();
+#endif
     }
 
 // ---------------------------------------------------------------------------
@@ -156,35 +212,140 @@
 // Compares two strings against others.
 // ---------------------------------------------------------------------------
 //
-TBool CFindUtilKorean::IsFindMatchL( 
-    const TDesC& aItemString, 
-    const TDesC& aSearchText )
+TInt CFindUtilKorean::IsFindMatch( 
+        const TDesC& aItemString, 
+        const TDesC& aSearchText,
+        const TMatchFlag aFlag)
     {
-    TBool result( EFalse );
+    
+#ifdef _DEBUG
+    TRAP_IGNORE(
+        HBufC8* bufItemString = HBufC8::NewLC((aItemString.Length() + 1) * 2);
+        HBufC8* bufSearchText = HBufC8::NewLC((aSearchText.Length() + 1) * 2);
+        TPtr8 ptrItemString(bufItemString->Des());
+        ptrItemString.FillZ(ptrItemString.MaxLength());
+        TPtr8 ptrSearchText(bufSearchText->Des());
+        ptrSearchText.FillZ(ptrSearchText.MaxLength());
+        iConv->ConvertFromUnicode(ptrItemString, aItemString);
+        iConv->ConvertFromUnicode(ptrSearchText, aSearchText);
+        RDebug::Printf("DBG: comparing %s, %s", bufItemString->Ptr(), bufSearchText->Ptr());
+        CleanupStack::PopAndDestroy(2);
+    );
+#endif
     
     // To disable the wildchar matching provided by MatchC.
-    if ( KErrNotFound != aSearchText.Locate( KLitQuestion ) && 
+    if ( aFlag == EMatchFlagNone &&
+        KErrNotFound != aSearchText.Locate( KLitQuestion ) && 
         KErrNotFound != aSearchText.Locate( KLitStar ) )
     	{
-    	return EFalse;
+#ifdef _DEBUG
+    	RDebug::Printf("DBG: comparing includes wild");
+#endif
+    	return KErrNotFound;
     	}
-    
+
+#if 1 // 2009.08.14 consonent based search
+    TUint flag = aFlag;
+
+    TInt lenItemString = aItemString.Length();
+    TInt lenSearchText = aSearchText.Length();
+
+    // detect asterik in end of string
+    if (lenSearchText > 0 && aSearchText[lenSearchText - 1] == KLitStar)
+        {
+        flag |= EMatchFlagAsterikInLast;
+        lenSearchText--;
+        }
+
+    // set asterik start
+    if (!IsPhoneBookProcess(iCurrentProcessUid3) || 
+        (aSearchText.Length() > 0 && aSearchText[0] == KLitStar))
+        {
+        flag |= EMatchFlagAsterikInStart;
+        }
+
+    if (lenItemString < lenSearchText)
+        {
+        return KErrNotFound;
+        }
+
+    if (IsPhoneBookProcess(iCurrentProcessUid3))
+        {
+        TInt i = 0;
+        TInt j = 0;
+        for (; i < lenItemString && j < lenSearchText; i++)
+            {
+            TChar ch(aItemString[i]);
+            if (IsFindWordSeparator(ch))
+                {
+                continue;
+                }
+            
+            if (MatchConsonentBased(ch, aSearchText[j]))
+                {
+                j++;
+                }
+            else
+                {
+                break;
+                }
+            }
+        
+        if (j == lenSearchText)
+            return 0;
+        }
+
+    for (TInt i = 0; i < lenItemString - lenSearchText + 1; i++)
+        {
+        if (!(flag & EMatchFlagAsterikInStart))
+            {
+            if (0 != i && !IsFindWordSeparator(aItemString[i - 1]))
+                {
+                continue;
+                }
+            }
+
+        TBool matched(ETrue);
+        for (TInt j = 0; j < lenSearchText; j++)
+            {
+            if (!MatchConsonentBased(aItemString[i + j], aSearchText[j]))
+                {
+#ifdef _DEBUG
+                RDebug::Printf("DBG: mismatch between %d %d", i + j, j);
+#endif
+                matched = EFalse;
+                break;
+                }
+            }
+
+        if (matched)
+            {
+#ifdef _DEBUG
+            RDebug::Print(_L("DBG: comparing matched"));
+#endif
+            return i;
+            }
+        }
+
+    return KErrNotFound;
+
+#else
     // Convert aItemString to single jamo's.
     HBufC* itemString = HBufC::NewLC( aItemString.Length() * KMaxLengthDecomposedSyllable );
     DecomposeToPlainJamos( aItemString, itemString );
-    
+
     HBufC* searchText = HBufC::NewLC( aSearchText.Length() * KMaxLengthDecomposedSyllable + 2 );
     searchText->Des().Append( KLitStar );
 
     // Convert aSearchText to single jamo's.
     DecomposeToPlainJamos( aSearchText, searchText );
     searchText->Des().Append( KLitStar );
-    
+
     // Compare strings containing plain jamo's against others.
     for ( TInt i = 0; i < itemString->Length() && !result; i++ )
         {
-        if ( 0 == i || IsFindWordSeparator( 
-            static_cast<TChar>( itemString->Des()[ i - 1 ] ) ) )
+        if ( 0 == i || IsFindWordSeparator(
+                        static_cast<TChar>( itemString->Des()[ i - 1 ] ) ) )
             {
             if ( KErrNotFound != itemString->Mid( i ).MatchC( *searchText ) )
                 {
@@ -192,11 +353,12 @@
                 }
             }
         }
-    
+
     CleanupStack::PopAndDestroy( searchText );
     CleanupStack::PopAndDestroy( itemString );
-    
-    return result;    
+
+    return result;
+#endif
     }
 
 // ---------------------------------------------------------------------------
@@ -230,6 +392,25 @@
         }
     }
 
+void CFindUtilKorean::DecomposeChar( TChar aChar, TDes& aDecomposedString )
+    {
+    aDecomposedString.Zero();
+    if ( IsHangulSyllable( aChar ) )
+        {
+        Decompose( aChar, aDecomposedString );
+        }
+    else if ( IsHangulCompatibilityJamo( aChar ) )
+        {
+        TUint16 jamo = conversionTableFromCompatibilityJamoToJamo[ (TInt)aChar - KCBase ];
+        aDecomposedString.Append( jamo );    
+        }
+    // Otherwise append character directly to 'decomposed string'.
+    else
+        {
+        aDecomposedString.Append( aChar );
+        }    
+    }
+
 // ---------------------------------------------------------------------------
 // Decomposes hangul syllables to single jamos.
 // ---------------------------------------------------------------------------
@@ -285,7 +466,7 @@
     {
     // Character is 'hangul compatibility jamo' 
     // if it's numeric value is between KCBase and KCBase + KCCount.
-    TInt index = static_cast<TInt> ( aChar ) - KCBase;
+    TInt index = static_cast<TInt>( aChar ) - KCBase;
     if ( index < 0 || index >= KCCount )
         {
         return EFalse;
@@ -304,20 +485,17 @@
     // does not contain any characters.
     if ( aContactsField.Length() )
         {
-       // In case that both of strings contain some characters,
-       // matching is made with function below.
-      TRAPD(err, retVal = IsFindMatchL( aContactsField, aWord ));
-    	
-      if (err != KErrNone)
-    	{
-    	retVal = EFalse;
-    	}
+	    // In case that both of strings contain some characters,
+	    // matching is made with function below.
+#ifdef _DEBUG
+        RDebug::Printf("DBG: Comparing from Match");
+#endif
+	    retVal = (IsFindMatch( aContactsField, aWord ) != KErrNotFound);
         }
 	
-   return retVal;
+	return retVal;
     }
 
-
 // ---------------------------------------------------------------------------
 // It tests a partial matching.
 // ---------------------------------------------------------------------------
@@ -342,7 +520,11 @@
 
     // In case that both of strings contain some characters,
     // matching is made with function below.
-    return IsFindMatchL( aItemString, aSearchText );
+#ifdef _DEBUG
+    RDebug::Printf("DBG: Comparing from MatchRefineL");
+#endif
+    
+    return (IsFindMatch( aItemString, aSearchText ) != KErrNotFound);
     }
 
 // -----------------------------------------------------------------------------
@@ -350,19 +532,276 @@
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //  
-TBool CFindUtilKorean::MatchAdaptiveRefineL( const TDesC& /*aItemString*/, 
-	const TDesC& /*aSearchText*/, HBufC*& /*aNextChars*/ )
-	{
-	return 0;	
-	}
+TBool CFindUtilKorean::MatchAdaptiveRefineL(const TDesC& aItemString,
+        const TDesC& aSearchText, HBufC*& aNextChars)
+    {
+    if (aSearchText.Length() == 0)
+        {
+        TakeIntoNextCharsL(aNextChars, aItemString[0]);
+        return ETrue;
+        }
+    else
+        {
+        const TInt lenItemString = aItemString.Length();
+        const TInt lenSearchText = aSearchText.Length();
+
+        if (lenItemString < lenSearchText)
+            {
+            return EFalse;
+            }
+
+#ifdef _DEBUG
+        RDebug::Printf("DBG: Comparing from MatchAdaptiveRefineL");
+#endif
+        TInt idx = IsFindMatch(aItemString, aSearchText,
+                EMatchFlagAsterikInLast);
+
+        if (idx == KErrNotFound)
+            {
+            return EFalse;
+            }
+
+        TLex lexItemString(aItemString);
+        if (IsPhoneBookProcess(iCurrentProcessUid3) && idx == 0)
+            {
+            // find out the position next to last matched string.
+            // work through strings when it reaches length of search string,
+            // while skipping spaces due to ingnoring space matching scheme.
+            for (TInt compareCount = 0; compareCount < lenSearchText;)
+                {
+                if (!IsFindWordSeparator(lexItemString.Get()))
+                    {
+                    compareCount++;
+                    }
+                }
+            
+            if (lexItemString.Eos())
+                return EFalse;
+
+            // Skip spaces
+            while (IsFindWordSeparator(lexItemString.Peek()))
+                {
+                lexItemString.Inc();
+                }
+            
+            if (lexItemString.Eos())
+                {
+                return EFalse;
+                }
+            }
+        else
+            {
+            lexItemString.Inc(idx + lenSearchText);
+            }
+
+        TChar next = lexItemString.Peek();
+        if (next == 0)
+            {
+            // nothing to take
+            }
+        else
+            {
+            TakeIntoNextCharsL(aNextChars, next);
+            }
+        }
+    
+    return ETrue;
+    }
+
+void CFindUtilKorean::TakeIntoNextCharsL(HBufC*& aNextChars,
+        TChar aCharToInsert)
+    {
+    // examine the characters to be inserted
+    TBuf<3> jamo;
+    if (IsHangulSyllable(aCharToInsert))
+        {
+        Decompose(aCharToInsert, jamo);
+        }
+    else if (IsHangulCompatibilityJamo(aCharToInsert))
+        {
+        TUint16 ljamo = 
+                conversionTableFromCompatibilityJamoToJamo[(TInt)aCharToInsert - KCBase];
+        jamo.Append(ljamo);
+        }
+    else
+        {
+        aCharToInsert.UpperCase();
+        }
+
+    TPtr nextChar(aNextChars->Des());
+    TBool reAlloced(EFalse);
+
+    // in case there is no character in the list
+    if (nextChar.Length() == 0)
+        {
+        __ASSERT_ALWAYS(nextChar.MaxLength() > 2, User::Panic(_L("FINDUTIL"), __LINE__));
+        
+        // Hangul only
+        if (jamo.Length() && ISLJamo(jamo[0]))
+            {
+            const TChar consonentToInsert =
+                    conversionTableFromLJamoToCompatibilityJamo[jamo[0] - KLBase];
+            
+            InsertNextCharsL(aNextChars, reAlloced, consonentToInsert);
+
+            // if Jamo only character, return...
+            if (jamo.Length() == 1)
+                {
+                return;
+                }
+            }
+        
+        InsertNextCharsL(aNextChars, reAlloced, aCharToInsert);
+        return;
+        }
+
+    TBool jamoInserted(EFalse);
+    TInt length = nextChar.Length();
+    const TBool isPB(IsPhoneBookProcess(iCurrentProcessUid3));
+    
+    for (TInt i = 0; i < length; i++)
+        {
+        const TChar ch = nextChar[i];
+        // Hangul consonent check
+        if (!jamoInserted && jamo.Length() && ISLJamo(jamo[0]))
+            {
+            const TChar consonentToInsert =
+                    conversionTableFromLJamoToCompatibilityJamo[jamo[0] - KLBase];
+            
+            if (ch == consonentToInsert)
+                {
+                // Jamo only character finished
+                if (jamo.Length() == 1)
+                    {
+                    return;
+                    }
+
+                jamoInserted = ETrue;
+                }
+            else if ((isPB && !IsCompatibilityJamo(ch)) || (ch > consonentToInsert))
+                {
+                InsertNextCharsL(aNextChars, reAlloced, consonentToInsert, i);
+                // Jamo only character finished
+                if (jamo.Length() == 1)
+                    {
+                    return;
+                    }
+
+                jamoInserted = ETrue;
+                }
+            else
+                {
+                // pass
+                }
+            }
+        // Hangul or Latin
+        else
+            {
+            if (ch == aCharToInsert)
+                {
+                return; // already exist
+                }
+            else if (isPB && IsCompatibilityJamo(ch))
+                {
+                // pass
+                }
+            else if (ch > aCharToInsert)
+                {
+                InsertNextCharsL(aNextChars, reAlloced, aCharToInsert, i);
+                return; // finished
+                }
+            else
+                {
+                // pass
+                }
+            }
+        
+        if (reAlloced)
+            {
+            nextChar.Set(aNextChars->Des());
+            length = nextChar.Length();
+            }
+        }
+    
+    InsertNextCharsL(aNextChars, reAlloced, aCharToInsert);
+    }
+
+void CFindUtilKorean::InsertNextCharsL(HBufC*& aNextChars, TBool& aReAlloced,
+        const TChar& aChar, const TInt aIndex)
+    {
+    aReAlloced = EFalse;
+    TPtr ptr(aNextChars->Des());
+    const TInt len = ptr.Length();
+    const TInt maxLen = ptr.MaxLength();
+
+    if (KErrNotFound != ptr.Locate(aChar))
+        {
+        // Do not insert duplicate characters
+        return;
+        }
+
+    if (len == maxLen)
+        {
+        aNextChars = aNextChars->ReAllocL(maxLen + KNextCharsGranuarity);
+        ptr.Set(aNextChars->Des());
+        aReAlloced = ETrue;
+        
+#ifdef _DEBUG
+        RDebug::Printf("DBG: Next Character buffer created with %d",
+                ptr.MaxLength());
+#endif
+        }
+
+    if (aIndex == KErrNotFound)
+        {
+        ptr.Append(aChar);
+        }
+    else
+        {
+        TBuf<1> buf;
+        buf.Append(aChar);
+        ptr.Insert(aIndex, buf);
+        }
+    }
 
 // ---------------------------------------------------------------------------
 // It checks whether aWord is valid.
 // ---------------------------------------------------------------------------
 //
-TBool CFindUtilKorean::IsWordValidForMatching( const TDesC& /*aWord*/ )
+TBool CFindUtilKorean::IsWordValidForMatching(const TDesC& /*aWord*/)
     {
     return ETrue;
     }
 
+TBool CFindUtilKorean::MatchConsonentBased(const TChar& aA, const TChar& aB)
+    {
+    TBuf<3> jamoItemString;
+    TBuf<3> jamoSearchText;
+    DecomposeChar(aA, jamoItemString);
+    DecomposeChar(aB, jamoSearchText);
+    const TInt lenJamoItemString = jamoItemString.Length();
+    const TInt lenJamoSearchText = jamoSearchText.Length();
+
+    // check consonent match for one character
+    if (lenJamoSearchText == 1 && 
+        ISLJamo(jamoItemString[0]) && ISLJamo(jamoSearchText[0]))
+        {
+        if (jamoItemString[0] == jamoSearchText[0])
+            {
+            return ETrue;
+            }
+        }
+    else
+        {
+        TChar chItemString(aA);
+        TChar chSearchText(aB);
+        chItemString.UpperCase();
+        chSearchText.UpperCase();
+        if (chItemString == chSearchText)
+            {
+            return ETrue;
+            }
+        }
+    return EFalse;
+    }
 // End of file
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Findutil/src/FindUtilWestern.cpp
--- a/uiutils/Findutil/src/FindUtilWestern.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Findutil/src/FindUtilWestern.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -29,6 +29,9 @@
 #include "FindUtilKorean.h"
 #include <avkon.rsg>
 #include <StringLoader.h>
+#include <featmgr.h>
+#include <bldvariant.hrh>
+
 const TInt KLitTab('\t');
 const TInt KLitSpace(' ');
 const TInt KLitHyphen('-');
@@ -309,7 +312,7 @@
         }
     else
     	{
-    TInt numChar = 1;
+        TInt numChar = 1;
     	if (!aContactsField.Length())
         	{
                 _LIT( KNone, "*" );
@@ -342,22 +345,24 @@
 //
 TBool CFindUtilWestern::MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText )
     {
-    if ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || iFindUtilKorean->IsKoreanLanguage( aSearchText ) )
+    if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) || 
+         iFindUtilKorean->IsKoreanLanguage( aItemString ) || 
+         iFindUtilKorean->IsKoreanLanguage( aSearchText ) )
         {
         return iFindUtilKorean->MatchRefineL( aItemString, aSearchText );	
         }
     else
-    {
-    if ( aItemString.Length() == 0 )
         {
-        return EFalse;
-        }
-
-    if ( aSearchText.Length() == 0 )
-        {
-        return ETrue;
-        }
-    return IsFindMatch( aItemString, aSearchText, iInputLanguage );
+        if ( aItemString.Length() == 0 )
+            {
+            return EFalse;
+            }
+    
+        if ( aSearchText.Length() == 0 )
+            {
+            return ETrue;
+            }
+        return IsFindMatch( aItemString, aSearchText, iInputLanguage );
     	}
     }
 
@@ -1310,6 +1315,12 @@
         {
         return EFalse;
         }
+		
+    if ( iFindUtilKorean )
+        {
+        return iFindUtilKorean->MatchAdaptiveRefineL(aItemString,aSearchText,aNextChars);   
+        }
+		
     if ( aSearchText.Length() == 0 )
         {        
         UpdateNextCharsFromString( aNextChars, aItemString );
diff -r a1caeb42b3a3 -r fcdfafb36fe7 uiutils/Localizer/group/DirectoryLocalizer.mmp
--- a/uiutils/Localizer/group/DirectoryLocalizer.mmp	Thu Jul 15 18:56:19 2010 +0300
+++ b/uiutils/Localizer/group/DirectoryLocalizer.mmp	Thu Aug 19 10:11:06 2010 +0300
@@ -48,7 +48,7 @@
 LIBRARY		    cone.lib
 LIBRARY         efsrv.lib
 #ifdef RD_MULTIPLE_DRIVE
-LIBRARY         PlatformEnv.lib
+LIBRARY         platformenv.lib
 #endif //RD_MULTIPLE_DRIVE
 
 // End of file.