commit 105925376f8d0f6b318c9938c7b83ef7fef094da
author The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
tree 3b19ee2bd8704cb9c6a0da7e42dec6759183de6d
parent ba87e3e6c985e7175152993b5efcc7dd2f0e1c93

auto import from //branches/cupcake_rel/...@140373

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index c3e00c4..04447ca 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3409,6 +3409,9 @@
             if (imm != null && (mPrivateFlags & FOCUSED) != 0) {
                 imm.focusOut(this);
             }
+            if (mPendingCheckForLongPress != null) {
+                removeCallbacks(mPendingCheckForLongPress);
+            }
         } else if (imm != null && (mPrivateFlags & FOCUSED) != 0) {
             imm.focusIn(this);
         }
@@ -7656,7 +7659,7 @@
         private int mOriginalWindowAttachCount;
 
         public void run() {
-            if (isPressed() && (mParent != null) && hasWindowFocus()
+            if (isPressed() && (mParent != null)
                     && mOriginalWindowAttachCount == mWindowAttachCount) {
                 if (performLongClick()) {
                     mHasPerformedLongPress = true;