am 3c7a6174: am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb

* commit '3c7a617455410c3c164f9aeac522baa94e056651':
  Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
This commit is contained in:
Adam Powell
2011-01-31 16:19:04 -08:00
committed by Android Git Automerger

View File

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