am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb

* commit 'c831e3192ccd9b2cf69ec7c973005e578631da3b':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
This commit is contained in:
Adam Powell
2011-01-24 14:37:46 -08:00
committed by Android Git Automerger

View File

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