am c99d3c1f: Stop jank from window animations overlapping activity animations

* commit 'c99d3c1fd618c1f64103b4f39dd95330309be5a3': Stop jank from window animations overlapping activity animations
2013-04-02 08:24:48 -07:00
parent 6c48c4317e c99d3c1fd6
commit 7aab113423
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1425,6 +1425,8 @@ public final class ViewRootImpl implements ViewParent,

                final int surfaceGenerationId = mSurface.getGenerationId();
                relayoutResult = relayoutWindow(params, viewVisibility, insetsPending);
+                mWindowsAnimating |=
+                        (relayoutResult & WindowManagerGlobal.RELAYOUT_RES_ANIMATING) != 0;

                if (DEBUG_LAYOUT) Log.v(TAG, "relayout: frame=" + frame.toShortString()
                        + " overscan=" + mPendingOverscanInsets.toShortString()