Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev (f3fdca59) · Commits · e / os / BlissLauncher3

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1448,6 +1448,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		*/
		private Animator getFallbackClosingWindowAnimators(RemoteAnimationTarget[] appTargets) {
		final int rotationChange = getRotationChange(appTargets);
		SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer);
		Matrix matrix = new Matrix();
		Point tmpPos = new Point();
		Rect tmpRect = new Rect();
		@@ -1503,7 +1504,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		.setAlpha(1f);
		}
		}
		transaction.getTransaction().apply();
		surfaceApplier.scheduleApply(transaction);
		}
		});

		@@ -1591,8 +1592,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		boolean playFallBackAnimation = (launcherView == null
		&& launcherIsForceInvisibleOrOpening)
		\|\| mLauncher.getWorkspace().isOverlayShown()
		\|\| hasMultipleTargetsWithMode(appTargets, MODE_CLOSING)
		\|\| mLauncher.isDestroyed();
		\|\| hasMultipleTargetsWithMode(appTargets, MODE_CLOSING);

		boolean playWorkspaceReveal = true;
		boolean skipAllAppsScale = false;