# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1279208978 -10800 # Node ID 5e7d68cc22e049cfc364a7e6fd2a001e3ed0a249 # Parent 312d2b433792705b38dc1566d1b34f923bf55472 Revision: 201025 Kit: 2010127 diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/Documentation/AlarmStateTransitionAndAlarmAlertCom.xls Binary file commonappservices/alarmserver/Documentation/AlarmStateTransitionAndAlarmAlertCom.xls has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/Server/Source/assrvsystemstate.cpp --- a/commonappservices/alarmserver/Server/Source/assrvsystemstate.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/commonappservices/alarmserver/Server/Source/assrvsystemstate.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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" @@ -142,7 +142,7 @@ aState = MASSrvSystemStateObserver::EShutdown; interestedInChange = ETrue; } - else if (ssmState.MainState() == ESsmNormal && ssmState.SubState() == ESsmNormalSubState) + else if (ssmState.MainState() == ESsmNormal) { aState = MASSrvSystemStateObserver::ENormal; interestedInChange = ETrue; diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/Test/Integration/AlarmTestServer/doc_pub/SGL.GT0257.603_AlarmServer updatesTest Specification.doc Binary file commonappservices/alarmserver/Test/Integration/AlarmTestServer/doc_pub/SGL.GT0257.603_AlarmServer updatesTest Specification.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/doc_pub/SGL.GT0257.612.Bravo_SystemSupportForUTC_Test_Case_PREQ234 Rev1.0.doc Binary file commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/doc_pub/SGL.GT0257.612.Bravo_SystemSupportForUTC_Test_Case_PREQ234 Rev1.0.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/doc_pub/AlarmStateTransitionAndAlarmAlertCom.xls Binary file commonappservices/alarmserver/doc_pub/AlarmStateTransitionAndAlarmAlertCom.xls has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/doc_pub/SGL.GT0257.207_Rev1.1_Alarm_Server_Configuration_how_to.doc Binary file commonappservices/alarmserver/doc_pub/SGL.GT0257.207_Rev1.1_Alarm_Server_Configuration_how_to.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/alarmserver/doc_pub/alarm server test code.doc Binary file commonappservices/alarmserver/doc_pub/alarm server test code.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/appservicesdocs/app-services_documentation.history.xml --- a/commonappservices/appservicesdocs/app-services_documentation.history.xml Mon Jun 21 15:51:07 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/appservicesdocs/app-services_documentation.mrp --- a/commonappservices/appservicesdocs/app-services_documentation.mrp Mon Jun 21 15:51:07 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -component app-services_documentation - -source \sf\mw\appsupport\commonappservices\appservicesdocs\ - -notes_source \component_defs\release.src - - -ipr E - diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/appservicesdocs/architecturaldescription.eap Binary file commonappservices/appservicesdocs/architecturaldescription.eap has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/coreappstest/Group/BLD.INF --- a/commonappservices/coreappstest/Group/BLD.INF Mon Jun 21 15:51:07 2010 +0300 +++ b/commonappservices/coreappstest/Group/BLD.INF Thu Jul 15 18:49:38 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" @@ -25,11 +25,7 @@ PRJ_TESTEXPORTS CoreAppsTestTest.iby /epoc32/rom/include/coreappstesttest.iby -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../Inc/TestServer.h /epoc32/include/coreappstest/testserver.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../Inc/utilities.h /epoc32/include/coreappstest/utilities.h -#endif +../Inc/testserver.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(coreappstest/testserver.h) +../Inc/utilities.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(coreappstest/utilities.h) CoreAppsTest.iby /epoc32/rom/include/coreappstest.iby runeshell.iby /epoc32/rom/include/runeshell.iby diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/App-Services_Architectural_Description.doc Binary file commonappservices/doc_pub/App-Services_Architectural_Description.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/App-Services_Functional_Specification.doc Binary file commonappservices/doc_pub/App-Services_Functional_Specification.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/PIMTestCodeOrganisationHowTo.doc Binary file commonappservices/doc_pub/PIMTestCodeOrganisationHowTo.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/SGL.GT0109.110_Rev1.2_AppServices_Subsystem_Release_Note.doc Binary file commonappservices/doc_pub/SGL.GT0109.110_Rev1.2_AppServices_Subsystem_Release_Note.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/SGL.GT228.017_Migration Guide for v9.1 Time Handling APIs.doc Binary file commonappservices/doc_pub/SGL.GT228.017_Migration Guide for v9.1 Time Handling APIs.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/app-services_documentation.history.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/commonappservices/doc_pub/app-services_documentation.history.xml Thu Jul 15 18:49:38 2010 +0300 @@ -0,0 +1,5 @@ + + + + + diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/app-services_documentation.mrp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/commonappservices/doc_pub/app-services_documentation.mrp Thu Jul 15 18:49:38 2010 +0300 @@ -0,0 +1,9 @@ +component app-services_documentation + +source \sf\mw\appsupport\commonappservices\doc_pub\ + +notes_source \component_defs\release.src + + +ipr E + diff -r 312d2b433792 -r 5e7d68cc22e0 commonappservices/doc_pub/architecturaldescription.eap Binary file commonappservices/doc_pub/architecturaldescription.eap has changed diff -r 312d2b433792 -r 5e7d68cc22e0 contenthandling/webrecognisers/Documentation/Uid.txt --- a/contenthandling/webrecognisers/Documentation/Uid.txt Mon Jun 21 15:51:07 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -UIDs Allocated for Application-Protocol Recognisers - -KUidAppProtRecognisers - -101FD8D0 KUidRecogTestEcomInterface ECom Interface for recogniser test plugins -101FD8D1 KUidWebUrlRecogTestDll Web URL recogniser test plugin DLL UID -101FD8D2 KUidWebUrlRecogTest Web URL recogniser ECom implementation UID -101FD8D3 KUidEBookmarkRecogTestDll EBookmark recogniser test plugin DLL UID -101FD8D4 KUidEBookmarkRecogTest EBookmark recogniser ECom implementation UID -101FD8D5 KUidRecWebRecogTestDll Web (html/xml) recogniser test plugin DLL UID -101FD8D6 KUidRecWebRecogTest Web (html/xml) recogniser ECom implementation UID -101FD8D7 -101FD8D8 -101FD8D9 \ No newline at end of file diff -r 312d2b433792 -r 5e7d68cc22e0 contenthandling/webrecognisers/doc_pub/Recogniser Test Specifications.doc Binary file contenthandling/webrecognisers/doc_pub/Recogniser Test Specifications.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 contenthandling/webrecognisers/doc_pub/Uid.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contenthandling/webrecognisers/doc_pub/Uid.txt Thu Jul 15 18:49:38 2010 +0300 @@ -0,0 +1,30 @@ +// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + +UIDs Allocated for Application-Protocol Recognisers + +KUidAppProtRecognisers + +101FD8D0 KUidRecogTestEcomInterface ECom Interface for recogniser test plugins +101FD8D1 KUidWebUrlRecogTestDll Web URL recogniser test plugin DLL UID +101FD8D2 KUidWebUrlRecogTest Web URL recogniser ECom implementation UID +101FD8D3 KUidEBookmarkRecogTestDll EBookmark recogniser test plugin DLL UID +101FD8D4 KUidEBookmarkRecogTest EBookmark recogniser ECom implementation UID +101FD8D5 KUidRecWebRecogTestDll Web (html/xml) recogniser test plugin DLL UID +101FD8D6 KUidRecWebRecogTest Web (html/xml) recogniser ECom implementation UID +101FD8D7 +101FD8D8 +101FD8D9 \ No newline at end of file diff -r 312d2b433792 -r 5e7d68cc22e0 contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/cfapplicationstatesettings.h --- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/cfapplicationstatesettings.h Mon Jun 21 15:51:07 2010 +0300 +++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/cfapplicationstatesettings.h Thu Jul 15 18:49:38 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" @@ -95,7 +95,7 @@ * is found. * @return None */ - void GetViewName( const TUid& aUid, TPtrC& aName ) const; + TBool GetViewName( const TUid& aUid, TPtrC& aName ) const; private: diff -r 312d2b433792 -r 5e7d68cc22e0 contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp --- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -452,8 +452,8 @@ if ( !fgFound && aEvent.iViewOneId.iAppUid == appSettings->Uid() ) { fgApp.Set( appSettings->Name() ); - appSettings->GetViewName( aEvent.iViewOneId.iViewUid, fgView ); - fgFound = ETrue; + //Check for flag returned by GetViewName, don't directly set the Flag to ETrue + fgFound = appSettings->GetViewName( aEvent.iViewOneId.iViewUid, fgView ); } if ( !bgFound && aEvent.iViewTwoId.iAppUid == appSettings->Uid() ) { diff -r 312d2b433792 -r 5e7d68cc22e0 contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/cfapplicationstatesettings.cpp --- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/cfapplicationstatesettings.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/cfapplicationstatesettings.cpp Thu Jul 15 18:49:38 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" @@ -99,15 +99,18 @@ // CCFApplicationStateSettings::AddViewSettingsL //----------------------------------------------------------------------------- // -void CCFApplicationStateSettings::GetViewName( const TUid& aUid, +TBool CCFApplicationStateSettings::GetViewName( const TUid& aUid, TPtrC& aName ) const { + TBool matchFound = EFalse; for ( TInt i = 0; i < iViewInfo.Count(); ++i ) { if ( aUid == iViewInfo[ i ]->Uid() ) { aName.Set( iViewInfo[ i ]->Name() ); + matchFound = ETrue; break; } } + return matchFound; } diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/SysAp/Inc/SysApAppUi.h --- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Thu Jul 15 18:49:38 2010 +0300 @@ -1691,6 +1691,7 @@ TInt iProfileItemsOffset; //Flag to record if the TD network is enalbed. TBool iTDEnable; + TBool IsDefaultPowerKeyBehavior(); }; diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp --- a/coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2007 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" @@ -27,6 +27,7 @@ #include #include #include +#include MSysApBtSapController* CreateSysApBtSapControllerL( CSysApAppUi& aSysApAppUi ) @@ -215,6 +216,7 @@ // ---------------------------------------------------------------------------- void CSysApBtSapController::HandlePropertyChangedL( const TUid& aCategory, const TUint aKey ) { + TInt simStatus = ESimStatusUninitialized; if ( aCategory == KPSUidBluetoothSapConnectionState && aKey == KBTSapConnectionState ) { TInt value( 0 ); @@ -231,7 +233,9 @@ break; case EBTSapConnecting: TRACES( RDebug::Print( _L("CSysApBtSapController::HandlePropertyChangedL: EBTSapConnecting, iBtSapEnabled=%d"), iBtSapEnabled ) ); - if ( !iBtSapEnabled ) + //Ensure SIM is present + simStatus = iSysApAppUi.StateOfProperty( KPSUidStartup, KPSSimStatus ); + if ( !iBtSapEnabled && !(simStatus == ESimNotPresent || simStatus == ESimNotSupported)) { iSysApAppUi.InitCloseSimApplicationsL(); } diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/SysAp/Src/SysApAppUi.cpp --- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -685,7 +685,7 @@ { TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Short powerkey") ) ); iLastPowerKeyWasShort = ETrue; - if ( iPowerKeyPopupMenuActive || !iSysApFeatureManager->PowerKeyIsLockKey() || (iSysApFeatureManager->PowerKeyIsLockKey() && haveStatusPane )) + if ( IsDefaultPowerKeyBehavior() ) { //do this only if the power key menu is active (handles item navigation) //or if the power key is not the lock key (default) @@ -701,7 +701,7 @@ iKeyBoardRepeatCount = -1; TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Long powerkey") ) ); iLastPowerKeyWasShort = EFalse; - if ( !haveStatusPane && !iPowerKeyPopupMenuActive && iSysApFeatureManager->PowerKeyIsLockKey() && !iIgnoreNextPowerKeyRepeats ) + if (! IsDefaultPowerKeyBehavior() && !iIgnoreNextPowerKeyRepeats ) { if ( !iGlobalListQuery ) { @@ -735,14 +735,13 @@ else if ( aType == EEventKeyUp ) { TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): aType == EEventKeyUp, PowerKeyIsLockKey = %d, iLastPowerKeyWasShort = %d, iPowerKeyPopupMenuActive = %d, iCharging = %d" ), iSysApFeatureManager->PowerKeyIsLockKey(), iLastPowerKeyWasShort, iPowerKeyPopupMenuActive, iCharging ) ); - if ( iSysApFeatureManager->PowerKeyIsLockKey() - && iLastPowerKeyWasShort - && !iPowerKeyPopupMenuActive - && !haveStatusPane - && ( aKeyEvent.iScanCode == EStdKeyDevice2 ) ) + if ( !IsDefaultPowerKeyBehavior() && + iLastPowerKeyWasShort && + ( aKeyEvent.iScanCode == EStdKeyDevice2 )) { - //if the power key is the lock key && the last keypress was short && the power menu is not active - //then lock the phone + // if the power key is the lock key && the last keypress was + // short && the power menu is not active && an alarm is not + // currently being shown, then lock the phone TInt alarmState=0, securityQueryState=0; TInt errorCode = RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsDisableKeyguard, alarmState ); TInt errorCode2 = RProperty::Get( KPSUidStartup, KStartupSecurityCodeQueryStatus, securityQueryState); @@ -2230,7 +2229,6 @@ } else if ( iGprsSuspendedNoteShown && !iGprsSuspended ) { - ShowUiNoteL( EGprsResumedNote ); iGprsSuspendedNoteShown = EFalse; iGprsSuspended = EFalse; iCallActivated = EFalse; @@ -2728,7 +2726,6 @@ if ( EPSCTsyCallTypeCSVoice == callType && ENWNetworkModeWcdma != networkMode ) { appUi->iGprsSuspendedNoteShown = ETrue; - TRAP_IGNORE( appUi->ShowUiNoteL( EGprsSuspendedNote ) ); } return KErrNone; } @@ -6903,6 +6900,38 @@ } } } + +TBool CSysApAppUi::IsDefaultPowerKeyBehavior() + { + TRACES( RDebug::Print( _L("CSysApAppUi::IsDefaultPowerKeyBehavior" ) ) ); + TBool powerKeyIsLockKey = iSysApFeatureManager->PowerKeyIsLockKey(); + if ( !powerKeyIsLockKey ) + return ETrue; //no need for further processing + TInt securityDialogStatus = StateOfProperty( KPSUidStartup, KStartupSecurityCodeQueryStatus ); + TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior: securityDialogStatus = %d", securityDialogStatus ) ); + if ( securityDialogStatus == ESecurityQueryActive ) + { + // handle the exception from the exception. Currently used only when a long power key press is detected + return ETrue; + } + //make sure we can turn off device when 'sim invalid' dlg is displayed + TInt simStatus = StateOfProperty( KPSUidStartup, KStartupSimSecurityStatus ); + TBool simBogus = ( simStatus == ESimRejected ) || ( simStatus == ESimUnaccepted ) || (simStatus == ESimInvalid ); + + // check if the phone has fully booted into idle + TInt startupPhase = StateOfProperty ( KPSUidStartup, KPSStartupUiPhase ); + TBool bootCompleted = (EStartupUiPhaseAllDone == startupPhase); + + // Another exception from the exception: + // check if we're in charging or alert mode (only then we have a status pane instance) + TBool haveStatusPane = ( StatusPane()== NULL ) ? EFalse : StatusPane()->IsVisible(); + TBool defaultPowerKeyBehaviour = !bootCompleted || simBogus || haveStatusPane || iPowerKeyPopupMenuActive || !powerKeyIsLockKey; + + TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior: Sim Status = %d, haveStatusPane = %d, power key menu active? %d" , simStatus, haveStatusPane, iPowerKeyPopupMenuActive ) ); + TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior returns %d", defaultPowerKeyBehaviour ) ); + TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior: startupPhase = %d", startupPhase ) ); + return defaultPowerKeyBehaviour; + } // ---------------------------------------------------------------------------- // CSysApAppUi::StartChargingBatteryL diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/SysAp/Src/SysApLightsController.cpp --- a/coreapplicationuis/SysAp/Src/SysApLightsController.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApLightsController.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -31,6 +31,7 @@ #include "SysApFeatureManager.h" #include "startupdomainpskeys.h" #include +#include // CONSTANTS @@ -1103,9 +1104,17 @@ TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state ); if ( error == KErrNone && state == ESwStateCharging ) { - iSysApAppUi.StartChargingBatteryL(); - //To switch on the display - TInt result = HAL::Set( HALData::EDisplayState, 1 ); + TInt value = iSysApAppUi.StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ); + if (value == EChargingStatusChargingComplete ) + { + iSysApAppUi.StopChargingBatteryL(); + } + else + { + iSysApAppUi.StartChargingBatteryL(); + //To switch on the display + TInt result = HAL::Set( HALData::EDisplayState, 1 ); + } } } else diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp --- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -38,6 +38,7 @@ #include #include #include +#include #include "sysapdefaultkeyhandler.h" #include "sysapcallback.h" #include "SysAp.hrh" @@ -220,39 +221,45 @@ } else { // keylock action is defined by user setting - TInt status(0); - TInt err = iCallStateProperty.Get( status ); - if (err == KErrNone) + TInt value = 0; + RProperty::Get(KPSUidStartup, KPSStartupUiPhase, value); + TBool startupOver = (value == EStartupUiPhaseAllDone); + if(startupOver) { - switch ( status ) - { - case EPSCTsyCallStateUninitialized: - case EPSCTsyCallStateNone: - { + TInt status(0); + TInt err = iCallStateProperty.Get( status ); + if (err == KErrNone) + { + switch ( status ) + { + case EPSCTsyCallStateUninitialized: + case EPSCTsyCallStateNone: + { - TInt keyGuardSetting; - iSlideRepository->Get( KSlideKeyguard, keyGuardSetting ); - switch( ( TSlideSettingKeyguard ) keyGuardSetting ) - { - case ESlideSettingsKeyguardActivatingOn: - iKeylock->EnableKeyLock(); - break; - case ESlideSettingsKeyguardActivatingAskMe: - iKeylock->OfferKeyLock(); - break; - case ESlideSettingsKeyguardActivatingOff: - //do nothing - break; - case ESlideSettingsKeyguardActivatingAutomatic: - if( iKeypadWasLocked ) - { - iKeylock->EnableKeyLock(); - } - break; - } - } + TInt keyGuardSetting; + iSlideRepository->Get( KSlideKeyguard, keyGuardSetting ); + switch( ( TSlideSettingKeyguard ) keyGuardSetting ) + { + case ESlideSettingsKeyguardActivatingOn: + iKeylock->EnableKeyLock(); + break; + case ESlideSettingsKeyguardActivatingAskMe: + iKeylock->OfferKeyLock(); + break; + case ESlideSettingsKeyguardActivatingOff: + //do nothing + break; + case ESlideSettingsKeyguardActivatingAutomatic: + if( iKeypadWasLocked ) + { + iKeylock->EnableKeyLock(); + } + break; + } + } default: // any other state break; + } } } } diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/advancedtspcontroller/src/remcontspcontroller.cpp --- a/coreapplicationuis/advancedtspcontroller/src/remcontspcontroller.cpp Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/advancedtspcontroller/src/remcontspcontroller.cpp Thu Jul 15 18:49:38 2010 +0300 @@ -1540,6 +1540,8 @@ CApaCommandLine* apaCommandLine = CApaCommandLine::NewLC(); apaCommandLine->SetExecutableNameL( appInfo.iFullName ); apaCommandLine->SetCommandL( EApaCommandRun ); + _LIT8(Kparam, "play"); + apaCommandLine->SetTailEndL( Kparam ); apaLsSession.StartApp( *apaCommandLine ); CleanupStack::PopAndDestroy( apaCommandLine ); } diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h --- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h Thu Jul 15 18:49:38 2010 +0300 @@ -51,7 +51,8 @@ /** * Prefix macro for strings */ -#define _PREFIX_CHAR( aMsg ) (const char*)"[BatteryPopupControl]: " ##aMsg +#define _PREFIX_CHAR( aMsg ) (const char*)"[BatteryPopupControl]: " aMsg + /** * Define needed directories if TRACE_INTO_FILE macro in use diff -r 312d2b433792 -r 5e7d68cc22e0 coreapplicationuis/powersaveutilities/bsutil/inc/trace.h --- a/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h Mon Jun 21 15:51:07 2010 +0300 +++ b/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h Thu Jul 15 18:49:38 2010 +0300 @@ -51,7 +51,8 @@ /** * Prefix macro for strings */ -#define _PREFIX_CHAR( aMsg ) (const char*)"[BSUtil]: " ##aMsg +#define _PREFIX_CHAR( aMsg ) (const char*)"[BSUtil]: " aMsg + /** * Define needed directories if TRACE_INTO_FILE macro in use diff -r 312d2b433792 -r 5e7d68cc22e0 filehandling/fileconverterfw/doc_pub/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc Binary file filehandling/fileconverterfw/doc_pub/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 filehandling/htmltorichtextconverter/doc_pub/CHTMLTOCRTCONVERTER test code.rtf Binary file filehandling/htmltorichtextconverter/doc_pub/CHTMLTOCRTCONVERTER test code.rtf has changed diff -r 312d2b433792 -r 5e7d68cc22e0 filehandling/htmltorichtextconverter/documentation/CHTMLTOCRTCONVERTER test code.rtf Binary file filehandling/htmltorichtextconverter/documentation/CHTMLTOCRTCONVERTER test code.rtf has changed diff -r 312d2b433792 -r 5e7d68cc22e0 package_definition.xml --- a/package_definition.xml Mon Jun 21 15:51:07 2010 +0300 +++ b/package_definition.xml Thu Jul 15 18:49:38 2010 +0300 @@ -145,7 +145,7 @@ - + diff -r 312d2b433792 -r 5e7d68cc22e0 tzpcside/tzcompiler/doc_pub/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc Binary file tzpcside/tzcompiler/doc_pub/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 tzpcside/tzcompiler/group/BLD.INF --- a/tzpcside/tzcompiler/group/BLD.INF Mon Jun 21 15:51:07 2010 +0300 +++ b/tzpcside/tzcompiler/group/BLD.INF Thu Jul 15 18:49:38 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-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,7 @@ ../Release/TzIdentities.ini /epoc32/tools/tz/tzidentities.ini // TzCompiler User Documentation -"../documentation/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc" "/epoc32/tools/tz/sgl.gt0197.232 app-services tz 9.1 how-to create the tz database.doc" +"../doc_pub/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc" "/epoc32/tools/tz/sgl.gt0197.232 app-services tz 9.1 how-to create the tz database.doc" // Sample Olson's Tz Database Source Files ../Release/Data/africa /epoc32/tools/tz/data/africa diff -r 312d2b433792 -r 5e7d68cc22e0 tzpcside/tzcompiler/test/integration/TzCompilerTests/doc_pub/TestTzCompiler Description Document.doc Binary file tzpcside/tzcompiler/test/integration/TzCompilerTests/doc_pub/TestTzCompiler Description Document.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 tzservices/tzloc/doc_pub/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc Binary file tzservices/tzloc/doc_pub/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 tzservices/tzserver/doc_pub/SGL.GT0197.233 App-Services Tz 9.1 How-To Use the APIs.doc Binary file tzservices/tzserver/doc_pub/SGL.GT0197.233 App-Services Tz 9.1 How-To Use the APIs.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 tzservices/tzserver/doc_pub/SGL.GT0403.210 SOS v9.5 Time Zone Services PREQ1776 How-To.doc Binary file tzservices/tzserver/doc_pub/SGL.GT0403.210 SOS v9.5 Time Zone Services PREQ1776 How-To.doc has changed diff -r 312d2b433792 -r 5e7d68cc22e0 tzservices/tzserver/group/release.txt --- a/tzservices/tzserver/group/release.txt Mon Jun 21 15:51:07 2010 +0300 +++ b/tzservices/tzserver/group/release.txt Thu Jul 15 18:49:38 2010 +0300 @@ -300,6 +300,6 @@ Title : First Release of Timezone Server * First release of the new Time Zone Server. -* see ..\tz\documentation folder for how-to use the new component +* see ..\tzserver\doc_pub folder for how-to use the new component ============================