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

* commit 'd1af77207c5c17b55aea78174633539b73abcf89':
  Bug 3332414 - UI glitch in CAB options
This commit is contained in:
Adam Powell
2011-01-08 15:28:41 -08:00
committed by Android Git Automerger

View File

@ -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();
}