Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-08-18 18:10:03 -07:00
committed by Android (Google) Code Review
parent 937ffc174c 993a63abb9
commit 2f5485587b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/ActionBarImpl.java
View File

@@ -111,6 +111,9 @@ public class ActionBarImpl extends ActionBar {
mContentView.setTranslationY(0); mContentView.setTranslationY(0);
mContainerView.setTranslationY(0); mContainerView.setTranslationY(0);
} }
if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {
mSplitView.setVisibility(View.GONE);
}
mContainerView.setVisibility(View.GONE); mContainerView.setVisibility(View.GONE);
mContainerView.setTransitioning(false); mContainerView.setTransitioning(false);
mCurrentShowAnim = null; mCurrentShowAnim = null;
@@ -540,6 +543,7 @@ public class ActionBarImpl extends ActionBar {
} }
if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) { if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {
mSplitView.setAlpha(0); mSplitView.setAlpha(0);
mSplitView.setVisibility(View.VISIBLE);
b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 1)); b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 1));
} }
anim.addListener(mShowListener); anim.addListener(mShowListener);