# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701474 -10800 # Node ID 766eec733c2b3b68e0c153f41fc84a7f1a75a9d2 # Parent ca0622003710d9ea57e409aee909cf30b7f8dd6c Revision: 201035 Kit: 201037 diff -r ca0622003710 -r 766eec733c2b commonuis/CommonUi/src/DocDefaultHandler.cpp --- a/commonuis/CommonUi/src/DocDefaultHandler.cpp Thu Sep 02 20:41:15 2010 +0300 +++ b/commonuis/CommonUi/src/DocDefaultHandler.cpp Fri Sep 17 08:31:14 2010 +0300 @@ -50,6 +50,7 @@ #ifdef ENABLE_DRM #include +#include #include #include // CDcfEntry #include // CDcfRep diff -r ca0622003710 -r 766eec733c2b package_definition.xml --- a/package_definition.xml Thu Sep 02 20:41:15 2010 +0300 +++ b/package_definition.xml Fri Sep 17 08:31:14 2010 +0300 @@ -1,150 +1,773 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + diff -r ca0622003710 -r 766eec733c2b package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:31:14 2010 +0300 @@ -0,0 +1,1 @@ + diff -r ca0622003710 -r 766eec733c2b uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp --- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp Thu Sep 02 20:41:15 2010 +0300 +++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp Fri Sep 17 08:31:14 2010 +0300 @@ -120,6 +120,10 @@ MACRO WCPLOG #endif +#ifdef SYMBIAN_BUILD_GCE +LIBRARY goommonitor.lib +#endif // SYMBIAN_BUILD_GCE + START RESOURCE AknCapServer_reg.rss // Do not change the UID below. TARGETPATH /private/10003a3f/apps diff -r ca0622003710 -r 766eec733c2b uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp --- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp Thu Sep 02 20:41:15 2010 +0300 +++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp Fri Sep 17 08:31:14 2010 +0300 @@ -73,6 +73,11 @@ #include // for Transition effect enumerations #endif +#ifdef SYMBIAN_BUILD_GCE + #include +#endif + + #ifdef RD_INTELLIGENT_TEXT_INPUT #include @@ -225,6 +230,14 @@ me->iEikSrv.AllowNotifierAppServersToLoad(); me->iEikSrv.Close(); // currently there is no use to keep this session alive. +#ifdef SYMBIAN_BUILD_GCE + TRAP( err, CreateGOOMWatcherThreadL()); + if (err != KErrNone) + { + RDebug::Print(_L("Creating out of graphics mem thread failed with err %d"), err); + } +#endif + return err; } diff -r ca0622003710 -r 766eec733c2b uifw/AknGlobalUI/NotifierWrapper/src/AknNotifierAppServerSession.cpp --- a/uifw/AknGlobalUI/NotifierWrapper/src/AknNotifierAppServerSession.cpp Thu Sep 02 20:41:15 2010 +0300 +++ b/uifw/AknGlobalUI/NotifierWrapper/src/AknNotifierAppServerSession.cpp Fri Sep 17 08:31:14 2010 +0300 @@ -68,70 +68,74 @@ return; } - switch ( aMessage.Function() ) - { - case EStartNotifier: - { - ResolveBuffersL(aMessage); - TPtr8 ptr = iReplyBuf->Des(); - iOwner.StartNotifierL(TUid::Uid(aMessage.Int0()),*iInputBuf, ptr); - WriteReplyL(aMessage); - break; - } - case EUpdateNotifier: - { - ResolveBuffersL(aMessage); - TPtr8 ptr2 = iReplyBuf->Des(); - iOwner.UpdateNotifierL(TUid::Uid(aMessage.Int0()),*iInputBuf, ptr2); - WriteReplyL(aMessage); - break; - } - case ECancelNotifier: - { - iOwner.CancelNotifier(TUid::Uid(aMessage.Int0())); - aMessage.Complete(KErrNone); - break; - } - case EStartNotifierAndGetResponse: - { - if (appUi && appUi->EikSrvBlocked()) - { - CleanupStack::PopAndDestroy(); // Free eikon server - } + /* Disable showing notifiers. CR #541 */ + + /* switch ( aMessage.Function() ) */ + /* { */ + /* case EStartNotifier: */ + /* { */ + /* ResolveBuffersL(aMessage); */ + /* TPtr8 ptr = iReplyBuf->Des(); */ + /* iOwner.StartNotifierL(TUid::Uid(aMessage.Int0()),*iInputBuf, ptr); */ + /* WriteReplyL(aMessage); */ + /* break; */ + /* } */ + /* case EUpdateNotifier: */ + /* { */ + /* ResolveBuffersL(aMessage); */ + /* TPtr8 ptr2 = iReplyBuf->Des(); */ + /* iOwner.UpdateNotifierL(TUid::Uid(aMessage.Int0()),*iInputBuf, ptr2); */ + /* WriteReplyL(aMessage); */ + /* break; */ + /* } */ + /* case ECancelNotifier: */ + /* { */ + /* iOwner.CancelNotifier(TUid::Uid(aMessage.Int0())); */ + /* aMessage.Complete(KErrNone); */ + /* break; */ + /* } */ + /* case EStartNotifierAndGetResponse: */ + /* { */ + /* if (appUi && appUi->EikSrvBlocked()) */ + /* { */ + /* CleanupStack::PopAndDestroy(); // Free eikon server */ + /* } */ - ResolveBuffersL(aMessage); + /* ResolveBuffersL(aMessage); */ - iOwner.StartNotifierAndGetResponseL( - TUid::Uid(aMessage.Int0()), - *iInputBuf, - aMessage, - KREPLYSLOT); + /* iOwner.StartNotifierAndGetResponseL( */ + /* TUid::Uid(aMessage.Int0()), */ + /* *iInputBuf, */ + /* aMessage, */ + /* KREPLYSLOT); */ - break; - } - case EUpdateNotifierAndGetResponse: - { - if (appUi && appUi->EikSrvBlocked()) - { - CleanupStack::PopAndDestroy(); // Free eikon server - } + /* break; */ + /* } */ + /* case EUpdateNotifierAndGetResponse: */ + /* { */ + /* if (appUi && appUi->EikSrvBlocked()) */ + /* { */ + /* CleanupStack::PopAndDestroy(); // Free eikon server */ + /* } */ - ResolveBuffersL(aMessage); + /* ResolveBuffersL(aMessage); */ - iOwner.UpdateNotifierAndGetResponseL( - TUid::Uid(aMessage.Int0()), - *iInputBuf, - aMessage, - KREPLYSLOT); + /* iOwner.UpdateNotifierAndGetResponseL( */ + /* TUid::Uid(aMessage.Int0()), */ + /* *iInputBuf, */ + /* aMessage, */ + /* KREPLYSLOT); */ - break; - } - default: - { - CAknAppServiceBase::ServiceL(aMessage); - } - } + /* break; */ + /* } */ + /* default: */ + /* { */ + /* CAknAppServiceBase::ServiceL(aMessage); */ + /* } */ + /* } */ + aMessage.Complete(KErrNone); + if (appUi && appUi->EikSrvBlocked()) { CleanupStack::PopAndDestroy(); // Free eikon server diff -r ca0622003710 -r 766eec733c2b uifw/AvKon/aknphysics/group/aknphysics.mmp --- a/uifw/AvKon/aknphysics/group/aknphysics.mmp Thu Sep 02 20:41:15 2010 +0300 +++ b/uifw/AvKon/aknphysics/group/aknphysics.mmp Fri Sep 17 08:31:14 2010 +0300 @@ -51,6 +51,5 @@ LIBRARY centralrepository.lib LIBRARY cone.lib LIBRARY avkon.lib -LIBRARY alfclient.lib LIBRARY eikcore.lib LIBRARY touchfeedback.lib diff -r ca0622003710 -r 766eec733c2b uifw/AvKon/aknphysics/inc/aknphysicsengine.h --- a/uifw/AvKon/aknphysics/inc/aknphysicsengine.h Thu Sep 02 20:41:15 2010 +0300 +++ b/uifw/AvKon/aknphysics/inc/aknphysicsengine.h Fri Sep 17 08:31:14 2010 +0300 @@ -24,7 +24,6 @@ #include class CAknPhysics; -class RAlfDirectClient; /** * Physics engine @@ -285,12 +284,6 @@ * View position. */ TPoint iViewPosition; - - /** - * Client to Alf, used for FPS logging. - * Own. - */ - RAlfDirectClient* iAlfClient; /** * Using application's UID. Used for FPS logging. diff -r ca0622003710 -r 766eec733c2b uifw/AvKon/aknphysics/src/aknphysicsengine.cpp --- a/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp Thu Sep 02 20:41:15 2010 +0300 +++ b/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp Fri Sep 17 08:31:14 2010 +0300 @@ -20,7 +20,6 @@ #include #include #include -#include #include "aknphysicsconstants.h" #include "aknphysicsengine.h" @@ -60,7 +59,6 @@ CAknPhysicsEngine::~CAknPhysicsEngine() { DeletePhysics(); - delete iAlfClient; } @@ -338,30 +336,7 @@ // void CAknPhysicsEngine::StartFpsLogging() { - if ( !iAlfClient ) - { - TRAP_IGNORE( iAlfClient = new ( ELeave ) RAlfDirectClient ); - } - - if ( iAlfClient ) - { - if ( iLogUid == KNullUid ) - { - CEikonEnv* env = CEikonEnv::Static(); - - if ( env ) - { - CEikAppUi* appUi = static_cast( env->AppUi() ); - - if ( appUi && appUi->Application() ) - { - iLogUid = appUi->Application()->AppDllUid(); - } - } - } - - iAlfClient->MeasureFPS( iLogUid.iUid, ETrue ); - } + //TODO: add fps logging } @@ -371,10 +346,7 @@ // void CAknPhysicsEngine::StopFpsLogging() { - if ( iAlfClient ) - { - iAlfClient->MeasureFPS( iLogUid.iUid, EFalse ); - } + //TODO: stop fps logging } diff -r ca0622003710 -r 766eec733c2b uiutils/hlplch/group/bld.inf --- a/uiutils/hlplch/group/bld.inf Thu Sep 02 20:41:15 2010 +0300 +++ b/uiutils/hlplch/group/bld.inf Fri Sep 17 08:31:14 2010 +0300 @@ -24,6 +24,7 @@ DEFAULT PRJ_EXPORTS +../group/hlpmodel.iby CORE_MW_LAYER_IBY_EXPORT_PATH(hlpmodel.iby) PRJ_MMPFILES #ifndef TOOLS diff -r ca0622003710 -r 766eec733c2b uiutils/hlplch/group/hlpmodel.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/uiutils/hlplch/group/hlpmodel.iby Fri Sep 17 08:31:14 2010 +0300 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: help launcher iby +* +*/ + +#ifndef __HLPMODEL_IBY__ +#define __HLPMODEL_IBY__ + +REM Help Launcher + +file=ABI_DIR\BUILD_DIR\hlplch.dll System\Libs\hlplch.dll +data=ZRESOURCE\Apps\lch.rsc Resource\Apps\lch.rsc + +#endif