am 001e5242: Merge change Icccbd889 into eclair
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-plus-aosp
* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index d86b674..e4cc609 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1328,7 +1328,7 @@
getKeyDispatcherState().startTracking(event, this);
return true;
} else if (event.getAction() == KeyEvent.ACTION_UP
- && event.isTracking() && !event.isCanceled()) {
+ && getKeyDispatcherState().isTracking(event) && !event.isCanceled()) {
dismiss();
return true;
}