Merge "Add initial split from GroupedTaskView animation" into tm-qpr-dev am: 4b0a5ed8fa am: 4eb50abbc3

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

Change-Id: I1794100f231254037be49f4204fc142270543b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2023-03-09 22:03:03 +00:00
committed by Automerger Merge Worker
8 changed files with 427 additions and 49 deletions

View File

@@ -83,6 +83,7 @@ public class SplitSelectStateController {
private final Context mContext;
private final Handler mHandler;
private final RecentsModel mRecentTasksModel;
private final SplitAnimationController mSplitAnimationController;
private StatsLogManager mStatsLogManager;
private final SystemUiProxy mSystemUiProxy;
private final StateManager mStateManager;
@@ -97,6 +98,11 @@ public class SplitSelectStateController {
private boolean mRecentsAnimationRunning;
/** If {@code true}, animates the existing task view split placeholder view */
private boolean mAnimateCurrentTaskDismissal;
/**
* Acts as a subset of {@link #mAnimateCurrentTaskDismissal}, we can't be dismissing from a
* split pair task view without wanting to animate current task dismissal overall
*/
private boolean mDismissingFromSplitPair;
@Nullable
private UserHandle mUser;
/** If not null, this is the TaskView we want to launch from */
@@ -117,6 +123,7 @@ public class SplitSelectStateController {
mStateManager = stateManager;
mDepthController = depthController;
mRecentTasksModel = recentsModel;
mSplitAnimationController = new SplitAnimationController(this);
}
/**
@@ -401,6 +408,18 @@ public class SplitSelectStateController {
mAnimateCurrentTaskDismissal = animateCurrentTaskDismissal;
}
public boolean isDismissingFromSplitPair() {
return mDismissingFromSplitPair;
}
public void setDismissingFromSplitPair(boolean dismissingFromSplitPair) {
mDismissingFromSplitPair = dismissingFromSplitPair;
}
public SplitAnimationController getSplitAnimationController() {
return mSplitAnimationController;
}
/**
* Requires Shell Transitions
*/
@@ -508,6 +527,7 @@ public class SplitSelectStateController {
mItemInfo = null;
mSplitEvent = null;
mAnimateCurrentTaskDismissal = false;
mDismissingFromSplitPair = false;
}
/**
@@ -534,6 +554,10 @@ public class SplitSelectStateController {
return mInitialTaskId;
}
public int getSecondTaskId() {
return mSecondTaskId;
}
private boolean isSecondTaskIntentSet() {
return (mSecondTaskId != INVALID_TASK_ID || mSecondTaskIntent != null);
}