diff -r 558113899881 -r b3425bf29f82 uifw/AvKon/src/AknDef.cpp
--- a/uifw/AvKon/src/AknDef.cpp	Mon May 03 12:45:33 2010 +0300
+++ b/uifw/AvKon/src/AknDef.cpp	Wed Jun 23 05:40:10 2010 +0800
@@ -21,13 +21,8 @@
 #include "AknDef.h"
 #include <vwsdef.h> // TVwsViewId
 
-#ifdef RD_IDLE_SEPARATION
-#include <e32property.h>
-#include <activeidle2domainpskeys.h>
-#endif
-
-const TInt KPhoneUid( 0x100058B3 );
-const TInt KActiveIdle2Uid( 0x102750F0 );
+const TUid KPhoneUid = { 0x100058B3 };
+const TUid KPhoneViewUid = { 0x10282D81 };
 
 // -----------------------------------------------------------------------------
 // AknDef::GetPhoneIdleViewId()
@@ -38,56 +33,9 @@
 //
 EXPORT_C TInt AknDef::GetPhoneIdleViewId(TVwsViewId& aViewId)
     {
-    TInt uidValue = NULL;
-    TInt retVal = KErrNone;
-
-#ifdef RD_IDLE_SEPARATION
-    retVal = RProperty::Get( KPSUidAiInformation, KActiveIdleUid, uidValue );
-    if(retVal == KErrNotFound)
-        {
-        retVal = KErrNone;
-        uidValue = KPhoneUid;
-        }
-#else
-    uidValue = KPhoneUid;  // Was defined as KAknPhoneIdleViewId in akndef.h.
-#endif // RD_IDLE_SEPARATION
-
-    if(retVal == KErrNone)
-        {
-        aViewId = TVwsViewId(TUid::Uid(uidValue), TUid::Uid(uidValue));
-        }
-        
-#ifdef RD_BOOT_CUSTOMIZABLE_AI
-
-    // ActiveIdle2 is view-based, so this is a temporary fix
-    // in order to be able to activate idle from app shell with menu-key,
-    // until a proper way for view uid acquisition is made.
-    
-    TInt pluginRangeStart;
-    TInt pluginRangeEnd;
-    
-    RProperty::Get( KPSUidAiInformation, KAIActivePluginRangeStart, pluginRangeStart );
-    RProperty::Get( KPSUidAiInformation, KAIActivePluginRangeEnd, pluginRangeEnd );
-    
-    if ( uidValue >= pluginRangeStart && uidValue <= pluginRangeEnd && pluginRangeEnd )
-        {
-        uidValue = KActiveIdle2Uid;
-        aViewId.iAppUid = TUid::Uid( uidValue );
-        }
-    else if ( uidValue >= pluginRangeStart ) // end UID may not be defined
-        {
-        uidValue = KActiveIdle2Uid;
-        aViewId.iAppUid = TUid::Uid( uidValue );
-        }
-    
-    if ( uidValue == KActiveIdle2Uid )
-        {
-        aViewId.iViewUid = TUid::Uid(1);
-        }
-        
-#endif // RD_BOOT_CUSTOMIZABLE_AI
-
-    return retVal; 
+    aViewId.iAppUid = KPhoneUid;
+    aViewId.iViewUid = KPhoneViewUid;
+    return KErrNone;
     }
 
 //  End of File