Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 70aafea9: Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev

Browse Source 
* commit '70aafea91eedc70039818912007f43208e656240':
  Action bar transitions - handle expanding/collapsing action views
This commit is contained in:
Adam Powell
2013-09-17 13:49:33 -07:00
committed by Android Git Automerger
parent 70201a53f4 70aafea91e
commit f35621da26
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -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) {