Merge "Fix subsequent drag-to-open SubMenus" into lmp-mr1-ub-dev
diff --git a/v7/appcompat/src/android/support/v7/internal/view/menu/ActionMenuItemView.java b/v7/appcompat/src/android/support/v7/internal/view/menu/ActionMenuItemView.java
index a6c6dde..b7f5ff7 100644
--- a/v7/appcompat/src/android/support/v7/internal/view/menu/ActionMenuItemView.java
+++ b/v7/appcompat/src/android/support/v7/internal/view/menu/ActionMenuItemView.java
@@ -314,15 +314,12 @@
return false;
}
- @Override
- protected boolean onForwardingStopped() {
- final ListPopupWindow popup = getPopup();
- if (popup != null) {
- popup.dismiss();
- return true;
- }
- return false;
- }
+ // Do not backport the framework impl here.
+ // The framework's ListPopupWindow uses an animation before performing the item click
+ // after selecting an item. As AppCompat doesn't use an animation, the popup is
+ // dismissed and thus null'ed out before onForwardingStopped() has been called.
+ // This messes up ActionMenuItemView's onForwardingStopped() impl since it will now
+ // return false and make ListPopupWindow think it's still forwarding.
}
public static abstract class PopupCallback {