Merge "Do not change layering for non live tile tasks rendering" into tm-qpr-dev am: 1649163334

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

Change-Id: Ie3c2cf900931e7d70e5260a08b488aacf7a89a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2022-09-02 20:08:41 +00:00
committed by Automerger Merge Worker
@@ -102,7 +102,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
private boolean mLayoutValid = false;
private int mOrientationStateId;
private SplitBounds mSplitBounds;
private boolean mDrawsBelowRecents;
private Boolean mDrawsBelowRecents = null;
private boolean mIsGridTask;
private int mTaskRectTranslationX;
private int mTaskRectTranslationY;
@@ -391,7 +391,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
.withWindowCrop(mTmpCropRect)
.withCornerRadius(getCurrentCornerRadius());
if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
// If mDrawsBelowRecents is unset, no reordering will be enforced.
if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mDrawsBelowRecents != null) {
// In legacy transitions, the animation leashes remain in same hierarchy in the
// TaskDisplayArea, so we don't want to bump the layer too high otherwise it will
// conflict with layers that WM core positions (ie. the input consumers). For shell