summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-28 10:53:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-28 10:53:18 -0700
commit19910f1f1a250aa1e93d011e5404c837f1308546 (patch)
tree6197beb06e69e0515a5fa4da35e9f5ba593177bc /packages/SystemUI
parent23ece33972523e9f538b811e9dd0c74ca4749a11 (diff)
parente680c72211434777d50c1e20e6c06b5a3cdc3207 (diff)
downloadframeworks_base-19910f1f1a250aa1e93d011e5404c837f1308546.zip
frameworks_base-19910f1f1a250aa1e93d011e5404c837f1308546.tar.gz
frameworks_base-19910f1f1a250aa1e93d011e5404c837f1308546.tar.bz2
am e680c722: Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev
* commit 'e680c72211434777d50c1e20e6c06b5a3cdc3207': Fix issue #6706369: Sometimes the "App info" popup shows...
Diffstat (limited to 'packages/SystemUI')
-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;
}