Merge "Fix null-pointers in SurfaceTransactionApplier constructor." into udc-dev am: a40de23f04 am: 1e898351ea

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22973611

Change-Id: Id8505d7502bc9b90557f4b1a39b735120fb215dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Schneider Victor-tulias
2023-05-08 19:45:53 +00:00
committed by Automerger Merge Worker
@@ -1448,7 +1448,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
*/ */
private Animator getFallbackClosingWindowAnimators(RemoteAnimationTarget[] appTargets) { private Animator getFallbackClosingWindowAnimators(RemoteAnimationTarget[] appTargets) {
final int rotationChange = getRotationChange(appTargets); final int rotationChange = getRotationChange(appTargets);
SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer);
Matrix matrix = new Matrix(); Matrix matrix = new Matrix();
Point tmpPos = new Point(); Point tmpPos = new Point();
Rect tmpRect = new Rect(); Rect tmpRect = new Rect();
@@ -1504,7 +1503,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
.setAlpha(1f); .setAlpha(1f);
} }
} }
surfaceApplier.scheduleApply(transaction); transaction.getTransaction().apply();
} }
}); });
@@ -1592,7 +1591,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
boolean playFallBackAnimation = (launcherView == null boolean playFallBackAnimation = (launcherView == null
&& launcherIsForceInvisibleOrOpening) && launcherIsForceInvisibleOrOpening)
|| mLauncher.getWorkspace().isOverlayShown() || mLauncher.getWorkspace().isOverlayShown()
|| hasMultipleTargetsWithMode(appTargets, MODE_CLOSING); || hasMultipleTargetsWithMode(appTargets, MODE_CLOSING)
|| mLauncher.isDestroyed();
boolean playWorkspaceReveal = true; boolean playWorkspaceReveal = true;
boolean skipAllAppsScale = false; boolean skipAllAppsScale = false;