diff -r 924385140d98 -r c2c61fdca848 coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h
--- a/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h	Tue Aug 31 15:24:25 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h	Wed Sep 01 12:24:48 2010 +0100
@@ -21,13 +21,13 @@
 
 #include <e32base.h>
 #include <coedef.h>
-//#include <AknCapServerClient.h>
+#include <AknCapServerClient.h>
+#include <e32property.h>
 
-class RWindowGroup;
 class MSysapCallback;
-
-//class RAknKeylock2;
-//class CSysApAppUi;
+class RAknKeylock2;
+class CRepository;
+class CKeyLockPolicyApi;
 
 
 /**
@@ -52,7 +52,7 @@
         * @param aCallback reference to System Application callback interface.
         * @return pointer to a new instance of CSysApDefaultKeyHandler.
         */
-        static CSysApDefaultKeyHandler* NewL(MSysapCallback& callback);
+        static CSysApDefaultKeyHandler* NewL( MSysapCallback& callback );
 
         /**
         * Destructor.
@@ -88,7 +88,7 @@
         *
         * @param aCallback reference to System Application callback interface.
         */
-        CSysApDefaultKeyHandler(MSysapCallback& callback );
+        CSysApDefaultKeyHandler( MSysapCallback& callback );
 
     private:
     
@@ -165,10 +165,7 @@
         TBool DoShowKeysLockedNote();
         
     private: // data
-        
-        // Our window group from SysappUi
- //       RWindowGroup& iRootWindowGroup;
-        
+
         /**
         * Reference to callback object.
         */
@@ -188,7 +185,12 @@
         * Pointer to sysap-owned RAknKeylock2*
         * Not own.
         */
-//        RAknKeylock2* iKeylock;
+        RAknKeylock2* iKeylock;
+        
+        /**
+         * Owned. Used to enable/disable keylock activation when slide is close/open
+         */
+        CKeyLockPolicyApi* iKeylockPolicy;
         
         /**
         * Handle of the captured camera key event.
@@ -228,8 +230,18 @@
         /**
         * Avkon UI Server
         */
-//        RAknUiServer iAknUiServer;
+        RAknUiServer iAknUiServer;
         
+        /**
+         * Keypad slide handling CR
+         */
+        CRepository* iSlideRepository;
+        TBool iKeypadWasLocked;
+
+        /**
+          * Call status P&S for slide handling
+          */
+        RProperty iCallStateProperty;
     };
 
 #endif // SYSAPDEFAULTKEYHANDLER_H