Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06a7d2e6 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 3c7a6174: am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when... 

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

* commit '3c7a6174':
  Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
parents 7ad1a8e6 3c7a6174

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

+3 −3
Original line number Diff line number Diff line
@@ -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();