diff options
| author | Adam Powell <adamp@google.com> | 2013-09-17 10:08:41 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2013-09-17 10:08:41 -0700 |
| commit | c46d33393fcc3a497d036973cb887cdaf986eef2 (patch) | |
| tree | 40d31e7ebad8233bb4bc155f1b564de94ea67a5a /core/java/com | |
| parent | 60fcce6cb1bbe720634ae5e3d94aeae5e4c1e53e (diff) | |
| download | frameworks_base-c46d33393fcc3a497d036973cb887cdaf986eef2.zip frameworks_base-c46d33393fcc3a497d036973cb887cdaf986eef2.tar.gz frameworks_base-c46d33393fcc3a497d036973cb887cdaf986eef2.tar.bz2 | |
Action bar transitions - handle expanding/collapsing action views
Make sure we beginDelayedTransition when we expand and collapse action
views, specifically before any callbacks go out that might alter the
hierarchy.
Change-Id: Iffc286cccd9be83ad03aeede605870ac12cc6bab
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 969c94b..7efcb6e 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -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) { |