summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-28 10:56:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-28 10:56:09 -0700
commit1101f37c4705c21e3a264732a23dbd75a4ae9709 (patch)
tree7e06ac05e45bf4e31b3c8e9e2afffecc577bd8f2 /packages/SystemUI/src
parentf3d91ee5eaeb57a87a1d662d8f08f2b98d0c49e1 (diff)
parent19910f1f1a250aa1e93d011e5404c837f1308546 (diff)
downloadframeworks_base-1101f37c4705c21e3a264732a23dbd75a4ae9709.zip
frameworks_base-1101f37c4705c21e3a264732a23dbd75a4ae9709.tar.gz
frameworks_base-1101f37c4705c21e3a264732a23dbd75a4ae9709.tar.bz2
am 19910f1f: am e680c722: Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev
* commit '19910f1f1a250aa1e93d011e5404c837f1308546': Fix issue #6706369: Sometimes the "App info" popup shows...
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/SwipeHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index 2d65dd6..ceb8654 100644
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -322,6 +322,9 @@ public class SwipeHelper implements Gefingerpoken {
}
if (!mDragging) {
+ // We are not doing anything, make sure the long press callback
+ // is not still ticking like a bomb waiting to go off.
+ removeLongPressCallback();
return false;
}