diff -r 951aeeb3da43 -r eea20ed08f4b coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -38,6 +38,7 @@
 #include "sysapremconobserver.h"
 #include <lbs/locationfwdomainpskeys.h>
 #include <smsuaddr.h>
+#include <avkondomainpskeys.h>
 
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
   #include <ASShdAlarm.h>
@@ -47,11 +48,13 @@
   #include <asshdalarm.h>
 #endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
-
 // CONSTANTS
 const TUint KCoreAppUIsMmcRemovedWithoutEjectCmdMask = 0xFFFF;
 const TUint KCoreAppUIsMmcRemovedWithoutEjectValShift = 16;
 
+const TUid KPSUidSecurityUIs = { 0x100059b5 };
+const TUint32 KSecurityUIsLights  = 0x00000308;
+
 // ============================ MEMBER FUNCTIONS ==============================
 
 // ----------------------------------------------------------------------------
@@ -93,10 +96,10 @@
     iOutboxStatusSubscriber->Subscribe();
     iIrdaStatusSubscriber = CSysApSubscriber::NewL( *this, KIrdaPropertyCategory, KIrdaStatus );
     iIrdaStatusSubscriber->Subscribe();
-    iGprsStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidGprsStatusValue );
-    iGprsStatusSubscriber->Subscribe();
-    iWcdmaStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidWcdmaStatusValue ); 
-    iWcdmaStatusSubscriber->Subscribe();
+//    iGprsStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidGprsStatusValue );
+//    iGprsStatusSubscriber->Subscribe();
+//    iWcdmaStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidWcdmaStatusValue ); 
+//    iWcdmaStatusSubscriber->Subscribe();
     iLocationGlobalPrivacySubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidLocationGlobalPrivacyValue );
     iLocationGlobalPrivacySubscriber->Subscribe();
     iRestoreBackupSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, conn::KUidBackupRestoreKey );
@@ -185,6 +188,15 @@
 
     iSmsPhoneStoreSubscriber = CSysApSubscriber::NewL( *this, KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey );
     iSmsPhoneStoreSubscriber->Subscribe();
+    
+    iKeylockEventSubscriber = CSysApSubscriber::NewL( *this, KPSUidAvkonDomain, KAknKeyguardStatus );
+    iKeylockEventSubscriber->Subscribe();
+    
+    iLightsOnRequestSubscriber = CSysApSubscriber::NewL( *this, KPSUidSecurityUIs, KSecurityUIsLights );
+    iLightsOnRequestSubscriber->Subscribe();
+    
+    iPowerMenuCustomDialogSubscriber = CSysApSubscriber::NewL( *this, KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus );
+    iPowerMenuCustomDialogSubscriber->Subscribe();
     }
 
 // ----------------------------------------------------------------------------
@@ -202,8 +214,8 @@
     delete iInboxStatusSubscriber;
     delete iOutboxStatusSubscriber; 
     delete iIrdaStatusSubscriber;
-    delete iGprsStatusSubscriber; 
-    delete iWcdmaStatusSubscriber;
+//    delete iGprsStatusSubscriber; 
+//    delete iWcdmaStatusSubscriber;
     delete iHomeZoneStatusSubscriber;
     delete iNewEmailStatusSubscriber; 
     delete iLocationGlobalPrivacySubscriber;
@@ -236,6 +248,9 @@
     delete iVideoSharingIndicatorSubscriber;
     delete iGpsIndicatorSubscriber;
     delete iSmsPhoneStoreSubscriber;
+    delete iKeylockEventSubscriber;
+    delete iLightsOnRequestSubscriber;
+    delete iPowerMenuCustomDialogSubscriber;
     }
 
 
@@ -306,7 +321,8 @@
         {
         HandleHwrmFmTxCategoryL( aKey, value );
         }
-*/    else if ( aCategory == KPSUidDataSynchronizationInternalKeys )
+*/
+    else if ( aCategory == KPSUidDataSynchronizationInternalKeys )
         {
         HandleDataSyncCategoryL( aKey, value );
         }
@@ -318,6 +334,14 @@
         {
         HandleSmsStackCategoryL( aKey, value );
         }
+    else if ( aCategory == KPSUidAvkonDomain)
+        {
+        HandleLKeylockEventL( aKey, value );
+        }
+    else if ( aCategory == KPSUidSecurityUIs)
+        {
+        HandleLightsOnRequestL( aKey, value );
+        }
     }
 // ----------------------------------------------------------------------------
 // CSysApPubSubObserver::HandleCoreAppUIsCategoryL()
@@ -361,23 +385,23 @@
         case KCoreAppUIsUipInd:
             if ( aValue == ECoreAppUIsDoNotShow )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOff ); 
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOff ); 
                 }
             else if ( aValue == ECoreAppUIsShow )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOn ); 
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOn ); 
                 }
             break;
         case KCoreAppUIsMessageToneQuit:
-            iSysApAppUi.HandleMessageTonePlayingQuitability( aValue );
+ //           iSysApAppUi.HandleMessageTonePlayingQuitability( aValue );
             break;
         case KCoreAppUIsNspsRawKeyEvent:
-            iSysApAppUi.HandleNspsRawKeyEventL();
+ //           iSysApAppUi.HandleNspsRawKeyEventL();
             break;
         case KCoreAppUIsLightsRawKeyEvent:
             if ( aValue == ECoreAppUIsKeyEvent )
                 {
-                iSysApAppUi.HandleRawKeyEventLightsRequireL();
+  //              iSysApAppUi.HandleRawKeyEventLightsRequireL();
                 }
             break;
         case KCoreAppUIsMmcRemovedWithoutEject:
@@ -385,27 +409,27 @@
             TUint cmd( aValue & KCoreAppUIsMmcRemovedWithoutEjectCmdMask );
             if ( cmd == ECoreAppUIsEjectCommandUsed )
                 {
-                iSysApAppUi.EjectStarted( ETrue );
+ //               iSysApAppUi.EjectStarted( ETrue );
                 }
             else if ( cmd == ECoreAppUIsEjectCommandNotUsed )
                 {
-                iSysApAppUi.EjectStarted( EFalse );
+ //               iSysApAppUi.EjectStarted( EFalse );
                 }
             else if ( cmd == ECoreAppUIsEjectCommandUsedToDrive )
                 {
                 TInt drive( aValue >> KCoreAppUIsMmcRemovedWithoutEjectValShift );
-                iSysApAppUi.EjectUsed( drive );
+ //               iSysApAppUi.EjectUsed( drive );
                 }
             break;
             }
         case KCoreAppUIsNewEmailStatus:
             if ( aValue == ECoreAppUIsNewEmail )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsNoNewEmail )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOff );
                 }
             break;
 
@@ -423,68 +447,84 @@
         case KCoreAppUIsPoCIndicator:
             if ( aValue == ECoreAppUIsPocIndicatorOff || aValue == ECoreAppUIsPocIndicatorUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
                 }
             else if ( aValue == ECoreAppUIsPocIndicatorDoNotDisturb )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsPocIndicatorConnectionOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOn );
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOn );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
                 }
             break;
         case KCoreAppUIsPoCMissedIndicator:
             if ( aValue == ECoreAppUIsPocMissedIndicatorOff || aValue == ECoreAppUIsPocMissedIndicatorUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOff );
                 }
             else if ( aValue == ECoreAppUIsPocMissedIndicatorOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOn );
                 }
             break;
             
         case KCoreAppUIsTarmIndicator:
-            iSysApAppUi.HandleTarmIndicatorL( aValue );
+ //           iSysApAppUi.HandleTarmIndicatorL( aValue );
             break;
 
         case KCoreAppUIsMtvRecStatus:
             if ( aValue == ECoreAppUIsMtvRecStatusOn  )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsMtvRecStatusOff || aValue == ECoreAppUIsMtvRecStatusUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOff );
                 }
             break;
 
         case KCoreAppUIsMtvDvbhStatus:
             if ( aValue == ECoreAppUIsMtvDvbhStatusOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsMtvDvbhStatusOff || aValue == ECoreAppUIsMtvDvbhStatusUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOff );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOff );
                 }
             break;
         
         case KCoreAppUIsVideoSharingIndicator:
             if ( aValue == ECoreAppUIsVideoSharingIndicatorOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsVideoSharingIndicatorOff || aValue == ECoreAppUIsVideoSharingIndicatorUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOff );
                 }
             break;
-
+            
+        case KCoreAppUIsPowerMenuCustomDialogStatus:
+            if ( aValue == ECoreAppUIsPowerMenuCustomDialogOn )
+                { 
+                TBool powerMenuMemoryStatus = EFalse;
+                powerMenuMemoryStatus = iSysApAppUi.ReleasePowerMenuCustomDialogMemory();
+                if(powerMenuMemoryStatus)
+                    {
+                    RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOff );
+                    }
+                }
+            else if ( aValue == ECoreAppUIsPowerMenuCustomDialogOff || aValue == ECoreAppUIsPowerMenuCustomDialogUninitialized )
+                {
+                   // do nothing
+                }
+            break;   
+        
         default:
             break;
         }
@@ -525,43 +565,43 @@
     switch ( aKey )
         {
         case KUidInboxStatusValue:
-            iSysApAppUi.SetEnvelopeIndicatorL();
+//            iSysApAppUi.SetEnvelopeIndicatorL();
             break;
 
         case KUidOutboxStatusValue:
             if ( aValue == ESADocumentsInOutbox )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
                 }
             //Hide the Outbox indicator
             else if ( aValue == ESAOutboxEmpty )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
                 }
             break;
 
         case KIrdaStatus:
             if ( aValue == TIrdaStatusCodes::EIrLoaded || aValue == TIrdaStatusCodes::EIrBlocked || aValue == TIrdaStatusCodes::EIrDisconnected )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
                 }
             else if ( aValue == TIrdaStatusCodes::EIrConnected )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
                 }
             else if ( aValue == TIrdaStatusCodes::EIrUnloaded )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
                 }
             break;
 
-        case KPSUidGprsStatusValue:
-        case KPSUidWcdmaStatusValue:        
-            iSysApAppUi.SetSignalIndicatorL();
-            break;
+//        case KPSUidGprsStatusValue:
+ //       case KPSUidWcdmaStatusValue:        
+ //           iSysApAppUi.SetSignalIndicatorL();
+//            break;
 
         case KPSUidLocationGlobalPrivacyValue:
-            iSysApAppUi.HandleLocationPrivacyIndicatorL( aValue );
+//            iSysApAppUi.HandleLocationPrivacyIndicatorL( aValue );
             break;
 
         case conn::KUidBackupRestoreKey:
@@ -594,7 +634,7 @@
     switch ( aKey )
         {
         case KHWRMBatteryLevel:
-            iSysApAppUi.UpdateBatteryBarsL( aValue );
+ //           iSysApAppUi.UpdateBatteryBarsL( aValue );
             break;
         
         case KHWRMBatteryStatus:
@@ -642,17 +682,17 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Active/Inactive -> Off transition")));
                     
     	            // turn any FM TX indicators off
-	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
-	                iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
                     
                     // give notification
                     if ( aValue == EFmTxStatePowerSaveAccessory )
                     	{
-                    	iSysApAppUi.ShowUiNoteL( EFmTxAccessoryStandbyNote );
+//                    	iSysApAppUi.ShowUiNoteL( EFmTxAccessoryStandbyNote );
                     	}
                     else
                     	{
-                    	iSysApAppUi.ShowUiNoteL( EFmTxOffNote );
+ //                   	iSysApAppUi.ShowUiNoteL( EFmTxOffNote );
                     	}
                     isFmTxTurnedOff = ETrue;                                                                           	
                     }
@@ -662,8 +702,8 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Active -> Inactive transition")));
                    
                     // enable not sending indicator
-	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                  
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
+//                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                  
                     }
                 else if ( aValue == EFmTxStateActive )
                     {
@@ -671,8 +711,8 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Inactive -> Active transition")));
                     
                     // enable active indicator
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );    
-                    iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                
+//                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );    
+//                    iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                
                     }    
         
                 break;    
@@ -689,11 +729,11 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Off -> Active transition")));
                                         
                     // enable active indicator
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );   
-                    iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                  
+ //                   iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );   
+ //                   iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                  
                     
                     // give notification
-                    iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
+ //                   iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
                     isFmTxTurnedOn = ETrue;
                     }
                 else if ( aValue == EFmTxStateInactive || aValue == EFmTxStateScanning )
@@ -702,11 +742,11 @@
                 	TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Off -> Inactive transition")));
                 	
                     // enable not sending indicator
-	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                      	
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
+ //                   iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                      	
                     
                     // give notification
-                    iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
+ //                   iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
                     isFmTxTurnedOn = ETrue;
                 	}                
                 break;                
@@ -794,16 +834,16 @@
         case KNWHomeZoneStatus:
             if ( aValue == ENWHomeZone )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
                 }
             else if ( aValue == ENWNone || aValue == ENWCityZone )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
                 }
             break; 
 
         case KNWTelephonyNetworkMode:
-            iSysApAppUi.SetSignalIndicatorL();
+ //           iSysApAppUi.SetSignalIndicatorL();
             break;
 
         default:
@@ -821,11 +861,11 @@
         case KHWRMFlipStatus:
             if ( aValue == EPSHWRMFlipClosed )
                 {
-                iSysApAppUi.SimulateFlipKeyEventL( EFalse );
+ //               iSysApAppUi.SimulateFlipKeyEventL( EFalse );
                 }
             else if ( aValue == EPSHWRMFlipOpen )
                 {
-                iSysApAppUi.SimulateFlipKeyEventL( ETrue );
+ //               iSysApAppUi.SimulateFlipKeyEventL( ETrue );
                 }
             break; 
 
@@ -844,11 +884,11 @@
         case KDataSyncStatus:
             if ( aValue > EDataSyncNotRunning )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization , EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization , EAknIndicatorStateOn );
                 }
             else
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization, EAknIndicatorStateOff );
+  //              iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization, EAknIndicatorStateOff );
                 }
             break;
         
@@ -868,15 +908,15 @@
         case KPosIntGpsHwStatus:
             if ( aValue == EPosIntGpsHwOff )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
                 }
             else if ( aValue == EPosIntGpsHwOn )    
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
                 }
             else if ( aValue == EPosIntGpsHwIntermediate )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateAnimate );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateAnimate );
                 }
             break;
         
@@ -893,8 +933,8 @@
     {
     switch ( aKey )
         {
-        case KUidPSSMSStackDiskSpaceMonitorKey:
-            iSysApAppUi.SetEnvelopeIndicatorL();
+        case KAknKeyguardStatus:
+ //           iSysApAppUi.SetEnvelopeIndicatorL();
             break;
 
         default:
@@ -902,7 +942,39 @@
         }
     }
 
-// End of File
+void CSysApPubSubObserver::HandleLKeylockEventL( const TUint /* aKey */, const TInt aValue )
+    {
+    switch( aValue )
+        {
+        case EEikKeyLockEnabled:
+            iSysApAppUi.SetKeyLockEnabledL();
+            break;
+        case EEikKeyLockDisabled:
+            iSysApAppUi.SetKeyLockDisabledL();    
+            break;
+        default:
+            break;
+       }
+    }
 
+void CSysApPubSubObserver::HandleLightsOnRequestL( const TUint /* aKey */, const TInt aValue )
+    {
+    switch ( aValue )
+        {
+        case EEikKeyLockLightsOnRequest:
+             iSysApAppUi.SetLightsOnUnlockNoteL();
+             break;
+        case EEikEcsQueryLights: // emergency note is shown
+             iSysApAppUi.SetLightsOnEcsQueryL();
+             break;
 
+        case EEikSecurityQueryLights: // for device lock security query
+             iSysApAppUi.SetLightsOnSecurityQueryL();
+             break;
 
+        default:
+            break;
+        }
+    }
+
+// End of File