--- a/akntouchgesturefw/src/akntouchgesturefwflickrecognizer.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/akntouchgesturefw/src/akntouchgesturefwflickrecognizer.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -282,7 +282,7 @@
             case EAknTouchGestureFwFlickUp:
             case EAknTouchGestureFwFlickDown:
                 {
-                ImmediateFeedback( ETouchFeedbackFlick, feedbackType );
+                ImmediateFeedback( ETouchFeedbackItemScroll, feedbackType );
                 break;
                 }
             default:

--- a/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -21,7 +21,7 @@
 
 #include <eikenv.h>
 #include <aiwservicehandler.rsg>
-#include <EIKON.HRH>
+#include <eikon.hrh>
 #include "AiwMenuBinding.h"
 #include "AiwServiceHandlerImpl.h"
 #include "AiwMenu.h"

--- a/classicui_info/classicui_metadata/classicui_metadata.mrp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_info/classicui_metadata/classicui_metadata.mrp	Fri Apr 16 15:13:44 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 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: 
+#
+
 component           classicui_metadata
 source   \sf\mw\classicui\classicui_info\classicui_metadata 
 source   \sf\mw\classicui\package_definition.xml

--- a/classicui_plat/aiw_provider_utility_api/tsrc/inc/testdomaiwpro.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/aiw_provider_utility_api/tsrc/inc/testdomaiwpro.h	Fri Apr 16 15:13:44 2010 +0300
@@ -98,22 +98,6 @@
      */
     void SendTestClassVersion();
 
-    /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-    
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
-    //[TestMethods]
-
 private: // Test AiwMenu.h
     /**
      * TestAMConstructor test function for testing the Constructor function

--- a/classicui_plat/aiw_provider_utility_api/tsrc/src/testdomaiwpro.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/aiw_provider_utility_api/tsrc/src/testdomaiwpro.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -21,7 +21,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomaiwpro.h"
@@ -86,8 +85,6 @@
     iOffset = CCoeEnv::Static()->AddResourceFileL( KResourcePath );
 
     SendTestClassVersion();
-
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -117,9 +114,6 @@
     // Delete logger
     delete iLog;
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 //-----------------------------------------------------------------------------
@@ -157,30 +151,4 @@
     return ( CScriptBase* ) CTestDOMAIWPro::NewL( aTestModuleIf );
 
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMAIWPro::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMAIWPro::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
 //  End of File

--- a/classicui_plat/alarm_api/tsrc/inc/testdomalarm.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/alarm_api/tsrc/inc/testdomalarm.h	Fri Apr 16 15:13:44 2010 +0300
@@ -98,21 +98,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
 
 private: 
 

--- a/classicui_plat/alarm_api/tsrc/src/testdomalarm.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/alarm_api/tsrc/src/testdomalarm.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -22,7 +22,6 @@
  */
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomalarm.h"
@@ -88,8 +87,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -153,33 +150,6 @@
     {
     return ( CScriptBase* ) Ctestdomalarm::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void Ctestdomalarm::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void Ctestdomalarm::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 /*
  *   End of File
  */

--- a/classicui_plat/application_switching_api/tsrc/inc/testdomapplicationswitching.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/application_switching_api/tsrc/inc/testdomapplicationswitching.h	Fri Apr 16 15:13:44 2010 +0300
@@ -83,20 +83,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // Test EIKSRVUI.h
 /*                               class CEikServAppUiBase                     */

--- a/classicui_plat/application_switching_api/tsrc/src/testdomapplicationswitching.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/application_switching_api/tsrc/src/testdomapplicationswitching.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomapplicationswitching.h"
@@ -103,8 +102,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -156,32 +153,5 @@
     {
     return ( CScriptBase* ) CTestDOMApplicationSwitching::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMApplicationSwitching::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMApplicationSwitching::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File
 

--- a/classicui_plat/avkon_localised_texts_api/loc/avkon.loc	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_localised_texts_api/loc/avkon.loc	Fri Apr 16 15:13:44 2010 +0300
@@ -4194,10 +4194,5 @@
 //r: TB9.2
 #define qtn_tin_option_menu_add_smiley "Add smiley"
 
-//d:Restart phone note for inserting SIM card. Shown if SIM card has been inserted and offline mode has been changed to another one when phone is on.
-//l:popup_note_window
-//r: TB9.2
-#define qtn_su_note_insert_sim_and_restart "Insert SIM card and restart phone"
-
 
 // End of File

--- a/classicui_plat/avkon_secondary_display_support_api/tsrc/inc/testdomasds.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_secondary_display_support_api/tsrc/inc/testdomasds.h	Fri Apr 16 15:13:44 2010 +0300
@@ -83,20 +83,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/avkon_secondary_display_support_api/tsrc/src/testdomasds.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_secondary_display_support_api/tsrc/src/testdomasds.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomasds.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMASDS::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMASDS::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMASDS::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/avkon_testability_api/tsrc/inc/testplattestability.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_testability_api/tsrc/inc/testplattestability.h	Fri Apr 16 15:13:44 2010 +0300
@@ -89,20 +89,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/avkon_testability_api/tsrc/src/testplattestability.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_testability_api/tsrc/src/testplattestability.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -19,7 +19,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testplattestability.h"
@@ -100,8 +99,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -153,31 +150,4 @@
     {
     return ( CScriptBase* ) CTestPlatTestAbility::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestPlatTestAbility::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestPlatTestAbility::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/avkon_ui_server_api/tsrc/inc/testdomuiserver.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_ui_server_api/tsrc/inc/testdomuiserver.h	Fri Apr 16 15:13:44 2010 +0300
@@ -88,20 +88,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // Test akncapserverclient.h
     /**

--- a/classicui_plat/avkon_ui_server_api/tsrc/src/testdomuiserver.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/avkon_ui_server_api/tsrc/src/testdomuiserver.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -19,7 +19,6 @@
 
 // INCLUDE FILES
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 
 #include "testdomuiserver.h"
 
@@ -101,8 +100,7 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
+
     iUiServer = new ( ELeave ) RAknUiServer;
     }
 
@@ -155,33 +153,6 @@
     {
     return ( CScriptBase* ) CTestDomUiServer::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomUiServer::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomUiServer::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 // End of File
 
 

--- a/classicui_plat/battery_pane_api/tsrc/inc/testdombatterypane.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/battery_pane_api/tsrc/inc/testdombatterypane.h	Fri Apr 16 15:13:44 2010 +0300
@@ -83,20 +83,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/battery_pane_api/tsrc/src/testdombatterypane.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/battery_pane_api/tsrc/src/testdombatterypane.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -52,8 +51,6 @@
     // Delete logger
     delete iLog; 
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -105,8 +102,6 @@
     
     SendTestClassVersion();
     
-    TurnOffScreenSaver();
-    
     iOffset = CCoeEnv::Static()->AddResourceFileL( _L("C:\\resource\\testdombatterypane.rsc") );
     }
 
@@ -159,31 +154,4 @@
     {
     return ( CScriptBase* ) CTestDOMBatteryPane::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMBatteryPane::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMBatteryPane::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/inc/testdomcfdfilterfactory.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/inc/testdomcfdfilterfactory.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,21 +82,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
 
 private: //test the AknFileFilterFactory.h
     /**

--- a/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/src/testdomcfdfilterfactory.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/src/testdomcfdfilterfactory.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -53,9 +52,6 @@
     delete iLog;
 
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 // -----------------------------------------------------------------------------
@@ -106,8 +102,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     // Load resource file.
     iOffset = CCoeEnv::Static()->AddResourceFileL( _L( "c:\\resource\\testdomcfdfilterfactory.rsc" ) );
     }
@@ -161,31 +155,4 @@
     {
     return ( CScriptBase* ) CTestDOMCFDFilterFactory::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMCFDFilterFactory::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMCFDFilterFactory::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/custom_cursors_api/tsrc/inc/testdomcustomcursors.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/custom_cursors_api/tsrc/inc/testdomcustomcursors.h	Fri Apr 16 15:13:44 2010 +0300
@@ -81,20 +81,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // Test AknCustomCursorSupport.h
 /*                         class AknCustomCursorSupport                  */

--- a/classicui_plat/custom_cursors_api/tsrc/src/testdomcustomcursors.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/custom_cursors_api/tsrc/src/testdomcustomcursors.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomcustomcursors.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMCustomCursors::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMCustomCursors::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMCustomCursors::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/eikon_server_extension_client_api/tsrc/inc/testdomesec.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/eikon_server_extension_client_api/tsrc/inc/testdomesec.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/eikon_server_extension_client_api/tsrc/src/testdomesec.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/eikon_server_extension_client_api/tsrc/src/testdomesec.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomesec.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMESEC::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMESEC::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMESEC::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/emergency_call_support_api/tsrc/inc/testdomemergencycallsupport.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/emergency_call_support_api/tsrc/inc/testdomemergencycallsupport.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/emergency_call_support_api/tsrc/src/testdomemergencycallsupport.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/emergency_call_support_api/tsrc/src/testdomemergencycallsupport.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomemergencycallsupport.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMEmergencyCallSupport::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMEmergencyCallSupport::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMEmergencyCallSupport::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_aiw_criteria_api/tsrc/inc/testdomextaiwcriteria.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_aiw_criteria_api/tsrc/inc/testdomextaiwcriteria.h	Fri Apr 16 15:13:44 2010 +0300
@@ -84,20 +84,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     

--- a/classicui_plat/extended_aiw_criteria_api/tsrc/src/testdomextaiwcriteria.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_aiw_criteria_api/tsrc/src/testdomextaiwcriteria.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -22,7 +22,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomextaiwcriteria.h"
@@ -103,8 +102,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -156,31 +153,4 @@
     {
     return ( CScriptBase* ) CTestDomExtAiwCriteria::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtAiwCriteria::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtAiwCriteria::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_animation_api/tsrc/inc/testdomextanimation.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_animation_api/tsrc/inc/testdomextanimation.h	Fri Apr 16 15:13:44 2010 +0300
@@ -84,20 +84,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-    /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/extended_animation_api/tsrc/src/testdomextanimation.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_animation_api/tsrc/src/testdomextanimation.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -54,9 +53,6 @@
     // Delete logger
     delete iLog;
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 // -----------------------------------------------------------------------------
@@ -109,8 +105,6 @@
     SendTestClassVersion();
     
     iOffset = CCoeEnv::Static()->AddResourceFileL( KResourceFile );
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -163,30 +157,4 @@
     return ( CScriptBase* ) CTestDomExtAnimation::NewL( aTestModuleIf );
     }
 
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtAnimation::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtAnimation::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_buttons_api/tsrc/inc/testdomextbuttons.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_buttons_api/tsrc/inc/testdomextbuttons.h	Fri Apr 16 15:13:44 2010 +0300
@@ -85,20 +85,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-    /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/extended_buttons_api/tsrc/src/testdomextbuttons.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_buttons_api/tsrc/src/testdomextbuttons.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomextbuttons.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDomExtButtons::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtButtons::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtButtons::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_editors_api/tsrc/inc/testdomeditor.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_editors_api/tsrc/inc/testdomeditor.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // test methods in aknedformaccessor.h
 

--- a/classicui_plat/extended_editors_api/tsrc/src/testdomeditor.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_editors_api/tsrc/src/testdomeditor.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -21,7 +21,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -53,9 +52,6 @@
     // Delete logger
     delete iLog;
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 // -----------------------------------------------------------------------------
@@ -108,8 +104,6 @@
     _LIT( KResourceFile, "C:\\resource\\testdomeditor.rsc" );
     iOffset = CCoeEnv::Static()->AddResourceFileL( KResourceFile );
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -161,31 +155,4 @@
     {
     return ( CScriptBase* ) CTestDOMEditor::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMEditor::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMEditor::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_grids_api/tsrc/inc/testdomgrids.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_grids_api/tsrc/inc/testdomgrids.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      */
     void SendTestClassVersion();
 
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
 private: // [TestMethods]
 
     /**

--- a/classicui_plat/extended_grids_api/tsrc/src/testdomgrids.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_grids_api/tsrc/src/testdomgrids.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomgrids.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -155,30 +152,4 @@
     return ( CScriptBase* ) Ctestdomgrids::NewL( aTestModuleIf );
     }
 
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void Ctestdomgrids::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void Ctestdomgrids::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_indicators_api/tsrc/inc/testdomindicator.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_indicators_api/tsrc/inc/testdomindicator.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      */
     void SendTestClassVersion();
 
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
 private: // [TestMethods]
 
     /**

--- a/classicui_plat/extended_indicators_api/tsrc/src/testdomindicator.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_indicators_api/tsrc/src/testdomindicator.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomindicator.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDomIndicator::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomIndicator::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomIndicator::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_initialization_api/tsrc/inc/testdomextinit.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_initialization_api/tsrc/inc/testdomextinit.h	Fri Apr 16 15:13:44 2010 +0300
@@ -83,20 +83,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-    /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/extended_initialization_api/tsrc/src/testdomextinit.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_initialization_api/tsrc/src/testdomextinit.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomextinit.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -155,30 +152,4 @@
     return ( CScriptBase* ) CTestDomExtInit::NewL( aTestModuleIf );
     }
 
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtInit::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtInit::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_input_capabilities_api/tsrc/inc/testdominputcap.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_input_capabilities_api/tsrc/inc/testdominputcap.h	Fri Apr 16 15:13:44 2010 +0300
@@ -81,20 +81,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // test functions of CAknExtendedInputCapabilities::CAknExtendedInputCapabilitiesProvider
 

--- a/classicui_plat/extended_input_capabilities_api/tsrc/src/testdominputcap.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_input_capabilities_api/tsrc/src/testdominputcap.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdominputcap.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMInputCap::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMInputCap::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMInputCap::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_lists_api/tsrc/inc/testdomlists.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_lists_api/tsrc/inc/testdomlists.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      */
     void SendTestClassVersion();
 
-    /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
 private: // test functions in aknjavalists.h
 
     /**

--- a/classicui_plat/extended_lists_api/tsrc/src/testdomlists.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_lists_api/tsrc/src/testdomlists.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -52,9 +51,6 @@
     // Delete logger
     delete iLog;
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 // -----------------------------------------------------------------------------
@@ -108,8 +104,6 @@
     iOffset = CCoeEnv::Static()->AddResourceFileL( KResourceFile );
 
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -161,31 +155,4 @@
     {
     return ( CScriptBase* ) CTestDOMLists::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMLists::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMLists::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_notes_api/tsrc/inc/testdomextnotes.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_notes_api/tsrc/inc/testdomextnotes.h	Fri Apr 16 15:13:44 2010 +0300
@@ -81,20 +81,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
 

--- a/classicui_plat/extended_notes_api/tsrc/src/testdomextnotes.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_notes_api/tsrc/src/testdomextnotes.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomextnotes.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMExtNotes::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMExtNotes::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMExtNotes::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_notifiers_api/tsrc/inc/testdomextnotifiers.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_notifiers_api/tsrc/inc/testdomextnotifiers.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-    /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
 

--- a/classicui_plat/extended_notifiers_api/tsrc/src/testdomextnotifiers.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_notifiers_api/tsrc/src/testdomextnotifiers.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomextnotifiers.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDomExtNotifiers::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtNotifiers::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDomExtNotifiers::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_setting_pages_api/tsrc/inc/testdomsetpage.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_setting_pages_api/tsrc/inc/testdomsetpage.h	Fri Apr 16 15:13:44 2010 +0300
@@ -81,20 +81,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
 

--- a/classicui_plat/extended_setting_pages_api/tsrc/src/testdomsetpage.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_setting_pages_api/tsrc/src/testdomsetpage.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -52,9 +51,6 @@
     // Delete logger
     delete iLog;
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 // -----------------------------------------------------------------------------
@@ -108,8 +104,6 @@
     iOffset = CCoeEnv::Static()->AddResourceFileL( KResourceFile );
 
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -161,31 +155,4 @@
     {
     return ( CScriptBase* ) CTestDOMSetPage::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMSetPage::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMSetPage::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_sounds_api/tsrc/inc/testplatextsound.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_sounds_api/tsrc/inc/testplatextsound.h	Fri Apr 16 15:13:44 2010 +0300
@@ -91,20 +91,6 @@
      * Method used to log version of test class
      */
     void SendTestClassVersion();
-    
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
 
 private: // [TestMethods]
     /**

--- a/classicui_plat/extended_sounds_api/tsrc/src/testplatextsound.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_sounds_api/tsrc/src/testplatextsound.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -19,7 +19,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testplatextsound.h"
@@ -100,8 +99,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -153,31 +150,4 @@
     {
     return ( CScriptBase* ) CTestPlatExtSound::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestPlatExtSound::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestPlatExtSound::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File

--- a/classicui_plat/extended_status_pane_api/tsrc/inc/testdomstatuspane.h	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_status_pane_api/tsrc/inc/testdomstatuspane.h	Fri Apr 16 15:13:44 2010 +0300
@@ -82,20 +82,6 @@
      */
     void SendTestClassVersion();
 
-        /**
-     * Turn off ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void TurnOffScreenSaver();
-
-    /**
-     * Restore ScreenSaver
-     * @since S60 5.0
-     * @return Symbian OS error code.
-     */
-    void RestoreScreenSaver();
-
 private: // test functions of test aknsgcc.h
 
     /**

--- a/classicui_plat/extended_status_pane_api/tsrc/src/testdomstatuspane.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_plat/extended_status_pane_api/tsrc/src/testdomstatuspane.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 
 #include "testdomstatuspane.h"
@@ -101,8 +100,6 @@
                           EFalse );
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -154,31 +151,4 @@
     {
     return ( CScriptBase* ) CTestDOMStatusPane::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMStatusPane::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestDOMStatusPane::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File