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

Commit 6b0e97c7 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 5093394 - Double SearchView!! What does it mean!? 

It means we should collapse any expanded action items when we
clear out all items from a MenuBuilder.

Change-Id: I59cacd862a89b3a50c61b02c64b1ea71907af83f
parent 62c7b375

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

+15 −1
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ public class MenuBuilder implements Menu { 
    private CopyOnWriteArrayList<WeakReference<MenuPresenter>> mPresenters =

            new CopyOnWriteArrayList<WeakReference<MenuPresenter>>();



    /**

     * Currently expanded menu item; must be collapsed when we clear.

     */

    private MenuItemImpl mExpandedItem;

    

    /**

     * Called by menu to notify of close and selection changes.

     */
@@ -512,6 +517,9 @@ public class MenuBuilder implements Menu { 
    }

    

    public void clear() {

        if (mExpandedItem != null) {

            collapseItemActionView(mExpandedItem);

        }

        mItems.clear();

        

        onItemsChanged(true);
@@ -1223,11 +1231,14 @@ public class MenuBuilder implements Menu { 
        }

        startDispatchingItemsChanged();



        if (expanded) {

            mExpandedItem = item;

        }

        return expanded;

    }



    public boolean collapseItemActionView(MenuItemImpl item) {

        if (mPresenters.isEmpty()) return false;

        if (mPresenters.isEmpty() || mExpandedItem != item) return false;



        boolean collapsed = false;
@@ -1242,6 +1253,9 @@ public class MenuBuilder implements Menu { 
        }

        startDispatchingItemsChanged();



        if (collapsed) {

            mExpandedItem = null;

        }

        return collapsed;

    }

}

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

+2 −3
Original line number Diff line number Diff line
@@ -1265,9 +1265,8 @@ public class ActionBarView extends AbsActionBarView { 
        @Override

        public void initForMenu(Context context, MenuBuilder menu) {

            // Clear the expanded action view when menus change.

            mExpandedActionView = null;

            if (mCurrentExpandedItem != null) {

                mCurrentExpandedItem.collapseActionView();

            if (mMenu != null && mCurrentExpandedItem != null) {

                mMenu.collapseItemActionView(mCurrentExpandedItem);

            }

            mMenu = menu;

        }