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

* commit '89604931a85edd82c6b4a8c798fc1af610ba706e':
  Fix issue #6521829: Sometimes action bar disappears in gallery
This commit is contained in:
Dianne Hackborn
2012-05-22 18:26:11 -07:00
committed by Android Git Automerger

View File

@@ -708,7 +708,15 @@ public class ActionBarImpl extends ActionBar {
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) {