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

Commit 70aafea9 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev

parents 0cfebec5 c46d3339

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

+4 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,8 @@ public class ActionBarView extends AbsActionBarView { 


        @Override

        public boolean expandItemActionView(MenuBuilder menu, MenuItemImpl item) {

            TransitionManager.beginDelayedTransition(ActionBarView.this, sTransition);



            mExpandedActionView = item.getActionView();

            mExpandedHomeLayout.setIcon(mIcon.getConstantState().newDrawable(getResources()));

            mCurrentExpandedItem = item;
@@ -1666,6 +1668,8 @@ public class ActionBarView extends AbsActionBarView { 


        @Override

        public boolean collapseItemActionView(MenuBuilder menu, MenuItemImpl item) {

            TransitionManager.beginDelayedTransition(ActionBarView.this, sTransition);



            // Do this before detaching the actionview from the hierarchy, in case

            // it needs to dismiss the soft keyboard, etc.

            if (mExpandedActionView instanceof CollapsibleActionView) {