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

* commit '4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971':
  Update drag-to-open menu close behavior
This commit is contained in:
Alan Viverette
2014-10-28 22:48:33 +00:00
committed by Android Git Automerger

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