diff -r a1caeb42b3a3 -r fcdfafb36fe7 uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp --- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp Thu Jul 15 18:56:19 2010 +0300 +++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp Thu Aug 19 10:11:06 2010 +0300 @@ -19,6 +19,7 @@ #include "AknListQueryNotificationDialog.h" #include "AknNotifyPlugin.hrh" #include "avkon.hrh" +#include "AknSystemListPopup.h" CAknListQueryNotificationDialog::CAknListQueryNotificationDialog( TInt* aIndex, @@ -121,7 +122,16 @@ if (iPointerUpEaten && AknLayoutUtils::PenEnabled() && aButtonId == EAknSoftkeyOk) { iPointerUpEaten = EFalse; - return EFalse; + //Fix the problem where the pointer up event is handled to active the power menu item + //when lock screen happans before releasing the tap on power menu item + if(((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable()) + { + aButtonId = EAknSoftkeyCancel; + } + else + { + return EFalse; + } } TInt ret = -1; @@ -140,7 +150,8 @@ void CAknListQueryNotificationDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent) { iPointerUpEaten = EFalse; - if (aPointerEvent.iType == TPointerEvent::EButton1Up && !IsFocused()) + + if (aPointerEvent.iType == TPointerEvent::EButton1Up && (!IsFocused() || ((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable())) { iPointerUpEaten = ETrue; }