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

Commit 53b5d17d authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 

* commit 'a5c371bf':
  Bug 5275928 - Invasion of the monkeys
parents 64ef6b47 a5c371bf

core/java/com/android/internal/widget/ActionBarContextView.java

+9 −0
Original line number Diff line number Diff line
@@ -93,6 +93,15 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi 
        a.recycle();

    }



    @Override

    public void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        if (mActionMenuPresenter != null) {

            mActionMenuPresenter.hideOverflowMenu();

            mActionMenuPresenter.hideSubMenus();

        }

    }



    @Override

    public void setSplitActionBar(boolean split) {

        if (mSplitActionBar != split) {

core/java/com/android/internal/widget/ActionBarView.java

+4 −0
Original line number Diff line number Diff line
@@ -285,6 +285,10 @@ public class ActionBarView extends AbsActionBarView { 
    public void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        removeCallbacks(mTabSelector);

        if (mActionMenuPresenter != null) {

            mActionMenuPresenter.hideOverflowMenu();

            mActionMenuPresenter.hideSubMenus();

        }

    }



    @Override