Don't prevent windows from drawing when they are just moving

Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb

2 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/view/IWindow.aidl b/core/java/android/view/IWindow.aidl
index 9cf3759..acad496 100644
--- a/core/java/android/view/IWindow.aidl
+++ b/core/java/android/view/IWindow.aidl
@@ -83,7 +83,8 @@ oneway interface IWindow {
      * The window is beginning to animate. The application should stop drawing frames until the
      * window is not animating anymore, indicated by being called {@link #windowEndAnimating}.
      *
-     * @param remainingFrameCount how many frames the app might still draw before stopping drawing
+     * @param remainingFrameCount how many frames the app might still draw before stopping drawing;
+     *                            pass -1 to let it continue drawing
      */
     void onAnimationStarted(int remainingFrameCount);
 
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 6d0d788..09d7a21 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -5327,7 +5327,7 @@ public final class ViewRootImpl implements ViewParent,
     }
 
     public void handleDispatchWindowAnimationStarted(int remainingFrameCount) {
-        if (!mDrawDuringWindowsAnimating) {
+        if (!mDrawDuringWindowsAnimating && remainingFrameCount != -1) {
             mRemainingFrameCount = remainingFrameCount;
             mWindowsAnimating = true;
         }