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

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

Merge "Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if... 

Merge "Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()"
parents 937ffc17 993a63ab

core/java/com/android/internal/app/ActionBarImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ public class ActionBarImpl extends ActionBar { 
                mContentView.setTranslationY(0);

                mContainerView.setTranslationY(0);

            }

            if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {

                mSplitView.setVisibility(View.GONE);

            }

            mContainerView.setVisibility(View.GONE);

            mContainerView.setTransitioning(false);

            mCurrentShowAnim = null;
@@ -540,6 +543,7 @@ public class ActionBarImpl extends ActionBar { 
            }

            if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {

                mSplitView.setAlpha(0);

                mSplitView.setVisibility(View.VISIBLE);

                b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 1));

            }

            anim.addListener(mShowListener);