Merge "Bug 3332414 - UI glitch in CAB options" into honeycomb

2011-01-08 15:26:53 -08:00
parent 0d69fae5e6 dd10b66601
commit d1af77207c
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@ -159,7 +159,7 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
    }

    public void initForMode(final ActionMode mode) {
-        if (mAnimationMode == ANIMATE_OUT) {
+        if (mAnimationMode != ANIMATE_IDLE || mAnimateInOnLayout) {
            killMode();
        }