diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-03 17:57:45 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-03 17:57:45 +0000 |
commit | cd4d6442a23bdacdf7cbb3e05bfcbdf091ec4a0c (patch) | |
tree | f59d105296d426cb26b6b9c84e2eca1f758dcace | |
parent | f1a972924e1f8075e8fb247ac84cc10da9cde1d4 (diff) | |
parent | 9ebc88a38133201a332ec946b0c81186178db4b4 (diff) | |
download | android_packages_apps_Trebuchet-cd4d6442a23bdacdf7cbb3e05bfcbdf091ec4a0c.tar.gz android_packages_apps_Trebuchet-cd4d6442a23bdacdf7cbb3e05bfcbdf091ec4a0c.tar.bz2 android_packages_apps_Trebuchet-cd4d6442a23bdacdf7cbb3e05bfcbdf091ec4a0c.zip |
[automerger] Fixing transaction regression. am: 9ebc88a381
Change-Id: I022eb058966e01788eb77606cf7e9fe3b0d6bbf5
3 files changed, 3 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index 94aaf15e2..34635bf38 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -543,6 +543,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag t.deferTransactionUntil(target.leash, surface, getNextFrameNumber(surface)); } } + t.setEarlyWakeup(); t.apply(); matrix.reset(); @@ -657,6 +658,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag t.setMatrix(app.leash, matrix); } } + t.setEarlyWakeup(); t.apply(); matrix.reset(); diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java index 5e21467d7..54937cec5 100644 --- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java +++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java @@ -167,6 +167,7 @@ public class ClipAnimationHelper { || app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) { transaction.setAlpha(app.leash, 1 - progress); } + transaction.setEarlyWakeup(); mTaskTransformCallback.accept(transaction, app); } diff --git a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java index 7fc3efb53..bbf223d1e 100644 --- a/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java +++ b/quickstep/src/com/android/quickstep/util/RemoteAnimationProvider.java @@ -60,6 +60,5 @@ public interface RemoteAnimationProvider { t.setLayer(target.leash, layer); t.show(target.leash); } - t.setEarlyWakeup(); } } |