Merge "Fix issue #6521829: Sometimes action bar disappears in gallery" into jb-dev

Author: Dianne Hackborn

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

@@ -708,7 +708,15 @@ public void doShow(boolean fromSystem) {
             anim.start();
         } else {
             mTopVisibilityView.setAlpha(1);
-            mContainerView.setTranslationY(0);
+            mTopVisibilityView.setTranslationY(0);
+            if (mContentView != null) {
+                mContentView.setTranslationY(0);
+            }
+            if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {
+                mSplitView.setAlpha(1);
+                mSplitView.setTranslationY(0);
+                mSplitView.setVisibility(View.VISIBLE);
+            }
             mShowListener.onAnimationEnd(null);
         }
         if (mOverlayLayout != null) {