am 09da6ec6: am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev

automerge: 2a4c761

* commit '2a4c7618efc187ab2c2e4a337b4b6e6aeba687af':
  Update drag-to-open menu close behavior
This commit is contained in:
Alan Viverette
2014-10-30 14:51:10 +00:00
committed by android-build-merger

View File

@@ -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();