commit f35621da26346e434d8144e5280707bddbdd5bff
author Adam Powell <adamp@google.com> Tue Sep 17 13:49:33 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 17 13:49:33 2013 -0700
tree 9a1974064e3cff21c318ebf6f086641f5a055a42
parent 70201a53f4b38a655ce70b1530b0c40d76e8e37f
parent 70aafea91eedc70039818912007f43208e656240

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

* commit '70aafea91eedc70039818912007f43208e656240':
  Action bar transitions - handle expanding/collapsing action views

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

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 969c94ba..7efcb6e 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -1639,6 +1639,8 @@
 
         @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 @@
 
         @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) {