--- a/coreapplicationuis/SysAp/Src/SysApLightsController.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApLightsController.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -20,7 +20,7 @@
#include <activitymanager.h>
#include "SysApLightsController.h"
#include "SysApAppUi.h"
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
#include <e32svr.h>
#include <hwrmdomainpskeys.h>
#include "SysApFeatureManager.h"
@@ -29,9 +29,6 @@
#endif // RD_LIGHT_CONTROL_CHANGE
#include "SysApFeatureManager.h"
-#include "startupdomainpskeys.h"
-#include <hal.h>
-#include <hwrmpowerstatesdkpskeys.h>
// CONSTANTS
@@ -153,7 +150,7 @@
TBool blinkEnabled = ETrue;
- if( iSysApFeatureManager->Supported( KSysApFeatureIdNoFlasUiInSilentMode ) )
+ if( iSysApFeatureManager->Supported( KSysApFeatureIdNoFlasUiInSilentMode ))
{
blinkEnabled = EFalse;
}
@@ -219,13 +216,7 @@
{
iLightPluginHandler->HandleEventNoAction( SysApLightExtension::EChargerConnection, TPckgBuf<TBool>(aConnected) );
}
-#endif // RD_LIGHT_CONTROL_CHANGE
- TInt state( 0 );
- TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
- if ( error == KErrNone && state == ESwStateCharging )
- {
- EnableActivityManagerL();
- }
+#endif // RD_LIGHT_CONTROL_CHANGE
}
// ----------------------------------------------------------------------------
@@ -978,28 +969,16 @@
return;
}
- TInt err(KErrNone);
- TInt state( 0 );
- TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
+ TInt err(KErrNone);
- if ( error == KErrNone && state != ESwStateCharging )
- {
#ifdef RD_LIGHT_CONTROL_CHANGE
- if ( !iLightPluginHandler->HandleCommand( SysApLightExtension::ELightCommandOff ) )
- {
- TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
- }
+ if ( !iLightPluginHandler->HandleCommand( SysApLightExtension::ELightCommandOff ) )
+ {
+ TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
+ }
#else // RD_LIGHT_CONTROL_CHANGE
- TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
-#endif // RD_LIGHT_CONTROL_CHANGE
- }
- else
- {
- TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
- iSysApAppUi.StopChargingBatteryL();
- //To switch off the display
- TInt result = HAL::Set( HALData::EDisplayState, 0 );
- }
+ TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
+#endif // RD_LIGHT_CONTROL_CHANGE
// Ignore unreserved in use warnings.
if ( err != KErrNone && err != KErrInUse )
{
@@ -1099,23 +1078,6 @@
iLightsCurrentlyOn = ETrue;
iLastLightsOnTime.HomeTime();
}
-
- TInt state( 0 );
- TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
- if ( error == KErrNone && state == ESwStateCharging )
- {
- 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
{