# HG changeset patch # User hgs # Date 1285167975 -10800 # Node ID 56a7be608841d99890ecb0ea0789396787b0f73c # Parent 9352913932ef960c0e65af6c3584d3f44f54f068 201037_01 diff -r 9352913932ef -r 56a7be608841 appfw/apparchitecture/apserv/APSRECCACHE.cpp --- a/appfw/apparchitecture/apserv/APSRECCACHE.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/appfw/apparchitecture/apserv/APSRECCACHE.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -38,8 +38,13 @@ CRecognitionResultHashMapEntry::~CRecognitionResultHashMapEntry() { - iResult->Close(); - iResult = NULL; + + if(iResult != NULL) + { + iResult->Close(); + iResult = NULL; + } + delete iNext; } diff -r 9352913932ef -r 56a7be608841 appfw/apparchitecture/group/apparc.iby --- a/appfw/apparchitecture/group/apparc.iby Fri Sep 03 16:56:10 2010 +0300 +++ b/appfw/apparchitecture/group/apparc.iby Wed Sep 22 18:06:15 2010 +0300 @@ -54,7 +54,7 @@ file=ABI_DIR\BUILD_DIR\apfile.dll System\Libs\apfile.dll file=ABI_DIR\BUILD_DIR\aplist.dll System\Libs\aplist.dll file=ABI_DIR\BUILD_DIR\apgrfx.dll System\Libs\apgrfx.dll -file=ABI_DIR\DEBUG_DIR\apserv.dll System\Libs\apserv.dll +file=ABI_DIR\BUILD_DIR\apserv.dll System\Libs\apserv.dll file=ABI_DIR\BUILD_DIR\apsexe.exe System\Programs\apsexe.exe file=ABI_DIR\BUILD_DIR\ServiceRegistry.dll System\Libs\ServiceRegistry.dll diff -r 9352913932ef -r 56a7be608841 applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby --- a/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Fri Sep 03 16:56:10 2010 +0300 +++ b/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Wed Sep 22 18:06:15 2010 +0300 @@ -21,9 +21,9 @@ data=ABI_DIR\BUILD_DIR\tapstart_server.exe sys\bin\tapstart_server.exe -//data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat +data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat -//data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script +data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script #endif diff -r 9352913932ef -r 56a7be608841 commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp --- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -41,8 +41,11 @@ CancelNotifications(); __FLOG_CLOSE; + if(iServer != NULL) + { CConsoleAlarmAlertSession* session = iServer->WaitingSession(); session = NULL; + } delete iSoundLEDFlasher; delete iSoundCallbackTimer; delete iConsole; diff -r 9352913932ef -r 56a7be608841 commonappservices/alarmserver/Group/AlarmServer.iby --- a/commonappservices/alarmserver/Group/AlarmServer.iby Fri Sep 03 16:56:10 2010 +0300 +++ b/commonappservices/alarmserver/Group/AlarmServer.iby Wed Sep 22 18:06:15 2010 +0300 @@ -20,11 +20,6 @@ REM Alarm Server -#include -#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT -#include -#endif - #ifndef DATAZ_ define DATAZ_ EPOCROOT##epoc32\data\Z #endif diff -r 9352913932ef -r 56a7be608841 commonappservices/alarmserver/Group/bld.inf --- a/commonappservices/alarmserver/Group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/commonappservices/alarmserver/Group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -37,7 +37,7 @@ // Console Alarm Alert Server ../ConsoleAlarmAlertServer/Include/ConsoleAlarmAlertServerMain.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(consolealarmalertservermain.h) -AlarmServer.iby /epoc32/rom/include/alarmserver.iby +AlarmServer.iby CORE_MW_LAYER_IBY_EXPORT_PATH(alarmserver.iby) backup_registration.xml /epoc32/data/z/private/101f5027/backup_registration.xml backup_registration.xml /epoc32/release/winscw/udeb/z/private/101f5027/backup_registration.xml diff -r 9352913932ef -r 56a7be608841 contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp --- a/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-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" @@ -183,7 +183,7 @@ { FUNC_LOG; - for (TInt i = iPendingTasks.Count(); i > 0; i--) + for (TInt i = iPendingTasks.Count()-1; i >= 0; i--) { CCFPendingPersistencyTask* iTask = iPendingTasks[i]; if ( iTask->Mode() == CCFPendingPersistencyTask::EStore ) diff -r 9352913932ef -r 56a7be608841 contextframework/cfw/tsrc/public/basic/group/bld.inf --- a/contextframework/cfw/tsrc/public/basic/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -39,7 +39,7 @@ ../data/testsettings/10282BDA.txt\ /epoc32/data/z/private/10202be9/10282BDA.txt ../data/testsettings/10282BDA.txt\ - /epoc32/release/winscw/udeb/Z/private/10202be9/10282BDA.txt + /epoc32/release/winscw/udeb/z/private/10202be9/10282BDA.txt ../data/testsettings/testcontextsourcesetting1.xml\ /epoc32/data/z/private/10282BC4/Settings/10002001/testcontextsourcesetting1.xml diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp --- a/coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 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" @@ -350,7 +350,7 @@ static void PrepareRecoveryL() { // Rename thread - ignore error - User().RenameThread( KDbRecoveryThreadName ); + User::RenameThread( KDbRecoveryThreadName ); CActiveScheduler* scheduler = new(ELeave) CActiveScheduler(); CleanupStack::PushL(scheduler); diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf --- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -25,7 +25,7 @@ ../rom/rfscustcmdtest.iby CORE_OS_LAYER_IBY_EXPORT_PATH( rfscustcmdtest.iby ) ../data/excludelist.txt /epoc32/release/winscw/udeb/z/private/100059C9/excludelist.txt ../data/excludelist.txt /epoc32/release/winscw/urel/z/private/100059C9/excludelist.txt -../data/excludelist.txt /epoc32/data/Z/private/100059C9/excludelist.txt +../data/excludelist.txt /epoc32/data/z/private/100059C9/excludelist.txt // Export file for emulator. For HW file come from pkg ../init/rfscustcmdtest.ini /epoc32/winscw/c/testframework/rfscustcmdtest.ini diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/Rfs/src/rfsCommand.cpp --- a/coreapplicationuis/Rfs/src/rfsCommand.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/Rfs/src/rfsCommand.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 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" @@ -302,8 +302,8 @@ TFindFile find( iServer->iFs ); CDir* files (NULL); - find.FindWildByPath( fileName, NULL, files ); - if ( files ) + TInt ret = find.FindWildByPath( fileName, NULL, files ); + if ((ret == KErrNone) && files ) { TRACES("CRfsCommand::ExecuteL(): Target file already exists "); return KErrNone; diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Group/SysAp.mmp --- a/coreapplicationuis/SysAp/Group/SysAp.mmp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Wed Sep 22 18:06:15 2010 +0300 @@ -61,9 +61,9 @@ SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore - -SYSTEMINCLUDE /epoc32/include/mw - +SYSTEMINCLUDE /epoc32/include/mw/QtCore +SYSTEMINCLUDE /epoc32/include/mw/QtGui +SYSTEMINCLUDE /epoc32/include/stdapis/stlportv5 USERINCLUDE . USERINCLUDE ../Inc @@ -77,7 +77,7 @@ USERINCLUDE ../Src/memorycard MW_LAYER_SYSTEMINCLUDE -APP_LAYER_SYSTEMINCLUDE + START RESOURCE ../Data/SysAp.rss HEADER @@ -156,6 +156,7 @@ SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp SOURCE CenRepObservers/sysapcenrepofflinemodeobserver.cpp +SOURCE CenRepObservers/SysApCenRepSilentModeObserver.cpp LIBRARY centralrepository.lib LIBRARY cenrepnotifhandler.lib @@ -230,5 +231,22 @@ SOURCE SysApEtelNetworkStatusNspsObserver.cpp SysApEtelConnector.cpp SysApEtelNetworkBarObserver.cpp SysApEtelSmsStoreObserver.cpp sysapeteldatabearerobserver.cpp sysapetelnetworkbargetter.cpp sysapetelnetworkinfoobserver.cpp LIBRARY etelpckt.lib +//QtHighway lib for invoking logs app +LIBRARY xqservice.lib +LIBRARY xqserviceutil.lib +LIBRARY QtCore.lib + +//Required to use by EndKey +LIBRARY afactivitylauncher.lib + +//Required for OpenLibC +OPTION CW -cwd include -wchar_t on +OPTION ARMCC --visibility_inlines_hidden +#if defined(ARMCC_4_0) +OPTION ARMCC --import_all_vtbl +#endif +OPTION GCCE -fvisibility-inlines-hidden +STDCPP + diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Inc/SysAp.hrh --- a/coreapplicationuis/SysAp/Inc/SysAp.hrh Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysAp.hrh Wed Sep 22 18:06:15 2010 +0300 @@ -95,7 +95,8 @@ EPowerSaveModeActivated, EPowerSaveModeDeactivated, ECannotActivatePowerSaveMode, - ECannotDeactivatePowerSaveMode + ECannotDeactivatePowerSaveMode, + ESysApRestartPhone }; enum TSysApWaitNoteIds @@ -114,7 +115,6 @@ enum TSysApConfirmationQueryIds { ESysApNoQuery=0, - ESysApRestartPhoneQuery, ESysApLeaveOfflineModeQuery, ESysApRemoveMmcNote, ESysApEjectMmcQuery, diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Inc/SysApAppUi.h --- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Wed Sep 22 18:06:15 2010 +0300 @@ -63,6 +63,7 @@ class CSysApCenRepLightSettingsObserver; class CSysApCenRepBtObserver; class CSysApCenRepHacSettingObserver; +class CSysApCenRepSilentModeObserver; class CSysApAudioRoutingObserver; class CSysApSsSettingsObserver; class CSystemLock; @@ -263,12 +264,15 @@ TBool IsEncryptionOperationOngoingL() const; // void ConnectToFileServerL(); // void ConnectToWindowServerL(); - void ShowExampleUiNoteL ( const TDesC& noteText )const; + void HandleSendKeyEventL(); + void HandleEndKeyEventL(); + + void ShowNoteL ( const TDesC& noteText )const; void ShowNotificationDialog(const TDesC& noteText)const; void PopupNote(); // void CreateWindowGroup(); TBool ResourcesFreed() const; - void ShowUiNoteL( const TSysApNoteIds aNote ) const; + void ShowUiNoteL( const TSysApNoteIds aNote ); TInt StateOfProperty( const TUid& aCategory, const TUint aKey ) const; TBool OfflineModeActive(); void GoOnlineL( TBool aDoProfileChange = ETrue ); @@ -503,6 +507,7 @@ CSysApCenRepLightSettingsObserver* iSysApCenRepLightSettingsObserver; CSysApCenRepBtObserver* iSysApCenRepBtObserver; CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver; + CSysApCenRepSilentModeObserver* iSysApCenRepSilentModeObserver; CSysApAudioRoutingObserver* iSysApAudioRoutingObserver; CSysApPsmController* iSysApPsmController; @@ -536,6 +541,9 @@ TBool iResourcesFreed; TInt iCapturedEKeyPowerOff; TInt iCapturedEKeyPowerOffUpAndDowns; + TInt iCapturedEKeySendKey; + TInt iCapturedEKeyEndKey; + TBool iOfflineModeActive; TBool iShutdownStarted; diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Inc/SysApShutdownImage.h --- a/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 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" @@ -133,7 +133,7 @@ */ TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType); - CFbsBitmap* ReadSVGL (TFileName aFileName); + CFbsBitmap* ReadSVGL (const TFileName& aFileName); private: // Data //Used for showing user selected image diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -0,0 +1,124 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: CSysApCenRepSilentModeObserver implementation. + * +*/ + + +// INCLUDE FILES +#include "SysApCenRepSilentModeObserver.h" +#include "SysApAppUi.h" +#include + +// ========================== MEMBER FUNCTIONS ================================ + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +CSysApCenRepSilentModeObserver* CSysApCenRepSilentModeObserver::NewL( ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::NewL" ) ) ); + CSysApCenRepSilentModeObserver* self = new ( ELeave ) CSysApCenRepSilentModeObserver( ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop(); //self + return self; + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver( ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver" ) ) ); + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +CSysApCenRepSilentModeObserver::~CSysApCenRepSilentModeObserver() + { + TRACES( RDebug::Print( _L("~CSysApCenRepSilentModeObserver") ) ); + if ( iSilentModeHandler ) + { + iSilentModeHandler->StopListening(); + } + delete iSilentModeHandler; + delete iSession; + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::ConstructL() + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::ConstructL: trying CRepository::NewL( KCRUidBluetoothPowerState )") ) ); + iSession = CRepository::NewL( KCRUidProfileEngine ); + + iSilentModeHandler = + CCenRepNotifyHandler::NewL( *this, + *iSession, + CCenRepNotifyHandler::EIntKey, + KProEngSilenceMode ); + iSilentModeHandler->StartListeningL(); + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt(), aId=0x%x, aNewValue=%d" ), aId, aNewValue ) ); + + SilenceIndicatorL(aNewValue); + + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::HandleNotifyError( TUint32 /* aId */, TInt /* error */, CCenRepNotifyHandler* /* aHandler */ ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyError()" ) ) ); + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::SilenceIndicatorL(TInt aValue) + { + TRACES( RDebug::Print( _L(" CSysApCenRepSilentModeObserver::SilenceIndicatorL" ))); + CHbIndicatorSymbian* indicator = CHbIndicatorSymbian::NewL(); + CleanupStack::PushL(indicator); + _LIT(KSilentmodeindicator,"com.nokia.hb.indicator.controlpanel.cpsilenceindicatorplugin/1.0"); + + + if (aValue) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() activate silence indicator" ))); + // activate the indicator plugin to display the icon in status bar + indicator->Activate(KSilentmodeindicator); + } + else + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() Deactivate silence indicator" ))); + // deactivate the indicator plugin to remove the icon in the status bar + indicator->Deactivate(KSilentmodeindicator); + } + CleanupStack::PopAndDestroy(indicator); // indicator + } + + +// End of File + diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.h Wed Sep 22 18:06:15 2010 +0300 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: CSysApCenRepSilentModeObserver class definition. +* +*/ + + +#ifndef SYSAPCENREPSILENTMODEOBSERVER_H +#define SYSAPCENREPSILENTMODEOBSERVER_H + +// INCLUDES +#include +#include +#include "SysAp.hrh" +#include +#include + +// CLASS DECLARATION + + +class CSysApCenRepSilentModeObserver : public CBase, public MCenRepNotifyHandlerCallback + { + public: // Constructors and destructor + /** + * Default constructor + */ + static CSysApCenRepSilentModeObserver* NewL( ); + + /** + * Destructor. + */ + ~CSysApCenRepSilentModeObserver(); + + // From MCenRepNotifyHandlerCallback + void HandleNotifyInt( TUint32 aId, TInt aNewValue ); + void HandleNotifyError( TUint32 aId, TInt error, CCenRepNotifyHandler* aHandler ); + + private: + + /** + * @param None + * @return void + */ + void ConstructL( ); + + + /** + * C++ default constructor. + * @param None + * @return void + */ + CSysApCenRepSilentModeObserver(); + + + //To activate and Deactivate the indicator + void SilenceIndicatorL(TInt avalue); + + + + + private: + + CRepository* iSession; + //To listen to the silentmodekey + CCenRepNotifyHandler* iSilentModeHandler; + }; + +#endif // SYSAPCENREPSILENTMODEOBSERVER_H + +// End of File diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -55,7 +55,7 @@ #include "sysapkeymanagement.h" #include "SysApShutdownImage.h" #include "SysApKeySndHandler.h" - +#include "SysApCenRepSilentModeObserver.h" #include "SysApShutdownAnimation.h" #include "SysApEtelConnector.h" @@ -74,6 +74,21 @@ #include #include "sysap.rsg" #include +//Qt Highway +#include +#include +#include +#include +#include +#include +#include +//For End Key +#include +//For HS RPropertyKey +#include +//For Hs Changes +#include +#include class CHbSymbianVariant; const TInt KModifierMask( 0 ); @@ -156,7 +171,10 @@ RWindowGroup groupWin = iCoeEnv->RootWin(); User::LeaveIfError ( iCapturedEKeyPowerOff = groupWin.CaptureKey( EKeyPowerOff, KModifierMask, KModifierMask ) ); User::LeaveIfError ( iCapturedEKeyPowerOffUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyDevice2, KModifierMask, KModifierMask ) ); - + //Capture SEND and END keys + User::LeaveIfError ( iCapturedEKeySendKey = groupWin.CaptureKey( EKeyPhoneSend, KModifierMask, KModifierMask ) ); + User::LeaveIfError ( iCapturedEKeyEndKey = groupWin.CaptureKey( EKeyPhoneEnd, KModifierMask, KModifierMask ) ); + TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) ); iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL(*this); @@ -256,6 +274,10 @@ TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL trying CSysApCenRepHacSettingObserver::NewL") ) ); iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this ); + TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL trying CSysApCenRepSilentModeObserver::NewL") ) ); + iSysApCenRepSilentModeObserver = CSysApCenRepSilentModeObserver::NewL( ); + + #ifndef RD_MULTIPLE_DRIVE if ( iSysApFeatureManager->MmcSupported() ) { @@ -344,13 +366,17 @@ RWindowGroup groupWin = iCoeEnv->RootWin(); groupWin.CancelCaptureKey( iCapturedEKeyPowerOff ); groupWin.CancelCaptureKeyUpAndDowns( iCapturedEKeyPowerOffUpAndDowns ); + //Deregister SendKey + groupWin.CancelCaptureKey( iCapturedEKeySendKey ); + //Deregister EndKey + groupWin.CancelCaptureKey( iCapturedEKeyEndKey ); delete iSysApDefaultKeyHandler; delete iSysApCenRepLightSettingsObserver; delete iSysApCenRepBtObserver; delete iSysApCenRepHacSettingObserver; delete iSysApCenRepController; - + delete iSysApCenRepSilentModeObserver; delete iSysApPubSubObserver; delete iSysApLightsController; @@ -665,14 +691,14 @@ return iResourcesFreed; } -void CSysApAppUi::ShowExampleUiNoteL( const TDesC& noteText )const +void CSysApAppUi::ShowNoteL( const TDesC& noteText )const { - TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) ); + TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) ); CHbDeviceMessageBoxSymbian *note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation); CleanupStack::PushL(note); - TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); + TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); note->SetTextL(noteText); - note->SetTimeout(300); + note->SetTimeout(3000); TRACES( RDebug::Print( _L("CSysApAppUi:: Display of CHbDeviceMessageBoxSymbian::Begin") ) ); note->ShowL(); TRACES( RDebug::Print( _L("CSysApAppUi:: Display of CHbDeviceMessageBoxSymbian::End") ) ); @@ -1263,7 +1289,7 @@ TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KPowerPressKey); TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - ShowExampleUiNoteL( aStringPointer ); + ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString } @@ -2056,64 +2082,42 @@ // CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const // ---------------------------------------------------------------------------- -void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const +void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) { - TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) ); - + TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote") ) ); TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) ); - if( UiReady() || swState == ESwStateSecurityCheck) - { + { + TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) ); switch ( aNote ) { case EBatteryLowNote: { - _LIT(KPowerPressKey,"Battery low"); - HBufC* aString = HBufC16::NewLC(100); - TPtrC aStringPointer = aString->Des(); - aStringPointer.Set(KPowerPressKey); - TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - ShowExampleUiNoteL( aStringPointer ); - CleanupStack::PopAndDestroy(); // aString + _LIT(KLowBattery,"Battery low"); + ShowNoteL( KLowBattery() ); } break; case EBatteryFullNote: { - _LIT(KPowerPressKey,"Battery full"); - HBufC* aString = HBufC16::NewLC(100); - TPtrC aStringPointer = aString->Des(); - aStringPointer.Set(KPowerPressKey); - TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - ShowExampleUiNoteL( aStringPointer ); - CleanupStack::PopAndDestroy(); // aString + _LIT(KBatteryFull,"Battery full"); + ShowNoteL( KBatteryFull() ); } break; case ERechargeBatteryNote: { iSysApLightsController->BatteryEmptyL( ETrue ); - _LIT(KPowerPressKey,"Battery empty. Recharge"); - HBufC* aString = HBufC16::NewLC(100); - TPtrC aStringPointer = aString->Des(); - aStringPointer.Set(KPowerPressKey); - TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - ShowExampleUiNoteL( aStringPointer ); - CleanupStack::PopAndDestroy(); // aString + _LIT(KRechargeBattery,"Battery empty. Recharge"); + ShowNoteL( KRechargeBattery() ); } break; case ENotChargingNote: { - _LIT(KPowerPressKey,"Not charging"); - HBufC* aString = HBufC16::NewLC(100); - TPtrC aStringPointer = aString->Des(); - aStringPointer.Set(KPowerPressKey); - TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - ShowExampleUiNoteL( aStringPointer ); - CleanupStack::PopAndDestroy(); // aString + _LIT(KNotCharging,"Not charging"); + ShowNoteL( KNotCharging() ); } break; case EBatteryFullUnplugChargerNote: { - TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); iSysApLightsController->BatteryEmptyL( ETrue ); _LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy"); HBufC* unplugCharger = HbTextResolverSymbian::LoadL(KunplugCharger); @@ -2124,22 +2128,28 @@ break; case EUnplugChargerNote: { - _LIT(KPowerPressKey,"Unplug charger from power supply to save energy"); - HBufC* aString = HBufC16::NewLC(250); - TPtrC aStringPointer = aString->Des(); - aStringPointer.Set(KPowerPressKey); - TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - ShowExampleUiNoteL( aStringPointer ); - CleanupStack::PopAndDestroy(); // aString + _LIT(KUnplugCharger,"Unplug charger from power supply to save energy"); + ShowNoteL( KUnplugCharger() ); } break; + case ESysApRestartPhone: + { + //Show the restart note + _LIT(KRestartPhone,"Phone will be restarted"); + ShowNoteL( KRestartPhone() ); + //wait for 3 seconds to close note. Other wise the shutdown will continue + //without waiting for note to complete. + User::After(4000000); + //Now restart the device + DoShutdownL( ETrue, RStarterSession::EDataRestoreReset ); + } + break; default: break; } } } - - + // ---------------------------------------------------------------------------- // CSysApAppUi::BatteryEmptyL() // ---------------------------------------------------------------------------- @@ -2776,6 +2786,30 @@ Exit(); break; #endif + case EKeyPhoneSend: + { + TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Send key event received::Start") ) ); + if (UiReady()&& aKeyEvent.iRepeats == 0) + { + //Ignore LongPress on SEND key event as Long press generates Short press event too, + //And there is no Different use case for long press. + HandleSendKeyEventL(); + } + TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Send key event received::End") ) ); + break; + } + case EKeyPhoneEnd: + { + TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, End key event received") ) ); + if (UiReady() && aKeyEvent.iRepeats == 0) + { + //Ignore LongPress on END key event as Long press generates Short press event too, + //And there is no Different use case for long press. + HandleEndKeyEventL(); + } + TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL()::EKeyPhoneEnd: End" ) ) ); + break; + } case EKeyPowerOff: //Short power key press iKeyBoardRepeatCount++; @@ -4055,6 +4089,93 @@ } } - +/** + * Handles SEND key events + * If SEND key is pressed in idle Home screen view, This will bring LOGS View without DialPad. + * otherwise, it brings LOGS&Dial pad. + */ +void CSysApAppUi::HandleSendKeyEventL() + { + TRACES( RDebug::Print( _L("CSysApAppUi::HandleSendKeyEventL: START") ) ); + //Check whether ForeGround app is HomeScreen + TInt hsStatus(EHomeScreenIdleState) ; + //Get the RProperty + User::LeaveIfError( RProperty::Get(KHsCategoryUid, KHsCategoryStateKey, hsStatus)); + //Enable dialpad in Non-HS view + const TBool enableDialPad( EHomeScreenIdleState != hsStatus ); + + //invoke LOGS/Dialer app + XQApplicationManager appMgr; + QScopedPointer request(appMgr.create(QString("logs"), XQI_LOGS_VIEW, XQOP_LOGS_SHOW, false)); + + if (!request.isNull()) + { + TRACES( RDebug::Print( _L("CSysApAppUi::HandleSendKeyEventL::Request::Begin") ) ); + int retValue = -1; + + QVariantMap map; + map.insert(XQLOGS_VIEW_INDEX, QVariant(0)); + map.insert(XQLOGS_SHOW_DIALPAD, QVariant(enableDialPad)); + map.insert(XQLOGS_DIALPAD_TEXT, QVariant(QString())); + + QList arglist; + + arglist.append(QVariant(map)); + request->setArguments(arglist); + QVariant ret(retValue); + request->send(ret); + TRACES( RDebug::Print( _L("CSysApAppUi::InvokeApp::Request::End") ) ); + } + + TRACES( RDebug::Print( _L("CSysApAppUi::HandleSendKeyEventL: End") ) ); + } + +/** + * Handles END key events + * If END key is pressed, Fore ground app will be exits and + * Home screen view will brought to Foreground + */ +void CSysApAppUi::HandleEndKeyEventL() + { + TRACES( RDebug::Print( _L("CSysApAppUi::HandleEndKeyEventL: Start") ) ); + //Get ForeGround App + TInt foregroundWindowGroupId = iEikonEnv->WsSession().GetFocusWindowGroup(); + CApaWindowGroupName* doomedApp = CApaWindowGroupName::NewLC(iEikonEnv->WsSession(),foregroundWindowGroupId ); + + //Bring the HS before killing the ForeGround App. + _LIT(KHsActivactionUri, "appto://20022F35?activityname=HsIdleView"); + RApaLsSession apaLsSession; + CleanupClosePushL(apaLsSession); + User::LeaveIfError(apaLsSession.Connect()); + CAfActivityLauncher *activityEnabler = CAfActivityLauncher::NewLC(apaLsSession, iEikonEnv->WsSession()); + activityEnabler->launchActivityL(KHsActivactionUri); + CleanupStack::PopAndDestroy(activityEnabler); + CleanupStack::PopAndDestroy(&apaLsSession); + + //End or Kill the Foreground App + //If Phone is in HS idle view, End key have no impact. + if ( !doomedApp->IsSystem() ) + { + TApaTask task( iEikonEnv->WsSession() ); + task.SetWgId( foregroundWindowGroupId ); + TRACES ( + const TDesC& caption = doomedApp->Caption(); + const TDesC& docname = doomedApp->DocName(); + const TDesC& wgname = doomedApp->WindowGroupName(); + TUid uid = doomedApp->AppUid(); + RDebug::Print( _L("CSysApAppUi::HandleEndKeyEventL: Closing app \"%S\" (ThreadId %d, WgId %d, UID 0x%X); Docname: %S, WGName : %S"), + &caption, + (TUint)(task.ThreadId()), + foregroundWindowGroupId, + uid.iUid, + &docname, + &wgname); + ); + task.EndTask(); + TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL::HandleEndKeyEventL, End task event triggered") ) ); + } + CleanupStack::PopAndDestroy(doomedApp);//doomedApp + TRACES( RDebug::Print( _L("CSysApAppUi::HandleEndKeyEventL: End") ) ); + } //end of file diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp --- a/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -123,12 +123,6 @@ switch ( iQueryId ) { - case ESysApRestartPhoneQuery: - queryStringBuf = StringLoader::LoadLC( R_QTN_RESTART_QUERY, aLoaderEnv ); - keys = R_AVKON_SOFTKEYS_OK_EMPTY; - anim = R_QGN_NOTE_WARNING_ANIM; - secondaryDisplayCmdId = SecondaryDisplay::ECmdShowRestartPhoneQuery; - break; case ESysApLeaveOfflineModeQuery: queryStringBuf = StringLoader::LoadLC( R_QTN_LEAVE_OFFLINE_MODE_QUERY, aLoaderEnv ); keys = R_AVKON_SOFTKEYS_YES_NO; @@ -282,12 +276,6 @@ TRACES( RDebug::Print( _L( "CSysApConfirmationQuery::RunL: iQueryId = %d, iStatus = %d" ), iQueryId, iStatus.Int() ) ); switch ( iQueryId ) { - case ESysApRestartPhoneQuery: - { - TRACES( RDebug::Print( _L( "CSysApConfirmationQuery::RunL: calling CSysApAppUi::DoShutdownL( ETrue, EDataRestoreReset )" ) ) ); - iSysApAppUi.DoShutdownL( ETrue, RStarterSession::EDataRestoreReset ); - } - break; case ESysApLeaveOfflineModeQuery: if ( iStatus.Int() == EAknSoftkeyYes ) { diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp --- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -636,8 +636,7 @@ else if ( iRestoreOngoing ) { TRACES( RDebug::Print( _L("CSysApPubSubObserver::HandleSystemCategoryL: restore finished, make the device reset" ) ) ); - User::After( 1000000 ); - iSysApAppUi.ShowQueryL( ESysApRestartPhoneQuery ); + iSysApAppUi.ShowUiNoteL( ESysApRestartPhone ); } } break; diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp --- a/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2008 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" @@ -166,7 +166,7 @@ // ---------------------------------------------------------------------------- // CSysApShutdownImage::ShowShutdownImage() // ---------------------------------------------------------------------------- -CFbsBitmap* CSysApShutdownImage::ReadSVGL (TFileName aFileName) +CFbsBitmap* CSysApShutdownImage::ReadSVGL (const TFileName& aFileName) { TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:start" ) ) ); TFontSpec fontspec; diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp --- a/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -211,7 +211,7 @@ TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KChargingNote); TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString return; } @@ -228,7 +228,7 @@ TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KChargingNote); TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString iSysApDriveList.MarkDriveUnlockQueryShown( iDriveToUnlock ); } @@ -300,7 +300,7 @@ HBufC* aString = HBufC16::NewLC(150); TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KUnlockNote); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString return ETrue; } @@ -311,7 +311,7 @@ HBufC* aString = HBufC16::NewLC(150); TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KUnlockDeniedNote); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString return EFalse; } @@ -322,7 +322,7 @@ HBufC* aString = HBufC16::NewLC(150); TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KUnlockAlreadyExistNote); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString return ETrue; } @@ -334,7 +334,7 @@ TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KUnlockNotSupporrtedNote); TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString return ETrue; } @@ -346,7 +346,7 @@ TPtrC aStringPointer = aString->Des(); aStringPointer.Set(KUnlockOperationCancelNote); TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); - iSysApAppUi.ShowExampleUiNoteL( aStringPointer ); + iSysApAppUi.ShowNoteL( aStringPointer ); CleanupStack::PopAndDestroy(); // aString return ETrue; } diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp --- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -41,6 +41,7 @@ #include //#include "sysapappui.h" #include +#include const TInt KModifierMask( 0 ); @@ -288,8 +289,8 @@ TInt value(0); TBool retval(EFalse); - RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, value ); - if ( value > EAutolockOff ) + RProperty::Get( KPSUidAvkonDomain, KAknKeyguardStatus, value ); + if ( value > EKeyguardNotActive ) { retval = ETrue; } diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf --- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -20,10 +20,10 @@ PRJ_TESTEXPORTS remconservercaps.mmh /epoc32/include/remcon/remconservercaps.mmh -../data/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul -../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul -../data/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul -../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul +../data/keyevent.rul /epoc32/data/z/private/10282bc4/rules/keyevent.rul +../data/keyevent.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyevent.rul +../data/keyincall.rul /epoc32/data/z/private/10282bc4/rules/keyincall.rul +../data/keyincall.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyincall.rul PRJ_TESTMMPFILES ../../../group/RemConTspController.mmp \ No newline at end of file diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp --- a/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -42,6 +42,8 @@ { //Translator loaded succesfully then olny construct widgets constructDialog(parameters); + this->actions()[0]->setEnabled(true); + if (!mPrimaryAction) { // If default button provided by HbInputDialog is used, connect into its triggered signal. QAction *action = /*primaryAction()*/this->actions().first(); diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -64,20 +64,20 @@ ../data/testspec_015.txt /epoc32/winscw/c/testdata/testspec_015.txt // Application specific exclude list(s) exported to rom drive -../data/app_spec_rom_001.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_001.exc +../data/app_spec_rom_001.exc /epoc32/data/z/private/102073ea/excludes/app_spec_001.exc ../data/app_spec_rom_001.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_001.exc ../data/app_spec_rom_001.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_001.exc -../data/app_spec_rom_002.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_002.exc +../data/app_spec_rom_002.exc /epoc32/data/z/private/102073ea/excludes/app_spec_002.exc ../data/app_spec_rom_002.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_002.exc ../data/app_spec_rom_002.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_002.exc -../data/app_spec_rom_dummy.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_dummy.exc +../data/app_spec_rom_dummy.exc /epoc32/data/z/private/102073ea/excludes/app_spec_dummy.exc ../data/app_spec_rom_dummy.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_dummy.exc ../data/app_spec_rom_dummy.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_dummy.exc -../data/app_spec_003.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_003.exc -../data/app_spec_004.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_004.exc -../data/app_spec_005.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_005.exc -../data/app_spec_006.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_006.exc -../data/app_spec_007.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_007.exc +../data/app_spec_003.exc /epoc32/data/z/private/102073ea/excludes/app_spec_003.exc +../data/app_spec_004.exc /epoc32/data/z/private/102073ea/excludes/app_spec_004.exc +../data/app_spec_005.exc /epoc32/data/z/private/102073ea/excludes/app_spec_005.exc +../data/app_spec_006.exc /epoc32/data/z/private/102073ea/excludes/app_spec_006.exc +../data/app_spec_007.exc /epoc32/data/z/private/102073ea/excludes/app_spec_007.exc // Application specific test specs and exclude lists diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -28,7 +28,7 @@ ../sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul // context source setting for test ps keys -../101FB3E7.xml /epoc32/data/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml +../101FB3E7.xml /epoc32/data/z/private/10282BC4/Settings/10282C74/101FB3E7.xml // Iby export ../../rom/sensordatacontrollerplgtest.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacontrollerplgtest.iby ) diff -r 9352913932ef -r 56a7be608841 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -27,14 +27,14 @@ ../conf/sensordatacompensatorplgtest.cfg /epoc32/winscw/c/TestFramework/sensordatacompensatorplgtest.cfg // Rule files -../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul -../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul // context source setting for test ps keys -../data/101FB3E7.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml -../data/101FB3E7.xml /epoc32/RELEASE/winscw/UREL/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml +../data/101FB3E7.xml /epoc32/release/winscw/udeb/z/private/10282BC4/Settings/10282C74/101FB3E7.xml +../data/101FB3E7.xml /epoc32/release/winscw/urel/z/private/10282BC4/Settings/10282C74/101FB3E7.xml PRJ_TESTMMPFILES sensordatacompensatorplgtest.mmp diff -r 9352913932ef -r 56a7be608841 layers.sysdef.xml --- a/layers.sysdef.xml Fri Sep 03 16:56:10 2010 +0300 +++ b/layers.sysdef.xml Wed Sep 22 18:06:15 2010 +0300 @@ -10,10 +10,28 @@ - + - + + + + + + + + + + + + + + + + + + + diff -r 9352913932ef -r 56a7be608841 package_definition.xml --- a/package_definition.xml Fri Sep 03 16:56:10 2010 +0300 +++ b/package_definition.xml Wed Sep 22 18:06:15 2010 +0300 @@ -1,154 +1,157 @@ + + Nokia + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -156,127 +159,127 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -293,23 +296,23 @@ - + - + - + - + - + @@ -325,20 +328,20 @@ - + - + - + - + diff -r 9352913932ef -r 56a7be608841 printingsupport/printinguisupport/group/bld.inf --- a/printingsupport/printinguisupport/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/printingsupport/printinguisupport/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -39,7 +39,7 @@ ../inc/prnpath.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(printinguisupport/prnpath.h) ../inc/PRNUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnuids.h) -../group/print.iby /epoc32/rom/include/print.iby +../group/print.iby CORE_MW_LAYER_IBY_EXPORT_PATH(print.iby) PRJ_MMPFILES // specify the .mmp files required for building the important component releasables diff -r 9352913932ef -r 56a7be608841 startupservices/SplashScreen/inc/SplashScreen.h --- a/startupservices/SplashScreen/inc/SplashScreen.h Fri Sep 03 16:56:10 2010 +0300 +++ b/startupservices/SplashScreen/inc/SplashScreen.h Wed Sep 22 18:06:15 2010 +0300 @@ -155,7 +155,7 @@ CMainWindow (CWsClient* aClient); ~CMainWindow (); void Draw (const TRect& aRect); - CFbsBitmap* ReadSVGL (TFileName aFileName); + CFbsBitmap* ReadSVGL (const TFileName& aFileName); void HandlePointerEvent (TPointerEvent& aPointerEvent); void ConstructL (const TRect& aRect, CWindow* aParent=0); private: diff -r 9352913932ef -r 56a7be608841 startupservices/SplashScreen/src/SplashScreen.cpp --- a/startupservices/SplashScreen/src/SplashScreen.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/startupservices/SplashScreen/src/SplashScreen.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -331,7 +331,7 @@ TRACES("CMainWindow::~CMainWindow(): End"); } -CFbsBitmap* CMainWindow::ReadSVGL (TFileName aFileName) +CFbsBitmap* CMainWindow::ReadSVGL (const TFileName& aFileName) { TRACES("CMainWindow::ReadSVGL(): Start"); TFontSpec fontspec; diff -r 9352913932ef -r 56a7be608841 sysresmonitoring/oommonitor/group/bld.inf --- a/sysresmonitoring/oommonitor/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/sysresmonitoring/oommonitor/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -23,9 +23,9 @@ PRJ_EXPORTS ../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby) -../data/oomconfig.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10207218/oomconfig.xml -../data/oomconfig.xml /epoc32/RELEASE/winscw/UREL/Z/private/10207218/oomconfig.xml -../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/release/winscw/udeb/z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/release/winscw/urel/z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml PRJ_MMPFILES oommonitor.mmp diff -r 9352913932ef -r 56a7be608841 sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf --- a/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Fri Sep 03 16:56:10 2010 +0300 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Wed Sep 22 18:06:15 2010 +0300 @@ -21,7 +21,7 @@ DEFAULT PRJ_TESTEXPORTS -../../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml +../../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml PRJ_TESTMMPFILES diff -r 9352913932ef -r 56a7be608841 systemsettings/accindicatorplugin/inc/accindicator.h --- a/systemsettings/accindicatorplugin/inc/accindicator.h Fri Sep 03 16:56:10 2010 +0300 +++ b/systemsettings/accindicatorplugin/inc/accindicator.h Wed Sep 22 18:06:15 2010 +0300 @@ -62,15 +62,11 @@ private: QString mDisplayName; - QProcess mProcess; TAccMode mAccMode; int mAccType; QStringList mIndicatorTypes; QStringList mArgs; -private slots: - void processError(QProcess::ProcessError err); // handler for error codes - private: Q_DISABLE_COPY(AccIndicatorPlugin) int mError; diff -r 9352913932ef -r 56a7be608841 systemsettings/accindicatorplugin/src/accindicator.cpp --- a/systemsettings/accindicatorplugin/src/accindicator.cpp Fri Sep 03 16:56:10 2010 +0300 +++ b/systemsettings/accindicatorplugin/src/accindicator.cpp Wed Sep 22 18:06:15 2010 +0300 @@ -96,8 +96,6 @@ // If it is 3-pole ( i.e., HeadSet or TTY ) and TV-Out enable the handleInteraction() to change the settings. if(mAccMode == EAccModeWiredHeadset || mAccMode == EAccModeWirelessHeadset || mAccMode == EAccModeTextDevice || mAccMode == EAccModeTVOut ) { - QObject::connect( &mProcess, SIGNAL(error(QProcess::ProcessError)), - this, SLOT(processError(QProcess::ProcessError))); QVariant mode,type; mode.setValue((int)mAccMode); @@ -106,7 +104,8 @@ mArgs.append(type.toString()); // Launch the process to show the view. - mProcess.start("accindicatorsettings" , mArgs); + QString program("z://sys//bin//accindicatorsettings.exe"); + QProcess::startDetached(program,mArgs); handled = true; } } @@ -128,7 +127,7 @@ return type; } //for displaying the icon in indicator. - case MonoDecorationNameRole: + case DecorationNameRole: { QString iconName; if(mAccType == KPCWired || mAccType == KPCUSB) @@ -228,23 +227,3 @@ mDisplayName.append(QString("Unknown")); } } - -// ---------------------------------------------------------------------------- -// AccIndicator::processError -// handle the error conditions reurned by the QProcess. -// ---------------------------------------------------------------------------- - -void AccIndicatorPlugin::processError(QProcess::ProcessError err) - { - switch (err) { - case QProcess::FailedToStart: - case QProcess::Crashed: - case QProcess::Timedout: - case QProcess::ReadError: - case QProcess::WriteError: - case QProcess::UnknownError: - break; - default: - break; - } - } diff -r 9352913932ef -r 56a7be608841 tzservices/tzlocrscfactory/res/timezonegroups.rss --- a/tzservices/tzlocrscfactory/res/timezonegroups.rss Fri Sep 03 16:56:10 2010 +0300 +++ b/tzservices/tzlocrscfactory/res/timezonegroups.rss Wed Sep 22 18:06:15 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -82,4 +82,4 @@ { city_group_id = 12; city_group_name = STRING_city_group_name_12; - } \ No newline at end of file + }