commit 06a7d2e66e370da6fdfbeb5bd168c08552196cc5
author Adam Powell <adamp@google.com> Mon Jan 31 16:19:04 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 31 16:19:04 2011 -0800
tree 99d750ed9b743c52d56bd4b40167bce95ada84a6
parent 7ad1a8e6c23aa4db06b9b39402c6d9b7b21de7cd
parent 3c7a617455410c3c164f9aeac522baa94e056651

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

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

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index b1b5d71..471a5a9 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -480,12 +480,12 @@
 
     @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();