--- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknListQueryNotificationDialog.cpp Tue Aug 31 15:28:30 2010 +0300
@@ -19,16 +19,12 @@
#include "AknListQueryNotificationDialog.h"
#include "AknNotifyPlugin.hrh"
#include "avkon.hrh"
-#include "AknSystemListPopup.h"
CAknListQueryNotificationDialog::CAknListQueryNotificationDialog(
TInt* aIndex,
MAknListQueryNotificationCallback* aCallBack,
CAknListQueryNotificationDialog** aSelfPtr)
- : CAknListQueryDialog(aIndex)
- , iCallBack(aCallBack)
- , iSelfPtr(aSelfPtr)
- , iPointerUpEaten(EFalse)
+ : CAknListQueryDialog(aIndex), iCallBack(aCallBack), iSelfPtr(aSelfPtr)
{
}
@@ -59,8 +55,6 @@
return EKeyWasNotConsumed;
}
- iPointerUpEaten = EFalse;
-
TInt code = aKeyEvent.iCode;
switch (code)
@@ -117,23 +111,6 @@
TBool CAknListQueryNotificationDialog::OkToExitL(TInt aButtonId)
{
- // Fix the problem where the pointer up event is handled to close the power menu key,
- // when the popup shows on the top of power menu before releasing the tap.
- if (iPointerUpEaten && AknLayoutUtils::PenEnabled() && aButtonId == EAknSoftkeyOk)
- {
- iPointerUpEaten = 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;
if (aButtonId != EAknSoftkeyCancel)
{
@@ -147,18 +124,6 @@
return EFalse;
}
-void CAknListQueryNotificationDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
- {
- iPointerUpEaten = EFalse;
-
- if (aPointerEvent.iType == TPointerEvent::EButton1Up && (!IsFocused() || ((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable()))
- {
- iPointerUpEaten = ETrue;
- }
-
- CAknListQueryDialog::HandlePointerEventL(aPointerEvent);
- }
-
void CAknListQueryNotificationDialog::CEikDialog_Reserved_1()
{
}