Merge fix for case collision PDK_4.0.a
authorandy simpson <andrews@symbian.org>
Fri, 01 Oct 2010 14:28:06 +0100
changeset 75 dac9bdf65a30
parent 74 1505405bc645 (diff)
parent 73 6966cff55eb6 (current diff)
Merge fix for case collision
appfw/apparchitecture/bwins/APFILEU.DEF
appfw/apparchitecture/bwins/APSERVU.DEF
--- a/coreapplicationuis/SysAp/Group/SysAp.mmp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Group/SysAp.mmp	Fri Oct 01 14:28:06 2010 +0100
@@ -61,9 +61,9 @@
 
 SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
 SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
-SYSTEMINCLUDE		/epoc32/include/mw/QtCore
-SYSTEMINCLUDE		/epoc32/include/mw/QtGui
-SYSTEMINCLUDE		/epoc32/include/stdapis/stlportv5
+
+SYSTEMINCLUDE      	/epoc32/include/mw
+
 
 USERINCLUDE        . 
 USERINCLUDE        ../Inc
@@ -77,7 +77,7 @@
 USERINCLUDE        ../Src/memorycard
 
 MW_LAYER_SYSTEMINCLUDE 
-
+APP_LAYER_SYSTEMINCLUDE
 
 START RESOURCE ../Data/SysAp.rss
 HEADER
@@ -156,7 +156,6 @@
 SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp
 SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp
 SOURCE CenRepObservers/sysapcenrepofflinemodeobserver.cpp
-SOURCE CenRepObservers/SysApCenRepSilentModeObserver.cpp
 
 LIBRARY centralrepository.lib
 LIBRARY cenrepnotifhandler.lib
@@ -231,22 +230,5 @@
 SOURCE SysApEtelNetworkStatusNspsObserver.cpp SysApEtelConnector.cpp SysApEtelNetworkBarObserver.cpp SysApEtelSmsStoreObserver.cpp sysapeteldatabearerobserver.cpp sysapetelnetworkbargetter.cpp sysapetelnetworkinfoobserver.cpp
 
 LIBRARY etelpckt.lib
-//QtHighway lib for invoking logs app
-LIBRARY xqservice.lib
-LIBRARY xqserviceutil.lib
-LIBRARY		QtCore.lib
-
-//Required to use by EndKey
-LIBRARY		afactivitylauncher.lib
-
-//Required for OpenLibC 
-OPTION CW -cwd include -wchar_t on
-OPTION ARMCC --visibility_inlines_hidden
-#if defined(ARMCC_4_0)
-OPTION ARMCC --import_all_vtbl
-#endif
-OPTION GCCE -fvisibility-inlines-hidden
 
 
-STDCPP
-
--- a/coreapplicationuis/SysAp/Inc/SysAp.hrh	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Inc/SysAp.hrh	Fri Oct 01 14:28:06 2010 +0100
@@ -95,8 +95,7 @@
     EPowerSaveModeActivated,
     EPowerSaveModeDeactivated,
     ECannotActivatePowerSaveMode,
-    ECannotDeactivatePowerSaveMode,
-    ESysApRestartPhone
+    ECannotDeactivatePowerSaveMode
     };
 
 enum TSysApWaitNoteIds
@@ -115,6 +114,7 @@
 enum TSysApConfirmationQueryIds
     {
     ESysApNoQuery=0,
+    ESysApRestartPhoneQuery,
     ESysApLeaveOfflineModeQuery,
     ESysApRemoveMmcNote,
     ESysApEjectMmcQuery,
--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Fri Oct 01 14:28:06 2010 +0100
@@ -63,7 +63,6 @@
 class CSysApCenRepLightSettingsObserver;
 class CSysApCenRepBtObserver;
 class CSysApCenRepHacSettingObserver;
-class CSysApCenRepSilentModeObserver;
 class CSysApAudioRoutingObserver;
 class CSysApSsSettingsObserver;
 class CSystemLock;
@@ -264,15 +263,12 @@
         TBool IsEncryptionOperationOngoingL() const;
 //        void ConnectToFileServerL();
 //        void ConnectToWindowServerL();
-        void HandleSendKeyEventL();
-        void HandleEndKeyEventL();
-        
-        void ShowNoteL ( const TDesC& noteText )const;
+        void ShowExampleUiNoteL ( const TDesC& noteText )const;
         void ShowNotificationDialog(const TDesC& noteText)const;
         void PopupNote();
 //        void CreateWindowGroup();
         TBool ResourcesFreed() const;
-        void ShowUiNoteL( const TSysApNoteIds aNote );        
+        void ShowUiNoteL( const TSysApNoteIds aNote ) const;        
         TInt StateOfProperty( const TUid& aCategory, const TUint aKey ) const;
         TBool OfflineModeActive();
         void GoOnlineL( TBool aDoProfileChange = ETrue );
@@ -507,7 +503,6 @@
           CSysApCenRepLightSettingsObserver*  iSysApCenRepLightSettingsObserver;
           CSysApCenRepBtObserver*                  iSysApCenRepBtObserver;
           CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver;
-          CSysApCenRepSilentModeObserver* iSysApCenRepSilentModeObserver;
           
           CSysApAudioRoutingObserver* iSysApAudioRoutingObserver;
           CSysApPsmController* iSysApPsmController;
@@ -541,9 +536,6 @@
         TBool                           iResourcesFreed;        
         TInt                            iCapturedEKeyPowerOff;
         TInt                            iCapturedEKeyPowerOffUpAndDowns;
-        TInt                            iCapturedEKeySendKey;
-        TInt                            iCapturedEKeyEndKey;
-        
         TBool                           iOfflineModeActive;
         TBool                           iShutdownStarted;
         
--- a/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h	Fri Oct 01 14:28:06 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -133,7 +133,7 @@
         */
         TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
 
-        CFbsBitmap* ReadSVGL (const TFileName& aFileName);
+        CFbsBitmap* ReadSVGL (TFileName aFileName);
     private:    // Data
 
         //Used for showing user selected image
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* 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:  CSysApCenRepSilentModeObserver implementation.
- *
-*/
-
-
-// INCLUDE FILES
-#include "SysApCenRepSilentModeObserver.h"
-#include "SysApAppUi.h"
-#include <hbindicatorsymbian.h>
-
-// ========================== MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-CSysApCenRepSilentModeObserver* CSysApCenRepSilentModeObserver::NewL( )
-    {       
-    TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::NewL" ) ) );
-    CSysApCenRepSilentModeObserver* self = new ( ELeave ) CSysApCenRepSilentModeObserver(  );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); //self
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver(  )
-    {
-    TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver" ) ) );
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-CSysApCenRepSilentModeObserver::~CSysApCenRepSilentModeObserver()
-    {
-    TRACES( RDebug::Print( _L("~CSysApCenRepSilentModeObserver") ) );
-    if ( iSilentModeHandler )
-        {
-        iSilentModeHandler->StopListening();
-        }
-    delete iSilentModeHandler;
-    delete iSession;
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepSilentModeObserver::ConstructL()
-    {
-    TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::ConstructL: trying CRepository::NewL( KCRUidBluetoothPowerState )") ) );
-    iSession = CRepository::NewL( KCRUidProfileEngine );
-    
-    iSilentModeHandler = 
-        CCenRepNotifyHandler::NewL( *this, 
-                                    *iSession, 
-                                    CCenRepNotifyHandler::EIntKey, 
-                                    KProEngSilenceMode );
-    iSilentModeHandler->StartListeningL();
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepSilentModeObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue  )
-    {
-    TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt(), aId=0x%x, aNewValue=%d" ), aId, aNewValue ) );
-     
-    SilenceIndicatorL(aNewValue);
-        
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepSilentModeObserver::HandleNotifyError( TUint32 /* aId */, TInt /* error */, CCenRepNotifyHandler* /* aHandler */ )
-    {
-    TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyError()" ) ) );
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepSilentModeObserver::SilenceIndicatorL(TInt aValue)
-    {
-    TRACES( RDebug::Print( _L(" CSysApCenRepSilentModeObserver::SilenceIndicatorL" )));
-    CHbIndicatorSymbian* indicator = CHbIndicatorSymbian::NewL();
-    CleanupStack::PushL(indicator);
-    _LIT(KSilentmodeindicator,"com.nokia.hb.indicator.controlpanel.cpsilenceindicatorplugin/1.0");
-    
-    
-    if (aValue) 
-       {
-       TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() activate silence indicator" )));
-       // activate the indicator plugin to display the icon in status bar        
-       indicator->Activate(KSilentmodeindicator); 
-       } 
-    else
-       {
-       TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() Deactivate silence indicator" )));
-       // deactivate the indicator plugin to remove the icon in the status bar  
-       indicator->Deactivate(KSilentmodeindicator);
-       }
-    CleanupStack::PopAndDestroy(indicator); // indicator
-    }
-    
-
-// End of File
-
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.h	Mon Sep 27 11:32:21 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* 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:  CSysApCenRepSilentModeObserver class definition. 
-*
-*/
-
-
-#ifndef SYSAPCENREPSILENTMODEOBSERVER_H
-#define SYSAPCENREPSILENTMODEOBSERVER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <centralrepository.h>
-#include "SysAp.hrh"
-#include <cenrepnotifyhandler.h>
-#include <ProfileEngineDomainCRKeys.h>
-
-// CLASS DECLARATION
-
-
-class CSysApCenRepSilentModeObserver : public CBase, public MCenRepNotifyHandlerCallback
-    {
-    public: // Constructors and destructor
-        /**
-        * Default constructor
-        */
-        static CSysApCenRepSilentModeObserver* NewL(  );
-
-        /**
-        * Destructor.
-        */
-        ~CSysApCenRepSilentModeObserver();
-        
-        // From MCenRepNotifyHandlerCallback
-        void HandleNotifyInt( TUint32 aId, TInt aNewValue );
-        void HandleNotifyError( TUint32 aId, TInt error, CCenRepNotifyHandler* aHandler );
-
-    private:
-
-        /**
-        * @param None
-        * @return void
-        */
-        void ConstructL( );
-        
-        
-        /**
-        * C++ default constructor.
-        * @param None
-        * @return void
-        */
-        CSysApCenRepSilentModeObserver();
-       
-        
-        //To activate and Deactivate the indicator
-        void SilenceIndicatorL(TInt avalue);
-        
-   
-
-  
-    private:
-               
-        CRepository*          iSession;
-        //To listen to the silentmodekey
-        CCenRepNotifyHandler* iSilentModeHandler;
-    };
-
-#endif      // SYSAPCENREPSILENTMODEOBSERVER_H
-            
-// End of File
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Fri Oct 01 14:28:06 2010 +0100
@@ -55,7 +55,7 @@
 #include "sysapkeymanagement.h"
 #include "SysApShutdownImage.h"
 #include "SysApKeySndHandler.h"
-#include "SysApCenRepSilentModeObserver.h"
+
 #include "SysApShutdownAnimation.h"
 #include "SysApEtelConnector.h"
 
@@ -74,21 +74,6 @@
 #include <usbpersonalityids.h>
 #include "sysap.rsg"
 #include <hbindicatorsymbian.h>
-//Qt Highway
-#include <xqappmgr.h>
-#include <xqaiwdecl.h>
-#include <xqaiwrequest.h>
-#include <QString.h>
-#include <QVariant.h>
-#include <QMap.h>
-#include <QList.h>
-//For End Key
-#include <APGWGNAM.H>
-//For HS RPropertyKey
-#include <homescreendomainpskeys.h>
-//For Hs Changes
-#include <afactivitylauncher.h>
-#include <apgcli.h>
 
 class CHbSymbianVariant;
 const TInt KModifierMask( 0 );
@@ -171,10 +156,7 @@
     RWindowGroup groupWin = iCoeEnv->RootWin();
     User::LeaveIfError ( iCapturedEKeyPowerOff = groupWin.CaptureKey( EKeyPowerOff, KModifierMask, KModifierMask ) );
     User::LeaveIfError ( iCapturedEKeyPowerOffUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyDevice2, KModifierMask, KModifierMask ) );
-    //Capture SEND and END keys
-    User::LeaveIfError ( iCapturedEKeySendKey = groupWin.CaptureKey( EKeyPhoneSend, KModifierMask, KModifierMask ) );
-    User::LeaveIfError ( iCapturedEKeyEndKey = groupWin.CaptureKey( EKeyPhoneEnd, KModifierMask, KModifierMask ) );
-    
+     
     TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) );
     iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL(*this);
     
@@ -274,10 +256,6 @@
     TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL  trying CSysApCenRepHacSettingObserver::NewL") ) );
     iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this ); 
     
-    TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL  trying CSysApCenRepSilentModeObserver::NewL") ) );
-    iSysApCenRepSilentModeObserver = CSysApCenRepSilentModeObserver::NewL( ); 
-    
-    
 #ifndef RD_MULTIPLE_DRIVE
     if ( iSysApFeatureManager->MmcSupported() )
         {
@@ -366,17 +344,13 @@
     RWindowGroup groupWin = iCoeEnv->RootWin();
     groupWin.CancelCaptureKey( iCapturedEKeyPowerOff );
     groupWin.CancelCaptureKeyUpAndDowns( iCapturedEKeyPowerOffUpAndDowns );
-    //Deregister SendKey
-    groupWin.CancelCaptureKey( iCapturedEKeySendKey );
-    //Deregister EndKey
-    groupWin.CancelCaptureKey( iCapturedEKeyEndKey );
     
     delete iSysApDefaultKeyHandler;
     delete iSysApCenRepLightSettingsObserver;
     delete iSysApCenRepBtObserver;
     delete iSysApCenRepHacSettingObserver;
     delete iSysApCenRepController;
-    delete iSysApCenRepSilentModeObserver;
+
     delete iSysApPubSubObserver;
     
     delete iSysApLightsController;
@@ -691,14 +665,14 @@
     return iResourcesFreed;
     }
 
-void CSysApAppUi::ShowNoteL( const TDesC& noteText )const
+void CSysApAppUi::ShowExampleUiNoteL( const TDesC& noteText )const
     {          
- 	TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) );    
+ 	TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) );    
     CHbDeviceMessageBoxSymbian *note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
  	CleanupStack::PushL(note);
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); 
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); 
     note->SetTextL(noteText);
-	note->SetTimeout(3000);
+	note->SetTimeout(300);
  	TRACES( RDebug::Print( _L("CSysApAppUi:: Display of  CHbDeviceMessageBoxSymbian::Begin") ) );    
     note->ShowL();
 	TRACES( RDebug::Print( _L("CSysApAppUi:: Display of  CHbDeviceMessageBoxSymbian::End") ) );
@@ -1289,7 +1263,7 @@
     TPtrC aStringPointer = aString->Des();
     aStringPointer.Set(KPowerPressKey);
     TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
-    ShowNoteL( aStringPointer );  
+    ShowExampleUiNoteL( aStringPointer );  
     CleanupStack::PopAndDestroy(); // aString
     }
 
@@ -2082,42 +2056,64 @@
 // CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) 
+void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
     {
-	TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote") ) );
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
+    
     TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
+
     if( UiReady() || swState == ESwStateSecurityCheck)
-		{
-		TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
+      {
           switch ( aNote )
             {
             case EBatteryLowNote:
                 {
-                 _LIT(KLowBattery,"Battery low");
-                 ShowNoteL( KLowBattery() );
+                 _LIT(KPowerPressKey,"Battery low");
+                 HBufC* aString = HBufC16::NewLC(100);
+                 TPtrC aStringPointer = aString->Des();
+                 aStringPointer.Set(KPowerPressKey);
+                 TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                 ShowExampleUiNoteL( aStringPointer );
+                 CleanupStack::PopAndDestroy(); // aString
                 }
                 break;
             case EBatteryFullNote:
                 {
-                _LIT(KBatteryFull,"Battery full");
-                ShowNoteL( KBatteryFull() );
+                _LIT(KPowerPressKey,"Battery full");
+                HBufC* aString = HBufC16::NewLC(100);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
                 break;
             case ERechargeBatteryNote:
                 {
                 iSysApLightsController->BatteryEmptyL( ETrue );
-                _LIT(KRechargeBattery,"Battery empty. Recharge");
-                ShowNoteL( KRechargeBattery() );
+                _LIT(KPowerPressKey,"Battery empty. Recharge");
+                HBufC* aString = HBufC16::NewLC(100);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
                 break;
             case ENotChargingNote:
                 {
-                _LIT(KNotCharging,"Not charging");
-                ShowNoteL( KNotCharging() );
+                _LIT(KPowerPressKey,"Not charging");
+                HBufC* aString = HBufC16::NewLC(100);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
                 break;
             case EBatteryFullUnplugChargerNote:
                 {
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); 
                 iSysApLightsController->BatteryEmptyL( ETrue );
                  _LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy");                 
                  HBufC* unplugCharger = HbTextResolverSymbian::LoadL(KunplugCharger);
@@ -2128,28 +2124,22 @@
                 break;
             case EUnplugChargerNote:
                 {
-                _LIT(KUnplugCharger,"Unplug charger from power supply to save energy");
-                ShowNoteL( KUnplugCharger() );
+                _LIT(KPowerPressKey,"Unplug charger from power supply to save energy");
+                HBufC* aString = HBufC16::NewLC(250);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
                 break;
-            case ESysApRestartPhone:
-                {
-				//Show the restart note
-				_LIT(KRestartPhone,"Phone will be restarted");
-				ShowNoteL( KRestartPhone() );
-				//wait for 3 seconds to close note. Other wise the shutdown will continue
-				//without waiting for note to complete.
-				User::After(4000000);
-				//Now restart the device
-				DoShutdownL( ETrue, RStarterSession::EDataRestoreReset );	                
-				}
-                break;
             default:
                 break;
             }
         }
     }
-	
+
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::BatteryEmptyL()
 // ----------------------------------------------------------------------------
@@ -2786,30 +2776,6 @@
                     Exit();
                     break;
 #endif
-                case EKeyPhoneSend:
-                    {
-                    TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Send  key event received::Start") ) );
-                    if (UiReady()&& aKeyEvent.iRepeats == 0)
-                        {
-                        //Ignore LongPress on SEND key event as Long press generates Short press event too, 
-                        //And there is no Different use case for long press. 
-                        HandleSendKeyEventL();
-                        }
-                    TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Send  key event received::End") ) );
-                    break;
-                    }
-                case EKeyPhoneEnd:
-                    {
-                    TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, End  key event received") ) );
-                    if (UiReady() && aKeyEvent.iRepeats == 0)
-                        {
-                        //Ignore LongPress on END key event as Long press generates Short press event too, 
-                        //And there is no Different use case for long press. 
-                        HandleEndKeyEventL();
-                        }
-                    TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL()::EKeyPhoneEnd: End" ) ) );
-                    break;
-                    }
                 case EKeyPowerOff:
                     //Short power key press
                     iKeyBoardRepeatCount++;
@@ -4089,93 +4055,6 @@
         }
     }
 
-/**
- * Handles SEND key events
- * If SEND key is pressed in idle Home screen view, This will bring LOGS View without DialPad.
- * otherwise, it brings LOGS&Dial pad.
- */
-void CSysApAppUi::HandleSendKeyEventL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleSendKeyEventL: START") ) );    
-    //Check whether ForeGround app is HomeScreen
-    TInt hsStatus(EHomeScreenIdleState) ;
-    //Get the RProperty
-    User::LeaveIfError( RProperty::Get(KHsCategoryUid, KHsCategoryStateKey, hsStatus));
-    //Enable dialpad in Non-HS view
-    const TBool enableDialPad( EHomeScreenIdleState != hsStatus ); 
-    
-    //invoke LOGS/Dialer app
-    XQApplicationManager appMgr;
-    QScopedPointer<XQAiwRequest> request(appMgr.create(QString("logs"), XQI_LOGS_VIEW, XQOP_LOGS_SHOW, false));   
-    
-    if (!request.isNull()) 
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleSendKeyEventL::Request::Begin") ) );
-        int retValue = -1; 
-        
-        QVariantMap map;
-        map.insert(XQLOGS_VIEW_INDEX, QVariant(0)); 
-        map.insert(XQLOGS_SHOW_DIALPAD, QVariant(enableDialPad));
-        map.insert(XQLOGS_DIALPAD_TEXT, QVariant(QString()));
-        
-        QList<QVariant> arglist;
-
-        arglist.append(QVariant(map));
-        request->setArguments(arglist);
-        QVariant ret(retValue);        
-        request->send(ret);
-        TRACES( RDebug::Print( _L("CSysApAppUi::InvokeApp::Request::End") ) );
-        }
-    
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleSendKeyEventL: End") ) );
-    }
-
-/**
- * Handles END key events
- * If END key is pressed, Fore ground app will be exits and 
- * Home screen view will brought to Foreground
- */
-void CSysApAppUi::HandleEndKeyEventL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleEndKeyEventL: Start") ) );
-    //Get ForeGround App
-    TInt foregroundWindowGroupId = iEikonEnv->WsSession().GetFocusWindowGroup();
-    CApaWindowGroupName* doomedApp = CApaWindowGroupName::NewLC(iEikonEnv->WsSession(),foregroundWindowGroupId );
-    
-    //Bring the HS before killing the ForeGround App.
-    _LIT(KHsActivactionUri, "appto://20022F35?activityname=HsIdleView");
-    RApaLsSession apaLsSession;
-    CleanupClosePushL(apaLsSession);
-    User::LeaveIfError(apaLsSession.Connect());
-    CAfActivityLauncher *activityEnabler = CAfActivityLauncher::NewLC(apaLsSession, iEikonEnv->WsSession());
-    activityEnabler->launchActivityL(KHsActivactionUri);
-    CleanupStack::PopAndDestroy(activityEnabler);
-    CleanupStack::PopAndDestroy(&apaLsSession);
-        
-    //End or Kill the Foreground App
-    //If Phone is in HS idle view, End key have no impact.
-    if ( !doomedApp->IsSystem() )
-       {
-       TApaTask task( iEikonEnv->WsSession() );
-       task.SetWgId( foregroundWindowGroupId );
-       TRACES (
-               const TDesC& caption = doomedApp->Caption();
-               const TDesC& docname = doomedApp->DocName();
-               const TDesC& wgname = doomedApp->WindowGroupName();
-               TUid uid = doomedApp->AppUid();
-               RDebug::Print( _L("CSysApAppUi::HandleEndKeyEventL: Closing app \"%S\" (ThreadId %d, WgId %d, UID 0x%X); Docname: %S, WGName : %S"),
-                              &caption,
-                              (TUint)(task.ThreadId()),
-                              foregroundWindowGroupId,
-                              uid.iUid,
-                              &docname,
-                              &wgname);
-               );
-      task.EndTask();
-      TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL::HandleEndKeyEventL, End  task event triggered") ) );
-       }
-    CleanupStack::PopAndDestroy(doomedApp);//doomedApp
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleEndKeyEventL: End") ) );    
-    }
+
 
 //end of file
--- a/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp	Fri Oct 01 14:28:06 2010 +0100
@@ -123,6 +123,12 @@
 
         switch ( iQueryId )
             {
+            case ESysApRestartPhoneQuery:
+                queryStringBuf = StringLoader::LoadLC( R_QTN_RESTART_QUERY, aLoaderEnv );
+                keys = R_AVKON_SOFTKEYS_OK_EMPTY;
+                anim = R_QGN_NOTE_WARNING_ANIM;
+                secondaryDisplayCmdId = SecondaryDisplay::ECmdShowRestartPhoneQuery;
+                break;
             case ESysApLeaveOfflineModeQuery:
                 queryStringBuf = StringLoader::LoadLC( R_QTN_LEAVE_OFFLINE_MODE_QUERY, aLoaderEnv );
                 keys = R_AVKON_SOFTKEYS_YES_NO;
@@ -276,6 +282,12 @@
     TRACES( RDebug::Print( _L( "CSysApConfirmationQuery::RunL: iQueryId = %d, iStatus = %d" ), iQueryId, iStatus.Int() ) );
     switch ( iQueryId ) 
         {
+        case ESysApRestartPhoneQuery: 
+            {    
+            TRACES( RDebug::Print( _L( "CSysApConfirmationQuery::RunL: calling CSysApAppUi::DoShutdownL( ETrue, EDataRestoreReset )" ) ) );
+            iSysApAppUi.DoShutdownL( ETrue, RStarterSession::EDataRestoreReset );
+            }
+            break;
         case ESysApLeaveOfflineModeQuery:                  
             if ( iStatus.Int() == EAknSoftkeyYes )
                 {
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Fri Oct 01 14:28:06 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 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"
@@ -636,7 +636,8 @@
             else if ( iRestoreOngoing )
                 {
                 TRACES( RDebug::Print( _L("CSysApPubSubObserver::HandleSystemCategoryL: restore finished, make the device reset" ) ) ); 
-                iSysApAppUi.ShowUiNoteL( ESysApRestartPhone );   
+                User::After( 1000000 );
+                iSysApAppUi.ShowQueryL( ESysApRestartPhoneQuery );   
                 }
             }
             break;
--- a/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp	Fri Oct 01 14:28:06 2010 +0100
@@ -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"
@@ -166,7 +166,7 @@
 // ----------------------------------------------------------------------------
 // CSysApShutdownImage::ShowShutdownImage()
 // ----------------------------------------------------------------------------
-CFbsBitmap* CSysApShutdownImage::ReadSVGL (const TFileName& aFileName)
+CFbsBitmap* CSysApShutdownImage::ReadSVGL (TFileName aFileName)
     {
     TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:start" ) ) );    
     TFontSpec fontspec;
--- a/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp	Fri Oct 01 14:28:06 2010 +0100
@@ -211,7 +211,7 @@
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KChargingNote);
         TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString         
         return;
         }
@@ -228,7 +228,7 @@
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KChargingNote);
         TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString    
         iSysApDriveList.MarkDriveUnlockQueryShown( iDriveToUnlock );
         }
@@ -300,7 +300,7 @@
         HBufC* aString = HBufC16::NewLC(150);
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KUnlockNote);   
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString
         return ETrue;
         }
@@ -311,7 +311,7 @@
         HBufC* aString = HBufC16::NewLC(150);
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KUnlockDeniedNote);   
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString
         return EFalse;
         }
@@ -322,7 +322,7 @@
         HBufC* aString = HBufC16::NewLC(150);
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KUnlockAlreadyExistNote);
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString
         return ETrue;
         }
@@ -334,7 +334,7 @@
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KUnlockNotSupporrtedNote);
         TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString
         return ETrue;
         }
@@ -346,7 +346,7 @@
         TPtrC aStringPointer = aString->Des();
         aStringPointer.Set(KUnlockOperationCancelNote);
         TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
-        iSysApAppUi.ShowNoteL( aStringPointer );
+        iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
         CleanupStack::PopAndDestroy(); // aString
         return ETrue;
         }
--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Mon Sep 27 11:32:21 2010 +0100
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Fri Oct 01 14:28:06 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-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"
@@ -41,7 +41,6 @@
 #include <AknSgcc.h>
 //#include "sysapappui.h"
 #include <w32std.h>
-#include <avkondomainpskeys.h>
 
 
 const TInt KModifierMask( 0 );
@@ -289,8 +288,8 @@
     TInt value(0);
     TBool retval(EFalse);
 
-    RProperty::Get(  KPSUidAvkonDomain, KAknKeyguardStatus, value );
-    if ( value > EKeyguardNotActive )
+    RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, value );
+    if ( value > EAutolockOff )
         {
         retval = ETrue;
         }