Merge "Fix bug 3382994 - android.view.WindowManager$BadTokenException" into honeycomb

This commit is contained in:
Adam Powell
2011-01-24 14:35:11 -08:00
committed by Android (Google) Code Review

View File

@@ -53,7 +53,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
private Drawable mDivider;
private Runnable mShowOverflow = new Runnable() {
private final Runnable mShowOverflow = new Runnable() {
public void run() {
showOverflowMenu();
}
@@ -128,6 +128,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
if (mOverflowPopup != null && mOverflowPopup.isShowing()) {
mOverflowPopup.dismiss();
}
removeCallbacks(mShowOverflow);
if (mPostedOpenRunnable != null) {
removeCallbacks(mPostedOpenRunnable);
}
}
private int getMaxActionButtons() {