# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272879623 -10800 # Node ID b0b858956ed546d9b63d183f23f4058ab51eebdb # Parent c4cbaa4fb734113946429b806cb4268777490ea7 Revision: 201015 Kit: 201018 diff -r c4cbaa4fb734 -r b0b858956ed5 appfw/apparchitecture/tef/zerosizedicontestapp.mmp --- a/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Mon May 03 12:40:23 2010 +0300 @@ -25,8 +25,7 @@ SOURCE zerosizedicontestapp.cpp USERINCLUDE . -SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/techview +MW_LAYER_SYSTEMINCLUDE_SYMBIAN // Application exe specific resource which is localised to the application RESOURCE zerosizedicon_loc.rss diff -r c4cbaa4fb734 -r b0b858956ed5 appsupport_plat/ood_threshold_api/inc/UiklafInternalCRKeys.h --- a/appsupport_plat/ood_threshold_api/inc/UiklafInternalCRKeys.h Fri Apr 16 15:08:06 2010 +0300 +++ b/appsupport_plat/ood_threshold_api/inc/UiklafInternalCRKeys.h Mon May 03 12:40:23 2010 +0300 @@ -63,6 +63,13 @@ */ const TUint32 KUikOODDiskFreeSpaceWarningNoteLevel = 0x00000006; +/** + * Threshold for disk space warning note level for mass memory. + * Read-only key. Default value: 20971520 + */ +const TUint32 KUikOODDiskFreeSpaceWarningNoteLevelMassMemory = 0x00000007; + + #endif __UIKLAF_INTERNAL_CR_KEYS_H__ // End of file diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/inc/cfactivatorengine/CFActivatorEngineActionPluginManager.h --- a/contextframework/cfw/inc/cfactivatorengine/CFActivatorEngineActionPluginManager.h Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/inc/cfactivatorengine/CFActivatorEngineActionPluginManager.h Mon May 03 12:40:23 2010 +0300 @@ -158,6 +158,8 @@ * Not own. Can be NULL */ MCFStarterEventHandler* iEventHandler; +// JNIA-849K7Gs + TBool iUpdatePluginsAllowed; }; #endif diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/inc/cfcontextsourcemanager/CFContextSourceManager.h --- a/contextframework/cfw/inc/cfcontextsourcemanager/CFContextSourceManager.h Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/inc/cfcontextsourcemanager/CFContextSourceManager.h Mon May 03 12:40:23 2010 +0300 @@ -288,6 +288,8 @@ // Event handler, not own, can be NULL MCFStarterEventHandler* iEventHandler; + //JNIA-849K7G Error + TBool iUpdatePluginsAllowed; }; #endif diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/src/cfactivatorengine/CFActivatorEngineActionPluginManager.cpp --- a/contextframework/cfw/src/cfactivatorengine/CFActivatorEngineActionPluginManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/src/cfactivatorengine/CFActivatorEngineActionPluginManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -268,7 +268,7 @@ void CCFActivatorEngineActionPluginManager::InitLoadingPluginsPhaseL() { FUNC_LOG; - + iUpdatePluginsAllowed = ETrue; UpdatePlugInsL(); } @@ -280,7 +280,7 @@ void CCFActivatorEngineActionPluginManager::UpdatePlugInsL() { FUNC_LOG; - + if (!iUpdatePluginsAllowed){return;} // List all plugins RImplInfoPtrArray implInfoArray; CleanupPushImplInfoArrayL( implInfoArray ); diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/src/cfcontextsourcemanager/CFContextSourceManager.cpp --- a/contextframework/cfw/src/cfcontextsourcemanager/CFContextSourceManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/src/cfcontextsourcemanager/CFContextSourceManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -477,7 +477,7 @@ void CCFContextSourceManager::UpdatePlugInsL() { FUNC_LOG; - + if (!iUpdatePluginsAllowed){return;} // List all plugins RImplInfoPtrArray implInfoArray; CleanupResetAndDestroyPushL( implInfoArray ); @@ -784,7 +784,7 @@ void CCFContextSourceManager::InitLoadingPluginsPhaseL() { FUNC_LOG; - + iUpdatePluginsAllowed = ETrue; UpdatePlugInsL(); } diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.cpp --- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.cpp Mon May 03 12:40:23 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" @@ -35,7 +35,6 @@ #include "CFTestDelay.h" #include "cffakeenv.h" #include "ScriptEventNotifierSession.h" -#include "cfenvutils.h" // CONSTANTS @@ -66,8 +65,6 @@ // Destructor (virtual by CBase) mt_basicoperationsplugin::~mt_basicoperationsplugin() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -81,9 +78,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/MT_CFClient/MT_CFClient.cpp --- a/contextframework/cfw/tsrc/public/basic/MT_CFClient/MT_CFClient.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFClient/MT_CFClient.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 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" @@ -37,7 +37,6 @@ #include "testcontextsourceplugin.h" #include "testcontextsourcepluginconst.hrh" #include "CFTestDelay.h" -#include "cfenvutils.h" // CONSTANTS @@ -306,9 +305,6 @@ MT_CFClient::~MT_CFClient( ) { Teardown(); - - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -322,9 +318,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL ( ); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/MT_CFContextSourceManager.cpp --- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/MT_CFContextSourceManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/MT_CFContextSourceManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 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" @@ -30,7 +30,6 @@ #include "cfcontextsourcesettingarray.h" #include "testcontextsourceplugin.h" -#include "cfenvutils.h" // CONSTANTS @@ -103,9 +102,6 @@ MT_CFContextSourceManager::~MT_CFContextSourceManager() { Teardown(); - - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -119,9 +115,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/MT_CFContextSourceSettingsManager.cpp --- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/MT_CFContextSourceSettingsManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/MT_CFContextSourceSettingsManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -27,7 +27,6 @@ #include #include -#include "cfenvutils.h" // INTERNAL INCLUDES @@ -67,9 +66,6 @@ MT_CFContextSourceSettingsManager::~MT_CFContextSourceSettingsManager() { Teardown(); - - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -83,9 +79,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/MT_CFOperationPluginManager.cpp --- a/contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/MT_CFOperationPluginManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/MT_CFOperationPluginManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -27,7 +27,6 @@ // INTERNAL INCLUDES #include "cfscripthandler.h" -#include "cfenvutils.h" // CONSTRUCTION MT_CFOperationPluginManager* MT_CFOperationPluginManager::NewL() @@ -51,8 +50,6 @@ // Destructor (virtual by CBase) MT_CFOperationPluginManager::~MT_CFOperationPluginManager() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -66,9 +63,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.cpp --- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 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" @@ -36,7 +36,6 @@ #include "ScriptEventNotifierSession.h" #include "basicoperationspluginconst.hrh" #include "cfcommon.h" -#include "cfenvutils.h" // CONSTANTS @@ -68,8 +67,6 @@ // Destructor (virtual by CBase) MT_CFScriptEngine::~MT_CFScriptEngine() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -83,9 +80,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/UT_CCFContextManager.cpp --- a/contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/UT_CCFContextManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/UT_CCFContextManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 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" @@ -28,7 +28,6 @@ #include "CFContextIndication.h" #include "CFContextSubscription.h" #include "cfcontextobjectimpl.h" -#include "cfenvutils.h" // CONSTRUCTION @@ -53,8 +52,6 @@ // Destructor (virtual by CBase) UT_CCFContextManager::~UT_CCFContextManager() { - // ETrue screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -68,9 +65,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/UT_CCFEngine/UT_CCFEngine.cpp --- a/contextframework/cfw/tsrc/public/basic/UT_CCFEngine/UT_CCFEngine.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/UT_CCFEngine/UT_CCFEngine.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 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" @@ -30,7 +30,6 @@ #include "CFContextInterface.h" #include "CFContextSubscription.h" #include "CFContextIndication.h" -#include "cfenvutils.h" // CONSTANTS const TInt KSecond = 1000000; @@ -57,8 +56,6 @@ // Destructor (virtual by CBase) UT_CCFEngine::~UT_CCFEngine() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -72,9 +69,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/UT_CFActivatorEngine.cpp --- a/contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/UT_CFActivatorEngine.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/UT_CFActivatorEngine.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -35,7 +35,6 @@ #include "cfactionindicationimpl.h" #include "cfactionsubscriptionimpl.h" #include "cfscriptevent.h" -#include "cfenvutils.h" #include "TestActionPluginConst.hrh" #include "cfactionpluginthread.h" @@ -97,9 +96,6 @@ UT_CFActivatorEngine::~UT_CFActivatorEngine() { Teardown(); - - // Enable screen saver again - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -112,10 +108,7 @@ { // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. - CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver since it is causing false memory leaks - CFEnvUtils::EnableScreenSaver( EFalse ); + CEUnitTestSuiteClass::ConstructL(); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/UT_CFContextSourceManager.cpp --- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/UT_CFContextSourceManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/UT_CFContextSourceManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 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" @@ -28,7 +28,6 @@ // INTERNAL INCLUDES #include "CFContextSourcePlugIn.h" #include "CFContextSourceManager.h" -#include "cfenvutils.h" _LIT_SECURITY_POLICY_PASS( KPassSec ); @@ -54,8 +53,6 @@ // Destructor (virtual by CBase) UT_CFContextSourceManager::~UT_CFContextSourceManager() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -69,9 +66,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/UT_CFContextSourceSettingsManager.cpp --- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/UT_CFContextSourceSettingsManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/UT_CFContextSourceSettingsManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -29,7 +29,6 @@ #include "cfcontextsourcesettingparameterimpl.h" #include "cfcontextsourcesettingsmanagerimpl.h" #include "cfcontextsourcesettingarrayimpl.h" -#include "cfenvutils.h" // Cleans up RKeyValueArray instance LOCAL_C void CleanupKeyValueArray( TAny* aArray ) @@ -67,9 +66,6 @@ UT_CFContextSourceSettingsManager::~UT_CFContextSourceSettingsManager() { Teardown(); - - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -83,9 +79,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/UT_CFOperationPluginManager.cpp --- a/contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/UT_CFOperationPluginManager.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/UT_CFOperationPluginManager.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006 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" @@ -26,7 +26,6 @@ // INTERNAL INCLUDES #include "cfoperationpluginmanager.h" -#include "cfenvutils.h" // CONSTRUCTION UT_CFOperationPluginManager* UT_CFOperationPluginManager::NewL() @@ -50,8 +49,6 @@ // Destructor (virtual by CBase) UT_CFOperationPluginManager::~UT_CFOperationPluginManager() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -65,9 +62,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/common/cfenvutils.cpp --- a/contextframework/cfw/tsrc/public/basic/common/cfenvutils.cpp Fri Apr 16 15:08:06 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -/* -* Copyright (c) 2008-2008 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: CFEnvUtils class implamentation. -* -*/ - - -// SYSTEM INCLUDES -#include -#include -#include - -// USER INCLUDES -#include "cfenvutils.h" - -const TInt KScreenSaverNotAllowed = 666; -const TInt KScreenSaverAllowed = 0; - -// ======== MEMBER FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// C++ constructor. -// --------------------------------------------------------------------------- -// -CFEnvUtils::CFEnvUtils ( ) - { - - } - -//------------------------------------------------------------------------------ -// CFEnvUtils::EnableScreenSaver -//------------------------------------------------------------------------------ -// -TInt CFEnvUtils::EnableScreenSaver( TBool& aWasEnabled, const TBool aEnable ) - { - TInt err( KErrNone ); - TInt val( KScreenSaverNotAllowed ); - - err = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, val ); - EUNIT_PRINT( _L("Get screen saver mode: %d"), err ); - if( err == KErrNone ) - { - aWasEnabled = ( val != KScreenSaverAllowed ); - err = EnableScreenSaver( aEnable ); - } - - return err; - } - -//------------------------------------------------------------------------------ -// CFEnvUtils::EnableScreenSaver -//------------------------------------------------------------------------------ -// -TInt CFEnvUtils::EnableScreenSaver( const TBool aEnable ) - { - TInt err( KErrNone ); - - TInt val = 0; - if( aEnable ) - { - val = KScreenSaverAllowed; - } - else - { - val = KScreenSaverNotAllowed; - } - err = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, val ); - EUNIT_PRINT( _L("Set screen saver mode: %d"), err ); - - User::ResetInactivityTime(); - - return err; - } - -// End of file diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/common/cfenvutils.h --- a/contextframework/cfw/tsrc/public/basic/common/cfenvutils.h Fri Apr 16 15:08:06 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* -* Copyright (c) 2008-2008 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: Environment utils. -* -*/ - - -#ifndef CFENVUTILS_H -#define CFENVUTILS_H - -// SYSTEM INCLUDE FILES -#include - -// USER INCLUDE FILES - -// FORWARD DECLARATIONS - -// DATA TYPES - -// CLASS DECLARATION - -/** - * Context FW environment utils. - * - * @lib None. - * @since S60 5.1 - */ -class CFEnvUtils - { -public: - - /** - * Enables / disbales screen saver. - * @param aWasEnabled Returns the current value of screen saver. - * @param aEnable Enable screen saver. - * @return TInt KErrNone if no errors. - */ - static TInt EnableScreenSaver( TBool& aWasEnabled, const TBool aEnable ); - - /** - * Enables / disbales screen saver. - * @param aEnable Enable screen saver. - * @return TInt KErrNone if no errors. - */ - static TInt EnableScreenSaver( const TBool aEnable ); - -private: - - /** - * C++ constructor. - */ - CFEnvUtils(); - -private: - // data - }; - -#endif // CFENVUTILS_H diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/MT_CFClient.mmp --- a/contextframework/cfw/tsrc/public/basic/group/MT_CFClient.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFClient.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -33,7 +33,6 @@ SOURCEPATH ../common SOURCE cftestdelay.cpp -SOURCE cfenvutils.cpp USERINCLUDE ../MT_CFClient USERINCLUDE ../common diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -30,8 +30,6 @@ SOURCE MT_CFContextSourceManagerDllMain.cpp SOURCE MT_CFContextSourceManager.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp USERINCLUDE ../common USERINCLUDE ../MT_CFContextSourceManager diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceSettingsManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceSettingsManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceSettingsManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -30,9 +30,6 @@ SOURCE MT_CFContextSourceSettingsManagerDllMain.cpp SOURCE MT_CFContextSourceSettingsManager.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - USERINCLUDE ../common USERINCLUDE ../MT_CFContextSourceSettingsManager USERINCLUDE ../../../../inc/CFContextSourceSettingsManager diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/MT_CFOperationPluginManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/MT_CFOperationPluginManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFOperationPluginManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -29,9 +29,6 @@ SOURCE MT_CFOperationPluginManager.cpp SOURCE MT_CFOperationPluginManager_DllMain.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - USERINCLUDE ../MT_CFOperationPluginManager USERINCLUDE ../common USERINCLUDE ../../../../inc/common diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/MT_CFScriptEngine.mmp --- a/contextframework/cfw/tsrc/public/basic/group/MT_CFScriptEngine.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFScriptEngine.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -34,7 +34,6 @@ SOURCE cffakeenv.cpp SOURCE CFTestDelay.cpp SOURCE ScriptEventNotifierSession.cpp -SOURCE cfenvutils.cpp // Sources needed by the test SOURCEPATH ../../../../src/cfserver diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/UT_CCFContextManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/UT_CCFContextManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/UT_CCFContextManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -36,9 +36,6 @@ SOURCE CFUtils.cpp SOURCE CFCacheElement.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - USERINCLUDE ../../../../inc/cfserver USERINCLUDE ../../../../inc/cfservices USERINCLUDE ../../../../inc/common diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/UT_CCFEngine.mmp --- a/contextframework/cfw/tsrc/public/basic/group/UT_CCFEngine.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/UT_CCFEngine.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -31,7 +31,6 @@ SOURCE cftestcontextlistener.cpp SOURCEPATH ../common -SOURCE cfenvutils.cpp SOURCE cftestdelay.cpp // Sources needed by the test diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/UT_CFActivatorEngine.mmp --- a/contextframework/cfw/tsrc/public/basic/group/UT_CFActivatorEngine.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFActivatorEngine.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -30,9 +30,6 @@ SOURCE UT_CFActivatorEngineDllMain.cpp SOURCE UT_CFActivatorEngine.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - // Sources needed by the test SOURCEPATH ../../../../src/cfactivatorengine SOURCE CFActivatorEngineActionPluginManager.cpp diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -30,9 +30,6 @@ SOURCE UT_CFContextSourceManagerDllMain.cpp SOURCE UT_CFContextSourceManager.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - // Sources needed by the test SOURCEPATH ../../../../src/cfcontextsourcemanager SOURCE CFContextSourceManager.cpp diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceSettingsManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceSettingsManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceSettingsManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -29,9 +29,6 @@ SOURCEPATH ../UT_CFContextSourceSettingsManager SOURCE UT_CFContextSourceSettingsManagerDllMain.cpp SOURCE UT_CFContextSourceSettingsManager.cpp - -SOURCEPATH ../common -SOURCE cfenvutils.cpp // Sources needed by the test SOURCEPATH ../../../../src/CFContextSourceSettingsManager diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/UT_CFOperationPluginManager.mmp --- a/contextframework/cfw/tsrc/public/basic/group/UT_CFOperationPluginManager.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFOperationPluginManager.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -29,9 +29,6 @@ SOURCE UT_CFOperationPluginManager.cpp SOURCE UT_CFOperationPluginManager_DllMain.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - // Sources required by the test suite SOURCEPATH ../../../../src/cfoperationpluginservices SOURCE cfoperationpluginmanager.cpp diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/mt_basicoperationsplugin.mmp --- a/contextframework/cfw/tsrc/public/basic/group/mt_basicoperationsplugin.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/mt_basicoperationsplugin.mmp Mon May 03 12:40:23 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" @@ -33,7 +33,6 @@ SOURCE cffakeenv.cpp SOURCE CFTestDelay.cpp SOURCE ScriptEventNotifierSession.cpp -SOURCE cfenvutils.cpp // Sources needed by the test SOURCEPATH ../../../../../cfw/src/cfserver diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/mt_cfactionplugin.mmp --- a/contextframework/cfw/tsrc/public/basic/group/mt_cfactionplugin.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfactionplugin.mmp Mon May 03 12:40:23 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" @@ -29,9 +29,6 @@ SOURCE MT_CFActionPlugIn.cpp SOURCE MT_CFActionPlugIn_DllMain.cpp -SOURCEPATH ../common -SOURCE cfenvutils.cpp - USERINCLUDE ../mt_cfactionplugin USERINCLUDE ../common diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/mt_cfservices.mmp --- a/contextframework/cfw/tsrc/public/basic/group/mt_cfservices.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfservices.mmp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -29,9 +29,6 @@ SOURCEPATH ../mt_cfservices SOURCE mt_cfservicesdllmain.cpp SOURCE mt_cfservices.cpp - -SOURCEPATH ../common -SOURCE cfenvutils.cpp USERINCLUDE ../../../../inc/cfservices USERINCLUDE ../../../../inc/cfserver diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp --- a/contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp Mon May 03 12:40:23 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" @@ -30,7 +30,6 @@ SOURCEPATH ../common SOURCE cftestdelay.cpp -SOURCE cfenvutils.cpp // Sources required by the test suite SOURCEPATH ../mt_cfsisupgrade diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/MT_CFActionPlugIn.cpp --- a/contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/MT_CFActionPlugIn.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/MT_CFActionPlugIn.cpp Mon May 03 12:40:23 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" @@ -27,7 +27,6 @@ // INTERNAL INCLUDES #include #include -#include "cfenvutils.h" // CONSTANTS const TUid KTestActionPluginImplementationUid = {0x10002003}; @@ -121,8 +120,6 @@ // Destructor (virtual by CBase) MT_CCFActionPlugIn::~MT_CCFActionPlugIn() { - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -136,9 +133,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp --- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004 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" @@ -33,7 +33,6 @@ #include "CFKeyValuePair.h" #include "cfserviceutils.h" #include "cfcontextdataproxy.h" -#include "cfenvutils.h" // CONSTANTS _LIT( KKey, "Key_%d" ); @@ -73,9 +72,6 @@ MT_CFServices::~MT_CFServices() { Teardown(); - - // Enable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -89,9 +85,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/MT_CFSisUpgrade.cpp --- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/MT_CFSisUpgrade.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/MT_CFSisUpgrade.cpp Mon May 03 12:40:23 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" @@ -42,7 +42,6 @@ #include "actiondef_v1.h" #include "actiondef_v2.h" #include "operation_v1.hrh" -#include "cfenvutils.h" // CONSTANTS const TInt KSecond = 1000000; @@ -69,8 +68,6 @@ // Destructor (virtual by CBase) MT_CFSisUpgrade::~MT_CFSisUpgrade() { - // Disable screen saver - CFEnvUtils::EnableScreenSaver( ETrue ); } // Default constructor @@ -84,9 +81,6 @@ // The ConstructL from the base class CEUnitTestSuiteClass must be called. // It generates the test case table. CEUnitTestSuiteClass::ConstructL(); - - // Disable screen saver - CFEnvUtils::EnableScreenSaver( EFalse ); } // METHODS diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf --- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/bld.inf Mon May 03 12:40:23 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" @@ -10,6 +10,7 @@ * Nokia Corporation - initial contribution. * * Contributors: +* NTT DOCOMO, INC - BUG 2365 * * Description: * @@ -28,25 +29,19 @@ ../rom/applicationstatesourcepluginhw.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ApplicationStateSourcePlugInHW.iby) // Rule files -../data/autorotateui_activate.xml\ - /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_activate.rul -../data/autorotateui_activate.xml\ - /epoc32/data/z/private/10282bc4/rules/autorotateui_activate.rul +/* +Copy autorotateui_activate.xml, autorotateui_alwaysinportrait.xml, autorotateui_init.xml, autorotateui_rotate.xml to +1. \epoc32\data\z\private\10282BC4\rules\ +2. \epoc32\release\winscw\udeb\z\private\10282BC4\rules\ +3. \epoc32\release\winscw\urel\z\private\10282BC4\rules\ +*/ +../data/autorotateui_activate.xml Z:/private/10282bc4/rules/autorotateui_activate.rul -../data/autorotateui_alwaysinportrait.xml\ - /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_alwaysinportrait.rul -../data/autorotateui_alwaysinportrait.xml\ - /epoc32/data/z/private/10282bc4/rules/autorotateui_alwaysinportrait.rul +../data/autorotateui_alwaysinportrait.xml Z:/private/10282bc4/rules/autorotateui_alwaysinportrait.rul -../data/autorotateui_init.xml\ - /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_init.rul -../data/autorotateui_init.xml\ - /epoc32/data/z/private/10282bc4/rules/autorotateui_init.rul +../data/autorotateui_init.xml Z:/private/10282bc4/rules/autorotateui_init.rul -../data/autorotateui_rotate.xml\ - /epoc32/release/winscw/udeb/z/private/10282bc4/rules/autorotateui_rotate.rul -../data/autorotateui_rotate.xml\ - /epoc32/data/z/private/10282bc4/rules/autorotateui_rotate.rul +../data/autorotateui_rotate.xml Z:/private/10282bc4/rules/autorotateui_rotate.rul #endif // RD_CONTEXT_FRAMEWORK diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf --- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfwplugins/PSStateSourcePlugIn/group/bld.inf Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2006 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" @@ -10,7 +10,8 @@ * Nokia Corporation - initial contribution. * * Contributors: -* +* NTT DOCOMO, INC - BUG 2365 +* * Description: Build information file for project PSStateSourcePlugIn * */ @@ -22,12 +23,14 @@ DEFAULT PRJ_EXPORTS - -../data/10282C74.xml\ - /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/10282C74.xml -../data/10282C74.xml\ - /epoc32/data/Z/private/10282BC4/Settings/10282C74/10282C74.xml +/* +Copy 10282C74.xml to +1. \epoc32\data\z\private\10282BC4\Settings\10282C74\10282C74.xml +2. \epoc32\release\winscw\udeb\z\private\10282BC4\Settings\10282C74\10282C74.xml +3. \epoc32\release\winscw\urel\z\private\10282BC4\Settings\10282C74\10282C74.xml +*/ +../data/10282C74.xml Z:/private/10282BC4/Settings/10282C74/10282C74.xml ../rom/psstatesourceplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(psstatesourceplugin.iby) diff -r c4cbaa4fb734 -r b0b858956ed5 contextframework/cfwplugins/sensorsourceplugin/group/bld.inf --- a/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Fri Apr 16 15:08:06 2010 +0300 +++ b/contextframework/cfwplugins/sensorsourceplugin/group/bld.inf Mon May 03 12:40:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2006 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" @@ -10,6 +10,7 @@ * Nokia Corporation - initial contribution. * * Contributors: +* NTT DOCOMO, INC - BUG 2365 * * Description: Build information file for project SensorSourcePlugin * @@ -26,11 +27,14 @@ #ifdef RD_CONTEXT_FRAMEWORK ../rom/sensorsourceplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(SensorSourcePlugin.iby) -../data/10282DF0.xml\ - /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282DF0/10282DF0.xml +/* +Copy 10282DF0.xml to +1. \epoc32\data\z\private\10282BC4\Settings\10282DF0\10282DF0.xml +2. \epoc32\release\winscw\udeb\z\private\10282BC4\Settings\10282DF0\10282DF0.xml +3. \epoc32\release\winscw\urel\z\private\10282BC4\Settings\10282DF0\10282DF0.xml +*/ +../data/10282DF0.xml Z:/private/10282BC4/Settings/10282DF0/10282DF0.xml -../data/10282DF0.xml\ - /epoc32/data/Z/private/10282BC4/Settings/10282DF0/10282DF0.xml #endif // RD_CONTEXT_FRAMEWORK PRJ_MMPFILES diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/SysAp/Inc/SysApSsSettingsObserver.h --- a/coreapplicationuis/SysAp/Inc/SysApSsSettingsObserver.h Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApSsSettingsObserver.h Mon May 03 12:40:23 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CSysApAppUi; diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Mon May 03 12:40:23 2010 +0300 @@ -115,7 +115,7 @@ #include // KIrdaPropertyCategory // KIrdaStatus -#include +#include // POC launching #include diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp --- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Mon May 03 12:40:23 2010 +0300 @@ -30,7 +30,7 @@ #include "SysApAppUi.h" #include "SysApFeatureManager.h" #include -#include +#include #include #include #include diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/SysAp/Src/SysApSimChanged.cpp --- a/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp Mon May 03 12:40:23 2010 +0300 @@ -24,7 +24,7 @@ #include #include const TInt KPSetDefaultCFTimer = 30; -#include +#include #include #include #include "SysAp.hrh" diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/SysAp/Src/SysApSsSettingsObserver.cpp --- a/coreapplicationuis/SysAp/Src/SysApSsSettingsObserver.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApSsSettingsObserver.cpp Mon May 03 12:40:23 2010 +0300 @@ -20,7 +20,7 @@ #include "SysApSsSettingsObserver.h" #include "SysApAppUi.h" #include -#include +#include //CONSTANTS diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul --- a/coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/advancedtspcontroller/data/keyinfmtx.rul Mon May 03 12:40:23 2010 +0300 @@ -11,10 +11,6 @@ None - - - Off - diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/advancedtspcontroller/group/bld.inf --- a/coreapplicationuis/advancedtspcontroller/group/bld.inf Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/advancedtspcontroller/group/bld.inf Mon May 03 12:40:23 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" @@ -10,6 +10,7 @@ * Nokia Corporation - initial contribution. * * Contributors: +* NTT DOCOMO, INC - BUG 2365 * * Description: Bld.inf file for Symbian's Remote Control framework related * plug-ins that are used to deliver messages (e.g. accessory key @@ -27,14 +28,14 @@ #ifdef RD_TSP_CLIENT_MAPPER // Rules for media key handling -../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/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul +../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul // Call handling rules -../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/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul +../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul // FM transmitter handling rules -../data/keyinfmtx.rul /epoc32/data/z/private/10282bc4/rules/keyinfmtx.rul -../data/keyinfmtx.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/keyinfmtx.rul +../data/keyinfmtx.rul /epoc32/data/Z/private/10282bc4/rules/keyinfmtx.rul +../data/keyinfmtx.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyinfmtx.rul ../rom/advancedtspcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(advancedtspcontroller.iby) PRJ_MMPFILES diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h Mon May 03 12:40:23 2010 +0300 @@ -71,7 +71,7 @@ /** * Destructor. */ - ~CBatteryPopupControl(); + IMPORT_C ~CBatteryPopupControl(); /** * Sets the command observer of the preview pop-up content. When diff -r c4cbaa4fb734 -r b0b858956ed5 coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby --- a/coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby Fri Apr 16 15:08:06 2010 +0300 +++ b/coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby Mon May 03 12:40:23 2010 +0300 @@ -23,7 +23,7 @@ file=ABI_DIR\BUILD_DIR\batterypopupcontrol.dll SHARED_LIB_DIR\batterypopupcontrol.dll //ECOM_PLUGIN_UDEB( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc ) -ECOM_PLUGIN( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc ) +//ECOM_PLUGIN( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc ) data=DATAZ_\ECOM_RESOURCE_DIR\batindicatorpaneplugin.rsc ECOM_RESOURCE_DIR\batindicatorpaneplugin.rsc data=DATAZ_\ECOM_RESOURCE_DIR\batindpaneplugin.rsc ECOM_RESOURCE_DIR\batindpaneplugin.rsc diff -r c4cbaa4fb734 -r b0b858956ed5 filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp --- a/filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/filehandling/htmltorichtextconverter/tsrc/profilingtest.cpp Mon May 03 12:40:23 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-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" @@ -22,6 +22,7 @@ #include #include #include +#include #include "CHtmlToCrtConverter.h" #include "CHtmlToCrtConvActive.h" diff -r c4cbaa4fb734 -r b0b858956ed5 startupservices/Startup/src/StartupAppUi.cpp --- a/startupservices/Startup/src/StartupAppUi.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/startupservices/Startup/src/StartupAppUi.cpp Mon May 03 12:40:23 2010 +0300 @@ -17,11 +17,11 @@ // SYSTEM INCLUDES -#include -#include //used for Selftest failed note -#include +#include +#include //used for Selftest failed note +#include #include -#include +#include #include #include #include diff -r c4cbaa4fb734 -r b0b858956ed5 sysresmonitoring/oodmonitor/conf/uiklaf.confml Binary file sysresmonitoring/oodmonitor/conf/uiklaf.confml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 sysresmonitoring/oodmonitor/conf/uiklaf_101F8774.crml Binary file sysresmonitoring/oodmonitor/conf/uiklaf_101F8774.crml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h --- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h Fri Apr 16 15:08:06 2010 +0300 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskmonitor.h Mon May 03 12:40:23 2010 +0300 @@ -90,6 +90,7 @@ TInt iDefaultMassStorage; TInt iDefaultRomDrive; RResourceFile iResourceFile; + TInt64 iOODWarningThresholdMassMemory; }; #endif // __OUTOFDISKMONITOR_H__ diff -r c4cbaa4fb734 -r b0b858956ed5 sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp --- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp Fri Apr 16 15:08:06 2010 +0300 +++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskmonitor.cpp Mon May 03 12:40:23 2010 +0300 @@ -107,18 +107,22 @@ CRepository* repository( NULL ); TInt warningThreshold(0); TInt criticalThreshold(0); + TInt warningThresholdMassMemory(0); TRAPD( err, repository = CRepository::NewL( KCRUidUiklaf ) ); if ( err == KErrNone ) { err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevel, warningThreshold); err = repository->Get(KUikOODDiskCriticalThreshold, criticalThreshold); + err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevelMassMemory, warningThresholdMassMemory); } delete repository; iOODWarningThreshold = warningThreshold; iOODCriticalThreshold = criticalThreshold; + iOODWarningThresholdMassMemory = warningThresholdMassMemory; - TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold: %d percent",iOODWarningThreshold); + TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold Phone Memory: %d percent",iOODWarningThreshold); TRACES1("COutOfDiskMonitor::ConstructL: Critical threshold: %ld bytes",iOODCriticalThreshold); + TRACES1("COutOfDiskMonitor::ConstructL: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory); iOutOfDiskNotifyObserver = COutOfDiskNotifyObserver::NewL( this, iFs ); TRACES("COutOfDiskMonitor::ConstructL: End"); @@ -208,8 +212,24 @@ TRACES1("COutOfDiskMonitor::GetThreshold: Volume size: %ld",volSize); if ( ret == KErrNone ) { - TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold: Used disk space %d percent",iOODWarningThreshold); - threshold = ((volSize*(100-iOODWarningThreshold))/100); + if(aDrive == EDriveC) + { + TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Phone Memory: Used disk space %d percent",iOODWarningThreshold); + threshold = ((volSize*(100-iOODWarningThreshold))/100); + } + else + { + if(iOODWarningThresholdMassMemory < volSize ) + { + TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Mass Memory: %ld bytes",iOODWarningThresholdMassMemory); + threshold = iOODWarningThresholdMassMemory; + } + else + { + TRACES1("COutOfDiskMonitor::GetThreshold: Warning threshold Phone Memory: Used disk space %d percent",iOODWarningThreshold); + threshold = ((volSize*(100-iOODWarningThreshold))/100); + } + } } } else if (aLevel == DISK_SPACE_CRITICAL) diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorplugin.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorplugin.pro Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,26 @@ +# ##################################################################### +# Automatically generated by qmake (2.01a) Thu Mar 25 11:36:36 2010 +# ##################################################################### +TEMPLATE = lib +TARGET = accindicatorplugin +CONFIG += plugin +CONFIG += hb +INCLUDEPATH += . +DEPENDPATH += . +INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE + +# Input +HEADERS += inc/accindicator.h +SOURCES += src/accindicator.cpp +RESOURCES = +symbian { + TARGET.EPOCALLOWDLLDATA = 1 + TARGET.CAPABILITY = CAP_GENERAL_DLL + SYMBIAN_PLATFORMS = WINSCW ARMV5 + TARGET.UID3 = 0x2001FE6C + pluginstub.sources = accindicatorplugin.dll + pluginstub.path = /resource/plugins/indicators + DEPLOYMENT += pluginstub +} +BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include " \ + "rom/accindicatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accindicatorplugin.iby)" diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,43 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Sun Apr 11 14:15:37 2010 +###################################################################### +TEMPLATE = app +TARGET = +DEPENDPATH += . inc resources src +INCLUDEPATH += . +CONFIG += Hb +INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE + +# Input +HEADERS += inc/tvoutview.h inc/headsetttyview.h +SOURCES += src/main.cpp src/tvoutview.cpp src/headsetttyview.cpp +RESOURCES += resources/resources.qrc + +LIBS += -lcentralrepository +LIBS += -laccclient +LIBS += -lacccontrol + +symbian { +TARGET.UID3 = 0x2002EA56 +SYMBIAN_PLATFORMS = WINSCW ARMV5 + +incBlock = \ + "$${LITERAL_HASH}if ( defined (__WINS__) || defined (WINSCW) )" \ + "LIBRARY gsserverenginestub.lib " \ + "$${LITERAL_HASH}else " \ + "LIBRARY gsserverengine.lib " \ + "$${LITERAL_HASH}endif" + + MMP_RULES += incBlock + } + +BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include " \ + "rom/accindicatorsettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accindicatorsettings.iby)" \ + "conf/GSAccessoriesPlugin.confml MW_LAYER_CONFML(gsaccessoriesplugin.confml)" \ + "conf/GSAccessoriesPlugin_101F877D.crml MW_LAYER_CRML(gsaccessoriesplugin_101F877D.crml)" \ + "conf/GSAccessoriesPlugin_101F8779.crml MW_LAYER_CRML(gsaccessoriesplugin_101F8779.crml)" \ + "conf/GSAccessoriesPlugin_1020730B.crml MW_LAYER_CRML(gsaccessoriesplugin_1020730B.crml)" \ + "conf/GSAccessoriesPlugin_10207194.crml MW_LAYER_CRML(gsaccessoriesplugin_10207194.crml)" \ + "cenrep/AccessoriesCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH( accessoriescrkeys.h )" \ + "resources/wired_accessory.svg /epoc32/data/z/resource/accindicator/wired_accessory.svg" \ + "resources/wireless_accessory.svg /epoc32/data/z/resource/accindicator/wireless_accessory.svg" \ No newline at end of file diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/cenrep/AccessoriesCRKeys.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/cenrep/AccessoriesCRKeys.h Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,311 @@ +/* +* Copyright (c) 2008-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: Header file for central repository keys, used in GSAccessoryPlugin, and GSServerEngine +* +*/ + +#ifndef ACCESSORIESCRKEYS_H +#define ACCESSORIESCRKEYS_H + +#include + +/** +* Accessory settings CR UID +*/ +const TUid KCRUidAccessorySettings = {0x101F8779}; + +/** +* Automatic answer in carkit +* +* Possible values are: +* 0 = No automatic answer in headset +* 1 = Automatic answer in headset +*/ +const TUint32 KSettingsCarKitAutomaticAnswer = 0x00000001; + +/** +* Automatic answer in headset +* +* Possible values are: +* 0 = No automatic answer in headset +* 1 = Automatic answer in headset +*/ +const TUint32 KSettingsHeadsetAutomaticAnswer = 0x00000002; + +/** +* Automatic answer in bluetooth +* +* Possible values are: +* 0 = No automatic answer in bluetooth +* 1 = Automatic answer in bluetooth +*/ +const TUint32 KSettingsBTAudioAutomaticAnswer = 0x00000003; + +/** +* Information about if the loopset is in use. +* +* Possible values are: +* 0 = Loopset is not in use +* 1 = Loopset is in use +*/ +const TUint32 KSettingsLoopsetInUse = 0x00000004; + +/** +* Automatic answer in loopset +* +* Possible values are: +* 0 = No automatic answer in loopset +* 1 = Automatic answer in loopset +*/ +const TUint32 KSettingsLoopsetAutomaticAnswer = 0x00000005; + +/** +* Information about which accessory is in use. +* +* Possible values are: +* 0 = headset +* 1 = loopset +* 2 = TTY +**/ +const TUint32 KSettingsAccessoryInUse = 0x00000006; + +/** +* Automatic answer in music stand +* +* Possible values are: +* 0 = No automatic answer in music stand +* 1 = Automatic answer in music stand +*/ +const TUint32 KSettingsMusicStandAutomaticAnswer = 0x00000007; + +/** +* Automatic answer in car kit +* +* Possible values are: +* 0 = No automatic answer in car kit +* 1 = Automatic answer in car kit +*/ +const TUint32 KSettingsTTYAutomaticAnswer = 0x00000008; + +/** +* Use loopset +* +* Possible values are: +* 0 = Loopset not in use +* 1 = Loopset in use +*/ +const TUint32 KSettingsUseLoopset = 0x00000009; + +/** +* Wireless Carkit automatic answer +* +* Possible values are: +* 0 = Automatic answer is off +* 1 = Automatic answer is on +*/ +const TUint32 KSettingsWirelessCarkitAutomaticAnswer = 0x00000010; + +/** +* Headset Ringing Tone Routing +* +* Possible values are: +* 0 = Routing is Headset and Handset +* 1 = Routing is Headset +*/ +const TUint32 KSettingsHeadsetRingingToneRouting = 0x00000011; + +/** +* Headphones Ringing Tone Routing +* +* Possible values are: +* 0 = Routing is Headset and Handset +* 1 = Routing is Headset +*/ +const TUint32 KSettingsHeadphonesRingingToneRouting = 0x00000012; + +/** +* Default Accessory. +* Possible values are: +* 0 = Headset +* 1 = Headphones +* 2 = Wired Car kit +* 3 = Wireless carkit +* 4 = Music Stand +* 5 = Tvout +* 6 = Loopset +* 7 = Textphone +*/ +const TUint32 KSettingsAccDefaultInfo = 0x00000013; + +/** +* Wired carkit accessory support +* +* Possible values are: +* 0 = accessory is not supported +* 1 = accessory is supported +*/ +const TUint32 KSettingsAccWiredCarkitSupported = 0x00000014; + +/** +* Wireless carkit accessory support +* +* Possible values are: +* 0 = accessory is not supported +* 1 = accessory is supported +*/ +const TUint32 KSettingsAccWirelessCarkitSupported = 0x00000015; + +/** +* Loopset accessory support +* +* Possible values are: +* 0 = accessory is not supported +* 1 = accessory is supported +*/ +const TUint32 KSettingsAccLoopsetSupported = 0x00000016; + +/** +* Profile settings CR UID. +*/ +const TUid KCRUidProfileSettings = {0x101F877D}; + +/** +* Bluetooth default profile, profile id. +* +*/ +const TUint32 KSettingsBTDefaultProfile = 0x00000001; + +/** +* Headset default profile, profile id. +*/ +const TUint32 KSettingsHeadsetDefaultProfile = 0x00000002; + +/** +* TTY default profile, profile id. +*/ +const TUint32 KSettingsTTYDefaultProfile = 0x00000003; + +/** +* Loopset default profile, profile id. +*/ +const TUint32 KSettingsLoopsetDefaultProfile = 0x00000004; + +/** +* Music Stand default profile, profile id. +*/ +const TUint32 KSettingsMusicStandDefaultProfile = 0x00000005; + +/** +* Car Kit default profile, profile id. +*/ +const TUint32 KSettingsCarKitDefaultProfile = 0x00000006; + +/** +* Wireless Car Kit default profile, profile id. +*/ +const TUint32 KSettingsWirelessCarkitDefaultProfile = 0x00000007; + +/** +* Headphones default profile, profile id. +*/ +const TUint32 KSettingsHeadphonesDefaultProfile = 0x00000008; + +/** +* Tv out default profile, profile id. +*/ +const TUint32 KSettingsTvOutDefaultProfile = 0x00000009; + +/** +* Settings for Lights features +*/ +const TUid KCRUidAccessoryLightSettings = {0x10207194}; + +/** +* Defines the display light duration for Music Stand accessory. +* +* 0 = (Normal) +* 1 = (Always ON) +*/ +const TUint32 KSettingsMusicStandLights = 0x00000001; + +/** +* Defines the display light duration for Car kit accessory. +* +* 0 = (Normal) +* 1 = (Always ON) +*/ +const TUint32 KSettingsCarKitLights = 0x00000002; + + +/** Following keys belong to category KCRUidTvoutSettings */ + +/** +* TV-out settings CR UID +*/ +const TUid KCRUidTvoutSettings = {0x1020730B}; + +/** +* TV-out aspect ratio. +* Possible values are: +* 0 = 4x3 +* 1 = 16x9 +*/ +const TUint32 KSettingsTvAspectRatio = 0x00000001; + +/** +* TV-out system info. +* Possible values are: +* 0 = PAL +* 1 = PALM +* 2 = NTSC +*/ +const TUint32 KSettingsTvSystemInfo = 0x00000002; + +/** +* TV-out default text. +* String value. +*/ +const TUint32 KSettingsTvDefaultText = 0x00000003; + + +/** +* TV-out Flicker Filter. +* Possible values are: +* 0 = Off +* 1 = On +*/ +const TUint32 KSettingsTvoutFlickerFilter = 0x00000004; + +/** +* TV-out Horizontal overscan +* Default value: 500 +*/ +const TUint32 KSettingsTvoutHorizontalOverscan = 0x00000005; + +/** +* TV-out Vertical overscan +* Default value: 500 +*/ +const TUint32 KSettingsTvoutVerticalOverscan = 0x00000006; + +/** +* PALM option visibility +* 0 = not visible (default) +* 1 = visible +*/ +const TUint32 KSettingsTvoutPalmVisibility = 0x00000007; + + + +#endif // ACCESSORIESCRKEYS_H diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin.confml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin.confml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F8779.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F8779.crml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F877D.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F877D.crml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_10207194.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_10207194.crml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_1020730B.crml Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_1020730B.crml has changed diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/inc/headsetttyview.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/inc/headsetttyview.h Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,56 @@ +/* + * 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: + * + */ + +#ifndef HEADSETTTYVIEW_H +#define HEADSETTTYVIEW_H + +#include +#include +#include +#include +#include + +class CRepository; +class CGSServerEngine; + +class HeadsetTtyView : public QObject + { + Q_OBJECT + +public: + HeadsetTtyView(HbMainWindow *window,int); + ~HeadsetTtyView(); + +private slots: + void currentIndexModified(int); +private: + int currentValue; + TInt defaultaccessory; + + // Handle to the Central Repository. + CRepository* iAccessoryRepository; + + /** Accessory server connection. */ + RAccessoryServer iAccServer; + + /** Accessory settings connection. */ + RAccessorySettings iAccessorySettings; + +public: + }; + +#endif // HEADSETTTYVIEW_H diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/inc/tvoutview.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/inc/tvoutview.h Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,42 @@ +/* + * 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: + * + */ + +#ifndef TVOUTVIEW_H +#define TVOUTVIEW_H + +#include +#include +#include + +class TvOutView : public QObject + { + Q_OBJECT + +public: + TvOutView(HbMainWindow *window,int); + ~TvOutView(); + +private slots: + void currentIndexModified(int); +private: + int currentValue; + CGSServerEngine* iServerEngine; + +public: + }; + +#endif // TVOUTVIEW_H diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wire_connect.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wire_connect.svg Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,70 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wlan.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wlan.svg Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/resources/resources.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/resources.qrc Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,10 @@ + + + headset.docml + tvout.docml + + + wired_accessory.svg + wireless_accessory.svg + + diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/resources/wired_accessory.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/wired_accessory.svg Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,70 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/resources/wireless_accessory.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/wireless_accessory.svg Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/rom/accindicatorsettings.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/rom/accindicatorsettings.iby Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,26 @@ +/* +* 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: +* +*/ +#ifndef __ACCINDICATORSETTINGS_IBY__ +#define __ACCINDICATORSETTINGS_IBY__ + +REM DLL +file = ABI_DIR\BUILD_DIR\accindicatorsettings.exe \sys\bin\accindicatorsettings.exe +data = \epoc32\data\z\resource\apps\accindicatorsettings.rsc \resource\apps\accindicatorsettings.rsc +data = \epoc32\data\z\private\10003a3f\import\apps\accindicatorsettings_reg.rsc \private\10003a3f\import\apps\accindicatorsettings_reg.rsc +data=\epoc32\data\z\resource\accindicator\wired_accessory.svg \resource\accindicator\wired_accessory.svg +data=\epoc32\data\z\resource\accindicator\wireless_accessory.svg \resource\accindicator\wireless_accessory.svg +#endif \ No newline at end of file diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/src/headsetttyview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/headsetttyview.cpp Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,122 @@ +/* +* 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: +* +* Name : headsetttyview.cpp +* +* Description: +* +* +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "headsetttyview.h" + +HeadsetTtyView::HeadsetTtyView(HbMainWindow *window,int accessoryType) + { + // Handle to the central repository. + iAccessoryRepository = CRepository::NewL( KCRUidAccessorySettings ); + + TInt error = iAccServer.Connect(); + if(error != KErrNone) + { + qDebug() << "Failed to connect to accessory server"; + return; + } + error = iAccessorySettings.CreateSubSession( iAccServer ); + if(error != KErrNone) + { + qDebug() << "Failed to connect to accessory sub session"; + return; + } + + HbDocumentLoader loader; + bool viewLoaded(false); + loader.load(":/xml/headset.docml", &viewLoaded); + Q_ASSERT_X(viewLoaded, "MainView", "Invalid xml file"); + + HbLabel *image; + HbLabel *acctype; + // set the image to be displayed. + if( accessoryType == KPCWired || accessoryType == KPCUSB ) //wired + { + image = qobject_cast(loader.findWidget("image")); + image->setIcon(HbIcon(":/images/wired_accessory.svg")); + } + else // wireless + { + image = qobject_cast(loader.findWidget("image")); + image->setIcon(HbIcon(":/images/wireless_accessory.svg")); + } + + HbComboBox *comboHandler = qobject_cast(loader.findWidget("combobox")); + QStringList comboItems; + comboItems <<"HeadSet" <<"TTY"; + comboHandler->addItems(comboItems); + + connect(comboHandler , SIGNAL(currentIndexChanged(int)) , this , SLOT(currentIndexModified(int))); + + User::LeaveIfError( iAccessoryRepository->Get(KSettingsAccDefaultInfo, defaultaccessory )); + + // set the name to be displayed along with the image. + if( defaultaccessory == 0) // HeadSet + { + acctype = qobject_cast(loader.findWidget("label")); + acctype->setPlainText("HeadSet"); + acctype->setTextWrapping(Hb::TextWordWrap); + comboHandler->setCurrentIndex(0); // set headset as default + } + else + { + acctype = qobject_cast(loader.findWidget("label")); + acctype->setPlainText("TTY"); + acctype->setTextWrapping(Hb::TextWordWrap); + comboHandler->setCurrentIndex(1); // set TTY as default + } + + // heading for the combobox for user selection + acctype = qobject_cast(loader.findWidget("label_2")); + acctype->setPlainText("Accessory Type"); + acctype->setTextWrapping(Hb::TextWordWrap); + + window->addView(loader.findWidget("view")); + } + +HeadsetTtyView::~HeadsetTtyView() + { + iAccessorySettings.CloseSubSession(); + iAccServer.Disconnect(); + delete iAccessoryRepository; + } + +void HeadsetTtyView::currentIndexModified(int var) + { + if(var == 0) // make headset as default + { + User::LeaveIfError((iAccessoryRepository->Set(KSettingsAccDefaultInfo, 0))); // 0 is for Headset + iAccessorySettings.SetHWDeviceSettingsL( KASHeadset ); + } + else + { + User::LeaveIfError((iAccessoryRepository->Set(KSettingsAccDefaultInfo, 7))); // 7 is for TTY + iAccessorySettings.SetHWDeviceSettingsL( KASTTY ); + } + } diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/src/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/main.cpp Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,51 @@ +/* + * 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: Process launched by the accessory indicator plugin to + * show the view and user can change the settings. + * + */ + +#include + +#include "headsetttyview.h" +#include "tvoutview.h" + +int main(int argc, char *argv[]) + { + HbApplication app(argc, argv); + int retVal; + // Get the params from the process. + QStringList args(app.arguments()); + int accessoryMode = QString(args.at(1)).toInt(); // HeadSet,TTY,TV-OUT + int accessoryType = QString(args.at(2)).toULong();// Wired or Wireless + + HbMainWindow *window = new HbMainWindow(); + + // If accessory mode is Tv-Out load tvout.docml or else load headset.docml + QObject *view; + if( accessoryMode == EAccModeTVOut ) + { + view = new TvOutView(window,accessoryType); + } + else + { + view = new HeadsetTtyView(window,accessoryType); + } + + window->show(); + retVal = app.exec(); + delete window; + delete view; + return retVal; + } diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/accindicatorsettings/src/tvoutview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/tvoutview.cpp Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,84 @@ +/* + * 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: Shows the view of the TV-OUT accessory. + * + */ + +#include "tvoutview.h" + +#include +#include +#include +#include +#include +#include + +TvOutView::TvOutView(HbMainWindow *window,int accessoryType) + { + HbDocumentLoader loader; + bool viewLoaded(false); + loader.load(":/xml/tvout.docml", &viewLoaded); + Q_ASSERT_X(viewLoaded, "AccSettings", "Invalid docml file"); + + HbLabel *label; + if( accessoryType == KPCWired || accessoryType == KPCUSB ) // wired + { + label = qobject_cast(loader.findWidget("image")); + label->setIcon(HbIcon(":/images/wired_accessory.svg")); + } + else // wireless + { + label = qobject_cast(loader.findWidget("image")); + label->setIcon(HbIcon(":/images/wireless_accessory.svg")); + } + + label = qobject_cast(loader.findWidget("label")); + label->setPlainText("Tv-Out"); + label->setTextWrapping(Hb::TextWordWrap); + + label = qobject_cast(loader.findWidget("label_4")); + label->setPlainText("TV Aspect Ratio"); + label->setTextWrapping(Hb::TextWordWrap); + + HbComboBox *comboHandler = qobject_cast(loader.findWidget("combobox")); + + // prepare the list of items to be there in combobox. + QStringList comboItems; + comboItems <<"4:3" <<"16:9"; + comboHandler->addItems(comboItems); + + //set the current index of combobox to the current AspectRatio. + iServerEngine = CGSServerEngine::NewL(); + currentValue = iServerEngine->AspectRatioL(); + comboHandler->setCurrentIndex(currentValue); + + //If the index changed in the combobox update the AspectRatio of the TV-Out Settings. + QObject::connect(comboHandler , SIGNAL(currentIndexChanged(int)) , this , SLOT(currentIndexModified(int))); + + window->addView(loader.findWidget("view")); + + } + +TvOutView::~TvOutView() + { + if(iServerEngine) + { + delete iServerEngine; + } + } + +void TvOutView::currentIndexModified(int modifiedSlot) + { + iServerEngine->SetAspectRatioL( modifiedSlot ); + } diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/inc/accindicator.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/inc/accindicator.h Mon May 03 12:40:23 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: Accessory Indicator class + * + */ + +#ifndef ACCINDICATOR_H +#define ACCINDICATOR_H + +#include + +#include +#include + +#include +#include + +#include + +/** + * Accessory indicator class. + * Handles client request and shows the indications. + */ +class AccIndicatorPlugin : public HbIndicatorInterface, public HbIndicatorPluginInterface +{ + Q_OBJECT + Q_INTERFACES(HbIndicatorPluginInterface) +public: + + AccIndicatorPlugin(); + ~AccIndicatorPlugin(); +public: + //from HbindicatorInterface + bool handleInteraction(InteractionType type); + QVariant indicatorData(int role) const; + +public: + //from HbIndicatorPluginInterface + QStringList indicatorTypes() const; + bool accessAllowed(const QString &indicatorType, + const HbSecurityInfo *securityInfo) const; + HbIndicatorInterface* createIndicator(const QString &indicatorType); + int error() const; + +protected: + //from HbindicatorInterface + bool handleClientRequest(RequestType type, const QVariant ¶meter); + +private: + void prepareDisplayName(); + +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; + }; + +#endif // ACCINDICATOR_H + diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/rom/accindicatorplugin.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/rom/accindicatorplugin.iby Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,23 @@ +/* +* 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: +* +*/ +#ifndef __ACCINDICATORPLUGIN_IBY__ +#define __ACCINDICATORPLUGIN_IBY__ + +REM DLL +file=ABI_DIR\UREL\accindicatorplugin.dll SHARED_LIB_DIR\accindicatorplugin.dll UNPAGED +data=\epoc32\data\z\resource\plugins\indicators\accindicatorplugin.qtplugin \resource\plugins\indicators\accindicatorplugin.qtplugin +#endif \ No newline at end of file diff -r c4cbaa4fb734 -r b0b858956ed5 systemsettings/accindicatorplugin/src/accindicator.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/systemsettings/accindicatorplugin/src/accindicator.cpp Mon May 03 12:40:23 2010 +0300 @@ -0,0 +1,251 @@ +/* + * 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: + * + */ +#include "accindicator.h" + +#include +#include +#include + +Q_EXPORT_PLUGIN(AccIndicatorPlugin) +const static char IndicatorType[] = "com.nokia.accessory.indicatorplugin/1.0"; +QString KAccMode = "AccMode"; +QString KAccType = "AccType"; + +AccIndicatorPlugin::AccIndicatorPlugin() : +HbIndicatorInterface(IndicatorType, + HbIndicatorInterface::GroupPriorityLow, + InteractionActivated) + { + mIndicatorTypes << "com.nokia.accessory.indicatorplugin/1.0"; + } + +AccIndicatorPlugin::~AccIndicatorPlugin() + { + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::indicatorTypes +// returns the indicator types handled by this plugin +// ---------------------------------------------------------------------------- + +QStringList AccIndicatorPlugin::indicatorTypes() const + { + return mIndicatorTypes; + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::createIndicator +// creates an indicator. +// ---------------------------------------------------------------------------- + +HbIndicatorInterface* AccIndicatorPlugin::createIndicator( + const QString &indicatorType) + { + Q_UNUSED(indicatorType) + return this; + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::error +// returns the error code. +// ---------------------------------------------------------------------------- + +int AccIndicatorPlugin::error() const + { + return mError; + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::accessAllowed +// check for the access rights of the client. As there are no restrictions for +// this plugin it always returns true. +// ---------------------------------------------------------------------------- + +bool AccIndicatorPlugin::accessAllowed(const QString &indicatorType, + const HbSecurityInfo *securityInfo) const + { + Q_UNUSED(indicatorType) + Q_UNUSED(securityInfo) + + return true; + } + +// ---------------------------------------------------------------------------- +// AccIndicator::handleInteraction +// called when the user interacts with the indicator.Enable the interaction only +// for headset,tty and tv-out for user to change the settings. +// ---------------------------------------------------------------------------- +bool AccIndicatorPlugin::handleInteraction(InteractionType type) + { + bool handled = false; + if (type == InteractionActivated) + { + // 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); + type.setValue((int)mAccType); + mArgs.append(mode.toString()); + mArgs.append(type.toString()); + + // Launch the process to show the view. + mProcess.start("accindicatorsettings" , mArgs); + handled = true; + } + } + return handled; + } + +// ---------------------------------------------------------------------------- +// AccIndicator::indicatorData +// returns the name and icon to be displayed in the universal indicator menu. +// ---------------------------------------------------------------------------- +QVariant AccIndicatorPlugin::indicatorData(int role) const + { + switch(role) + { + //for displaying the string in indicator. + case PrimaryTextRole: + { + QString type(mDisplayName); + return type; + } + //for displaying the icon in indicator. + case DecorationNameRole: + { + QString iconName; + if(mAccType == KPCWired || mAccType == KPCUSB) + { + iconName = QString("z:/resource/accindicator/wired_accessory.svg"); + } + else if (mAccType == KPCBluetooth || mAccType == KPCInfraRed) + { + iconName = QString("z:/resource/accindicator/wireless_accessory.svg"); + } + return iconName; + } + default: + return QVariant(); + } + } + +// ---------------------------------------------------------------------------- +// AccIndicatorPlugin::handleClientRequest +// this function gets called when client activates plugin +// ---------------------------------------------------------------------------- +bool AccIndicatorPlugin::handleClientRequest( RequestType type, + const QVariant ¶meter) + { + bool handled(false); + switch (type) { + case RequestActivate: + { + // Get the params(acctype and mode) from the hbindicator.activate() which is called from sysap. + + QVariantMap mapValues = parameter.toMap(); + if(mapValues.contains(KAccMode)) + { + mAccMode = static_cast(mapValues.value(KAccMode).toInt()); + } + if(mapValues.contains(KAccType)) + { + mAccType = mapValues.value(KAccType).toInt(); + } + + // prepare the name to be displayed in the universal indicator menu. + prepareDisplayName(); + emit dataChanged(); + handled = true; + } + break; + case RequestDeactivate: + { + // reset data + mDisplayName = QString(); + emit deactivate(); + } + break; + default: + break; + } + return handled; + } + +// ---------------------------------------------------------------------------- +// AccIndicator::prepareDisplayName +// prepare the name to be displayed in the indicator menu. +// ---------------------------------------------------------------------------- +void AccIndicatorPlugin::prepareDisplayName() + { + mDisplayName.clear(); + switch(mAccMode) + { + case EAccModeWiredHeadset: + mDisplayName.append(QString("Wired Headset")); + break; + case EAccModeWirelessHeadset: + mDisplayName.append(QString("Wireless Headset")); + break; + case EAccModeWiredCarKit: + mDisplayName.append(QString("Wired CarKit")); + break; + case EAccModeWirelessCarKit: + mDisplayName.append(QString("Wireless Carkit")); + break; + case EAccModeTextDevice: + mDisplayName.append(QString("TTY")); + break; + case EAccModeLoopset: + mDisplayName.append(QString("LoopSet")); + break; + case EAccModeMusicStand: + mDisplayName.append(QString("Music Stand")); + break; + case EAccModeTVOut: + mDisplayName.append(QString("TV Out")); + break; + case EAccModeHeadphones: + mDisplayName.append(QString("Head Phones")); + break; + default : + 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; + } + }