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

2011-01-31 16:11:51 -08:00
parent 11f9647e03 d76cee2b09
commit 5f639d5a51
1 changed files with 3 additions and 3 deletions
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -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();