diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-28 22:45:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-28 22:45:33 +0000 |
| commit | 4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971 (patch) | |
| tree | 8f22aa8911702a25b6807169c2add32da7b7b7b0 | |
| parent | e398db4a45d4128af696a664e7c4cc48f7187a7f (diff) | |
| parent | 99b4e8507309f8e08ecc0baf994ccdc8020d6359 (diff) | |
| download | frameworks_base-4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971.zip frameworks_base-4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971.tar.gz frameworks_base-4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971.tar.bz2 | |
Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev
| -rw-r--r-- | core/java/android/widget/ListPopupWindow.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java index 9f540c0..a31d37e 100644 --- a/core/java/android/widget/ListPopupWindow.java +++ b/core/java/android/widget/ListPopupWindow.java @@ -1252,14 +1252,7 @@ public class ListPopupWindow { final boolean wasForwarding = mForwarding; final boolean forwarding; if (wasForwarding) { - if (mWasLongPress) { - // If we started forwarding as a result of a long-press, - // just silently stop forwarding events so that the window - // stays open. - forwarding = onTouchForwarded(event); - } else { - forwarding = onTouchForwarded(event) || !onForwardingStopped(); - } + forwarding = onTouchForwarded(event) || !onForwardingStopped(); } else { forwarding = onTouchObserved(event) && onForwardingStarted(); |