FCL/sf/mw/appsupport: comparison coreapplicationuis/SysAp/Src/SysApAppUi.cpp

equal deleted inserted replaced

-:2222076f5c60
+:76883296a0d5
 #include <hwrmpowerstatesdkpskeys.h>
 #include <wlaninternalpskeys.h>
 #include <HbDeviceNotificationDialogSymbian.h>
 //#include <HbDeviceInputDialogSymbian.h>
 #include <hbsymbianvariant.h>
+//#include <hbtextresolversymbian.h>
 #include <UikonInternalPSKeys.h>
 //#include "SysApWsClient.h"
 #include "SysApFeatureManager.h"
 #include "SysApNspsHandler.h"
 #include "sysapbatteryinfocontroller.h"
 #include "SysApSimChanged.h"
 #include "MSysApBtSapController.h"
 #include "MSysApBtController.h"
 #include "MSysApUsbIndicator.h"
+//#include <hbindicatorsymbian.h>
+//#include <psmclient.h>
+//#include <psmsettings.h>
 #include "sysapkeymanagement.h"
 #include "SysApShutdownImage.h"
+#include "SysApKeySndHandler.h"
 #include <settingsinternalcrkeys.h>
 #include <keyguardaccessapi.h>
 #include <eikdef.h>
 #include <eikenv.h>
 class CHbSymbianVariant;
 const TInt KModifierMask( 0 );
 _LIT_SECURITY_POLICY_PASS(KAlwaysPassPolicy);
 _LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
 const TInt KDelayBeforeNextScanningRound( 1000000 );
+/*
+_LIT(KPsmPlugin,"com.nokia.hb.powersavemodeplugin/1.0");
+_LIT(KPsm,"PSM");
+_LIT(KCharging,"Charging");
+_LIT(KPsmlocalisationfile, "powermanagement_");
+_LIT(KtsfilePath, "z:/resource/qt/translations/");
+_LIT(KlowbatteryIcon,"qtg_small_bt_low_battery.svg");
+_LIT(KbatteryFullIcon,"qtg_status_battery.svg");
+*/
 // ============================ MEMBER FUNCTIONS ==============================
 // ----------------------------------------------------------------------------
 // CSysApAppUi::CSysApAppUi()
 iSysApStartupController = CSysApStartupController::NewL( *this, iSysApFeatureManager->OfflineModeSupported() );
 iActiveProfileBeforeOfflineMode = iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode );
 iSysApFeatureManager->FeatureVariationCheckDone();
+// iHbIndicatorSymbian = CHbIndicatorSymbian::NewL();
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApLightsController::NewL()") ) );
 iSysApLightsController = CSysApLightsController::NewL( *this,
 iSysApCenRepLightSettingsObserver->GetLightsTimeout(),
 iSysApFeatureManager->CoverDisplaySupported() );
 if (keyManagementErr)
 {
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : CSysApKeyManagement::NewL returns error=%d"), keyManagementErr ) );
 }
+// Initialize animdll for handling side volume keys
+// (needed before normal mode in case emergency number is dialed from PIN query)
+iSysApKeySndHandler = CSysApKeySndHandler::NewL(iEikonEnv->WsSession());
 iKeyguardController = CKeyguardAccessApi::NewL();
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApShutdownImage::NewL()") ) );
 iSysApShutdownImage = CSysApShutdownImage::NewL();//NULL; //
+// Initialize nsps handler. Needed for proper lights control during PIN query.
+TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApNspsHandler::NewL") ) );
+iSysApNspsHandler = CSysApNspsHandler::NewL( iEikonEnv->WsSession(), iSysApShutdownImage->ShutdownCoeControlWindow() );
 RProperty::Define( KPSUidCoreApplicationUIs,KCoreAppUIsPowerMenuCustomDialogStatus, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
 RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogUninitialized );
+// TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
 TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );
 }
 // ----------------------------------------------------------------------------
 void CSysApAppUi::FreeResources()
 {
 TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources") ) );
 delete iSysApBatteryInfoController;
 delete iSysApPsmController;
+//delete iVariantAccState;
 delete iSysApAudioRoutingObserver;
 if ( iSapTimer )
 {
 iSapTimer->Cancel();
 delete iSysApCenRepLogsObserver;
 delete iSysApOfflineModeController;
 delete iSysApUsbIndicatorController;
 delete iKeyguardController;
+// delete iHbIndicatorSymbian;
 delete iSysApKeyManagement;
 iSysApKeyManagement = NULL;
 REComSession::FinalClose();
 iResourcesFreed = ETrue;
 TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL" ) ) );
 TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
 UpdateBatteryBarsL( state );
 DoSwStateNormalConstructionL();
 HandleAccessoryProfileInStartupL();
+if ( !iSysApPsmController ) // created here if first state change has not occurred yet
+{
+iSysApPsmController = CSysApPsmController::NewL( *this );
+}
 if ( iSysApPsmController )
 {
 if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
 {
 HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
 }
 }
 TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
 TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d" ), batteryStatus ) );
 if(  batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
 {
 if ( !iSysApPsmController ) // created only in first state change
 {
 iSysApPsmController = CSysApPsmController::NewL( *this );
 }
-// in charger boot explicitly disable partial power save mode
+// in charger boot explicitly disable  power save mode
 if ( aSwState == RStarterSession::ECharging )
 {
 iSysApPsmController->ChargerConnected();
-iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable partial power save now
+iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable  power save now
 }
 }
 if ( aSwState == RStarterSession::ECharging || aSwState == RStarterSession::EAlarm )
 {
 TRACES( RDebug::Print( _L("~CSysApAppUi() started") ) );
 if( !iResourcesFreed )
 {
 FreeResources();
 }
+delete iSysApStartupController;
 }
 TBool CSysApAppUi::ResourcesFreed() const
 {
 return iResourcesFreed;
 {
 return;
 }
 #endif // SYSAP_USE_STARTUP_UI_PHASE
+#if 0 // Not used as of now
 SetHacIndicatorL();
+#endif //0
 }
 // ----------------------------------------------------------------------------
 // CSysApAppUi::UiReady()
 //
 // will take care in next sub
 switch ( aStatus )
 {
 case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
 UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
 ShowUiNoteL( EPowerSaveModeActivated );
 break;
 case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
 UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
 ShowUiNoteL( EPowerSaveModeDeactivated );
 break;
 case MSysApPsmControllerNotifyCallback::EPsmActivationFailed:
 ShowUiNoteL( ECannotActivatePowerSaveMode );
 break;
 {
 if ( iSysApPsmController && UiReady() )
 {
 iSysApPsmController->BatteryLow( ETrue );
 if ( iSysApPsmController->ShowActivateQuery())
 {
 // show activation query, replaces the first battery low query
 ShowQueryL( ESysApBattLowPowerSavingQuery );
 }
 }
 }
 else
 {
 //Display Battery Low note.
 ShowUiNoteL( EBatteryLowNote );
 }
 }
 if ( iSysApBatteryInfoController )
 {
 iSysApBatteryInfoController->BatteryStatusUpdated( aValue );
 }
 }
 // ----------------------------------------------------------------------------
 // CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
 // ----------------------------------------------------------------------------
 CleanupStack::PopAndDestroy(); // aString
 }
 break;
 case EBatteryFullUnplugChargerNote:
 {
-iSysApLightsController->BatteryEmptyL( ETrue );
+/*
-_LIT(KPowerPressKey,"Charging complete. Unplug charger to save energy.");
+TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
-HBufC* aString = HBufC16::NewLC(200);
+iSysApLightsController->BatteryEmptyL( ETrue );
+_LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy");
+HBufC* unplugCharger = HbTextResolverSymbian::LoadL(KunplugCharger);
+_LIT(KbatteryFull,"txt_power_management_dpophead_100_full");
+HBufC* batteryFull = HbTextResolverSymbian::LoadL(KbatteryFull);
+CHbDeviceNotificationDialogSymbian::NotificationL(KbatteryFullIcon,*unplugCharger,*batteryFull);
+*/
+iSysApLightsController->BatteryEmptyL( ETrue );
+_LIT(KPowerPressKey,"Charging complete. Unplug charger to save energy.");
+HBufC* aString = HBufC16::NewLC(200);
 TPtrC aStringPointer = aString->Des();
 aStringPointer.Set(KPowerPressKey);
 TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
 ShowExampleUiNoteL( aStringPointer );
 CleanupStack::PopAndDestroy(); // aString
 }
 break;
 case EUnplugChargerNote:
 {
 _LIT(KPowerPressKey,"Unplug charger from power supply to save energy");
 if ( iSysApPsmController && UiReady() )
 {
 if ( iCharging && !iSysApPsmController->ChargerConnected() ) // first time after charger connection
 {
 iSysApPsmController->ConnectCharger( ETrue );
 if ( iSysApPsmController->ShowDeactivateQuery() )
 {
 ShowQueryL( ESysApBattChargingPowerSavingQuery );
 // Query is on the display. Don't show the note.
 showNote = EFalse;
 }
 else
 {
 iSysApPsmController->DoEnablePartialPsm( EFalse );
 }
 }
 else if ( aValue == EChargingStatusNotConnected )
 {
 iSysApPsmController->ConnectCharger( EFalse );
 }
 {
 // deactivate psm indicator
 }
 }
 if ( iSysApBatteryInfoController )
 {
 iSysApBatteryInfoController->BatteryLevelUpdatedL();
 }
-}
+}
 // ----------------------------------------------------------------------------
 // CSysApAppUi::ShowChargingNoteL()
 showNote = EFalse;
 }
 TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL KCTsyCallState=%d"), StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ) );
 if ( showNote ) // Power Mgmt UI spec defines that no Charging note is shown while the phone is ringing/alerting
 {
+/*
+TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+_LIT(KChargingNote,"txt_power_management_dblist_charging");
+HBufC* chargingNote = HbTextResolverSymbian::LoadL(KChargingNote);
+CHbDeviceNotificationDialogSymbian::NotificationL(KNullDesC,*chargingNote);
+*/
 _LIT(KChargingNote,"Charging");
 HBufC* aString = HBufC16::NewLC(50);
 TPtrC aStringPointer = aString->Des();
 aStringPointer.Set(KChargingNote);
 TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
 {
 TRACES( RDebug::Print( _L("e_KEY_EVENT_SENDING 0") ) );
 }
 #endif // _DEBUG
-TKeyResponse response( EKeyWasNotConsumed );
+TKeyResponse response(EKeyWasNotConsumed);
+if (response)
+{
+//Do nothing:: To supress warning
+}
 if (iSysApKeyManagement && aKeyEvent.iCode != EKeyPowerOff && aKeyEvent.iCode != 'E')
 {
 response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
 }

changeset 49	76883296a0d5
parent 48	2222076f5c60
child 56	11a052f4b02e