diff -r 924385140d98 -r c2c61fdca848 coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp
--- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp	Tue Aug 31 15:24:25 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp	Wed Sep 01 12:24:48 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2003-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"
@@ -23,7 +23,7 @@
 #include "SysApFeatureManager.h"
 #include "SysAp.hrh"
 #include <centralrepository.h>
-#include "coreapplicationuisprivatecrkeys.h"
+#include "CoreApplicationUIsPrivateCRKeys.h"
 #include <hwrmlight.h>
 #include <AknUtils.h>
 
@@ -63,6 +63,10 @@
     iGripNotSupported = FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider );
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: iGripNotSupported=%d"), iGripNotSupported ) );
     
+//    iSlideSupported = FeatureManager::FeatureSupported( KFeatureIdFfCommonSlide );
+		iSlideSupported = EFalse;
+    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: iSlideSupported=%d"), iSlideSupported ) );
+    
     iLocationPrivacySupported = FeatureManager::FeatureSupported( KFeatureIdPrivacyFramework );
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Location Privacy supported=%d"), iLocationPrivacySupported ) );
 
@@ -93,10 +97,10 @@
     iNoPowerKeySupported = FeatureManager::FeatureSupported( KFeatureIdNoPowerkey );
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: No power key supported=%d"), iNoPowerKeySupported ) );
     
-//    iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx );
-//    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) );
+    iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx );
+    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) );
 
-//    iPenEnabled = AknLayoutUtils::PenEnabled();
+    iPenEnabled = AknLayoutUtils::PenEnabled();
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Pen enabled=%d"), iPenEnabled ) );
     
     iVmbxCallDivertIconSupported = FeatureManager::FeatureSupported( KFeatureIdVmbxCallDivertIcon );
@@ -105,8 +109,14 @@
     iTouchUnlockStrokeSupported = FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke );
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Touch unlock stroke supported=%d"), iTouchUnlockStrokeSupported ) );
     
-//    iFmTxRdsTextSupported = FeatureManager::FeatureSupported( KFeatureIdFfFmtxRdsText );
-//    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX RDS-TEXT supported=%d"), iFmTxRdsTextSupported ) );
+    iFmTxRdsTextSupported = FeatureManager::FeatureSupported( KFeatureIdFfFmtxRdsText );
+    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX RDS-TEXT supported=%d"), iFmTxRdsTextSupported ) );
+    
+    iPowerKeyIsLockKey = FeatureManager::FeatureSupported( KFeatureIdFfPowerKeyAsKeyguard );
+    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Power Key as keyguard supported=%d"), iPowerKeyIsLockKey ) );
+
+    iGanSupported = FeatureManager::FeatureSupported( KFeatureIdFfGenericAccessNetwork );
+    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: GAN supported=%d"), iGanSupported ) );
     
     CRepository* repository = NULL;
     
@@ -180,12 +190,13 @@
                                                iGripNotSupported( ETrue ),
                                                iPowerSaveSupported( EFalse ),
                                                iNoPowerKeySupported( EFalse ),
-                                               //iFmTxSupported( EFalse ),
+                                               iFmTxSupported( EFalse ),
                                                iPenEnabled( EFalse ),
                                                iVmbxCallDivertIconSupported( EFalse ),
-                                               iTouchUnlockStrokeSupported( EFalse )
-                                               //iFmTxRdsTextSupported( EFalse )
-
+                                               iTouchUnlockStrokeSupported( EFalse ),
+                                               iFmTxRdsTextSupported( EFalse ),
+                                               iPowerKeyIsLockKey ( EFalse ),
+                                               iGanSupported( EFalse )
     {
     }
 
@@ -342,6 +353,15 @@
     {
     return iGripNotSupported;
     }
+
+// ----------------------------------------------------------------------------
+// CSysApFeatureManager::SlideSupported()
+// ----------------------------------------------------------------------------
+//
+TBool CSysApFeatureManager::SlideSupported() const
+    {
+    return iSlideSupported;
+    }
     
 // ----------------------------------------------------------------------------
 // CSysApFeatureManager::CoverDisplaySupported()
@@ -369,7 +389,7 @@
     {
     return iNoPowerKeySupported;
     }
-/*
+
 // ----------------------------------------------------------------------------
 // CSysApFeatureManager::FmTxSupported()
 // ----------------------------------------------------------------------------
@@ -378,7 +398,6 @@
     {
     return iFmTxSupported;
     }
-*/
 
 // ----------------------------------------------------------------------------
 // CSysApFeatureManager::PenEnabled()
@@ -406,7 +425,7 @@
     {
     return iTouchUnlockStrokeSupported;
     }
-/*
+
 // ----------------------------------------------------------------------------
 // CSysApFeatureManager::FmTxRdsTextSupported()
 // ----------------------------------------------------------------------------
@@ -415,7 +434,25 @@
     {
     return iFmTxRdsTextSupported;
     }
-*/
+
+//-----------------------------------------------------------------------------
+// CSysApFeatureManager::PowerKeyIsLockKey()
+//-----------------------------------------------------------------------------
+//
+TBool CSysApFeatureManager::PowerKeyIsLockKey() const
+    {
+    return iPowerKeyIsLockKey;
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApFeatureManager::GanSupported()
+// ----------------------------------------------------------------------------
+//  
+TBool CSysApFeatureManager::GanSupported() const
+    {
+    return iGanSupported;
+    }        
+
 // End of File