equal
deleted
inserted
replaced
17 |
17 |
18 #include <uikon.hrh> // EKeyOk |
18 #include <uikon.hrh> // EKeyOk |
19 #include "AknListQueryNotificationDialog.h" |
19 #include "AknListQueryNotificationDialog.h" |
20 #include "AknNotifyPlugin.hrh" |
20 #include "AknNotifyPlugin.hrh" |
21 #include "avkon.hrh" |
21 #include "avkon.hrh" |
|
22 #include "AknSystemListPopup.h" |
22 |
23 |
23 CAknListQueryNotificationDialog::CAknListQueryNotificationDialog( |
24 CAknListQueryNotificationDialog::CAknListQueryNotificationDialog( |
24 TInt* aIndex, |
25 TInt* aIndex, |
25 MAknListQueryNotificationCallback* aCallBack, |
26 MAknListQueryNotificationCallback* aCallBack, |
26 CAknListQueryNotificationDialog** aSelfPtr) |
27 CAknListQueryNotificationDialog** aSelfPtr) |
119 // Fix the problem where the pointer up event is handled to close the power menu key, |
120 // Fix the problem where the pointer up event is handled to close the power menu key, |
120 // when the popup shows on the top of power menu before releasing the tap. |
121 // when the popup shows on the top of power menu before releasing the tap. |
121 if (iPointerUpEaten && AknLayoutUtils::PenEnabled() && aButtonId == EAknSoftkeyOk) |
122 if (iPointerUpEaten && AknLayoutUtils::PenEnabled() && aButtonId == EAknSoftkeyOk) |
122 { |
123 { |
123 iPointerUpEaten = EFalse; |
124 iPointerUpEaten = EFalse; |
124 return EFalse; |
125 //Fix the problem where the pointer up event is handled to active the power menu item |
|
126 //when lock screen happans before releasing the tap on power menu item |
|
127 if(((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable()) |
|
128 { |
|
129 aButtonId = EAknSoftkeyCancel; |
|
130 } |
|
131 else |
|
132 { |
|
133 return EFalse; |
|
134 } |
125 } |
135 } |
126 |
136 |
127 TInt ret = -1; |
137 TInt ret = -1; |
128 if (aButtonId != EAknSoftkeyCancel) |
138 if (aButtonId != EAknSoftkeyCancel) |
129 { |
139 { |
138 } |
148 } |
139 |
149 |
140 void CAknListQueryNotificationDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent) |
150 void CAknListQueryNotificationDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent) |
141 { |
151 { |
142 iPointerUpEaten = EFalse; |
152 iPointerUpEaten = EFalse; |
143 if (aPointerEvent.iType == TPointerEvent::EButton1Up && !IsFocused()) |
153 |
|
154 if (aPointerEvent.iType == TPointerEvent::EButton1Up && (!IsFocused() || ((CAknGlobalListQuerySubject*)iCallBack)->IsKeyLockEnable())) |
144 { |
155 { |
145 iPointerUpEaten = ETrue; |
156 iPointerUpEaten = ETrue; |
146 } |
157 } |
147 |
158 |
148 CAknListQueryDialog::HandlePointerEventL(aPointerEvent); |
159 CAknListQueryDialog::HandlePointerEventL(aPointerEvent); |