Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d90299 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

* commit 'c831e319':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException
parents 81ac92df c831e319

core/java/com/android/internal/view/menu/ActionMenuView.java

+5 −1
Original line number Diff line number Diff line
@@ -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() {