--- a/uifw/AvKon/animdllsrc/AknAnimKeySound.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AvKon/animdllsrc/AknAnimKeySound.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -32,8 +32,8 @@
 
 // This is currently nasty set dependencies, API should be moved to middleware layer asap 
 #include <ctsydomainpskeys.h> 
-#include <activeidle2domainpskeys.h>
-#include <NetworkHandlingDomainPSKeys.h>
+
+#include <networkhandlingdomainpskeys.h>
 #include <PSVariables.h>
 
 #include <hwrmlight.h> 
@@ -258,10 +258,6 @@
         iPendingEvent = CAknPendingKeyEvent::NewL(iFunctions, iNoPowerKeyScanCode);
         }
 
-    
-    iSupportQuertyKey = 
-               FeatureManager::FeatureSupported( KFeatureIdQwertyInput );
-    
     FeatureManager::UnInitializeLib();
     
     // Get extension for querying and manipulating the window and screen attributes.
@@ -291,12 +287,8 @@
 // CAknAnimKeySound::IsBlockedKeyCode
 // -----------------------------------------------------------------------------
 //
-TBool CAknAnimKeySound::IsBlockedKeyCode( TBool aSupportQuerty , TInt aScanCode )  
+TBool CAknAnimKeySound::IsBlockedKeyCode( TInt aScanCode )
     {
-    if( aSupportQuerty )
-        {
-        return EFalse;
-        }
     for ( TInt ii=0; ii < KBlockedKeyCodeTableSize; ii++ )
         {
         if ( aScanCode == KBlockedKeyCodes[ii] )
@@ -533,7 +525,6 @@
 
         // If system is not in idle or there are calls ongoing, then end key ought to be generated.
         User::LeaveIfError( RProperty::Get( KPSUidCtsyCallInformation, KCTsyCallState, ps ) );
-        User::LeaveIfError( RProperty::Get( KPSUidAiInformation, KActiveIdleState, idle ) );
         User::LeaveIfError( RProperty::Get( KPSUidUikon, KUikGlobalNotesAllowed, startupOk ) );
 
         RDebug::Print(_L("call: %d, idle %d, notes %d"), ps, idle, startupOk);
@@ -544,23 +535,11 @@
             {
             return;
             }
-        
-        if ( idle == EPSAiForeground )
-            { 
-            // Notify active idle plugins that combined end key / power key has been pressed.
-            RProperty::Set(KPSUidAvkonDomain, KAknEndKeyEvent, 1); 
-            }
-        
         if ( ps != EPSCTsyCallStateNone )
             {
             // A phone call is active.
             aResult = EEmulateNowPhoneCallActive;
             }
-        else if ( idle != EPSAiForeground )
-            {
-            // We are not in idle view. No active phone calls.
-            aResult = EEmulateNow;
-            }
         else
             {
             // We are in idle view with no active phone calls. 
@@ -746,7 +725,7 @@
             {
             TInt scan = aRawEvent.ScanCode() & 0xFFFF;
             if ( !NonBlockedKeyCode( scan ) 
-                && iKeyPressed && iEnableKeyBlock && IsBlockedKeyCode(iSupportQuertyKey, scan ) )
+                && iKeyPressed && iEnableKeyBlock && IsBlockedKeyCode( scan ) )
                 {
                 blockEvent = ETrue;
                 }
@@ -772,7 +751,7 @@
             {
             TInt scan = aRawEvent.ScanCode() & 0xFFFF;
             if ( !NonBlockedKeyCode( scan ) && iKeyPressed != scan && 
-                 iEnableKeyBlock && IsBlockedKeyCode(iSupportQuertyKey, scan ) )
+                 iEnableKeyBlock && IsBlockedKeyCode( scan ) )
                 {
                 // If down event is not passed forward, then 
                 // repeat events are not passed either.
@@ -785,7 +764,7 @@
             {
             TInt scan = aRawEvent.ScanCode() & 0xFFFF;
             if ( !NonBlockedKeyCode( scan ) && iKeyPressed != scan && 
-                 iEnableKeyBlock && IsBlockedKeyCode(iSupportQuertyKey, scan ) )
+                 iEnableKeyBlock && IsBlockedKeyCode( scan ) )
                 {
                 // Do not need to block key-up events - there's not a problem 
                 // if there's an unexpected key-up events delivery to an app