From 993a63abb9ffa95de16f2788fccb440805d1ecb7 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 18 Aug 2011 16:35:53 -0700
Subject: Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar
 if called before onResume()

Change-Id: I2c21f2bfb3314426d9dfd3b874f593f375c7838a
---
 core/java/com/android/internal/app/ActionBarImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index 31360e104390..cfecca5188e3 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -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);
-- 
cgit v1.2.3-59-g8ed1b