Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f3fdca59d2
@@ -1448,6 +1448,7 @@ 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();
|
||||||
@@ -1503,7 +1504,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
|||||||
.setAlpha(1f);
|
.setAlpha(1f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
transaction.getTransaction().apply();
|
surfaceApplier.scheduleApply(transaction);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1591,8 +1592,7 @@ 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;
|
||||||
|
|||||||
Reference in New Issue
Block a user