Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb

This commit is contained in:
Adam Powell
2011-01-31 16:11:51 -08:00
committed by Android (Google) Code Review

View File

@@ -480,12 +480,12 @@ public class ActionBarImpl extends ActionBar {
@Override @Override
public void show() { public void show() {
if (mContainerView.getVisibility() == View.VISIBLE) {
return;
}
if (mCurrentAnim != null) { if (mCurrentAnim != null) {
mCurrentAnim.end(); mCurrentAnim.end();
} }
if (mContainerView.getVisibility() == View.VISIBLE) {
return;
}
mContainerView.setVisibility(View.VISIBLE); mContainerView.setVisibility(View.VISIBLE);
mContainerView.setAlpha(0); mContainerView.setAlpha(0);
AnimatorSet anim = new AnimatorSet(); AnimatorSet anim = new AnimatorSet();