commit cd4d6442a23bdacdf7cbb3e05bfcbdf091ec4a0c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 17:57:45 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 17:57:45 2018 +0000
tree f59d105296d426cb26b6b9c84e2eca1f758dcace
parent f1a972924e1f8075e8fb247ac84cc10da9cde1d4
parent 9ebc88a38133201a332ec946b0c81186178db4b4

[automerger] Fixing transaction regression. am: 9ebc88a381

Change-Id: I022eb058966e01788eb77606cf7e9fe3b0d6bbf5

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 94aaf15..34635bf 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -543,6 +543,7 @@
                         t.deferTransactionUntil(target.leash, surface, getNextFrameNumber(surface));
                     }
                 }
+                t.setEarlyWakeup();
                 t.apply();
 
                 matrix.reset();
@@ -657,6 +658,7 @@
                         t.setMatrix(app.leash, matrix);
                     }
                 }
+                t.setEarlyWakeup();
                 t.apply();
 
                 matrix.reset();

quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
index 5e21467..54937ce 100644
--- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -167,6 +167,7 @@
                     || app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {
                 transaction.setAlpha(app.leash, 1 - progress);
             }
+            transaction.setEarlyWakeup();
 
             mTaskTransformCallback.accept(transaction, app);
         }

quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java

diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
index 7fc3efb..bbf223d 100644
--- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
+++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java
@@ -60,6 +60,5 @@
             t.setLayer(target.leash, layer);
             t.show(target.leash);
         }
-        t.setEarlyWakeup();
     }
 }