mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 09:26:51 +00:00
Merge "Launch initial split from taskbar in overview app menu" into tm-qpr-dev am: d710773889 am: fd185e6402
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20956773 Change-Id: I78f6b8fee567230a59d533ca17bebc3c578e9040 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -91,6 +91,8 @@ public class SplitSelectStateController {
|
||||
private Intent mSecondTaskIntent;
|
||||
private int mSecondTaskId = INVALID_TASK_ID;
|
||||
private boolean mRecentsAnimationRunning;
|
||||
/** If {@code true}, animates the existing task view split placeholder view */
|
||||
private boolean mAnimateCurrentTaskDismissal;
|
||||
@Nullable
|
||||
private UserHandle mUser;
|
||||
/** If not null, this is the TaskView we want to launch from */
|
||||
@@ -112,22 +114,15 @@ public class SplitSelectStateController {
|
||||
}
|
||||
|
||||
/**
|
||||
* To be called after first task selected in Overview.
|
||||
* @param alreadyRunningTask if set to {@link android.app.ActivityTaskManager#INVALID_TASK_ID}
|
||||
* then @param intent will be used to launch the initial task
|
||||
* @param intent will be ignored if @param alreadyRunningTask is set
|
||||
*/
|
||||
public void setInitialTaskSelect(Task task, @StagePosition int stagePosition,
|
||||
StatsLogManager.EventEnum splitEvent, ItemInfo itemInfo) {
|
||||
mInitialTaskId = task.key.id;
|
||||
setInitialData(stagePosition, splitEvent, itemInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* To be called after first task selected from home or all apps.
|
||||
*/
|
||||
public void setInitialTaskSelect(Intent intent, @StagePosition int stagePosition,
|
||||
public void setInitialTaskSelect(@Nullable Intent intent, @StagePosition int stagePosition,
|
||||
@NonNull ItemInfo itemInfo, StatsLogManager.EventEnum splitEvent,
|
||||
@Nullable Task alreadyRunningTask) {
|
||||
if (alreadyRunningTask != null) {
|
||||
mInitialTaskId = alreadyRunningTask.key.id;
|
||||
int alreadyRunningTask) {
|
||||
if (alreadyRunningTask != INVALID_TASK_ID) {
|
||||
mInitialTaskId = alreadyRunningTask;
|
||||
} else {
|
||||
mInitialTaskIntent = intent;
|
||||
mUser = itemInfo.user;
|
||||
@@ -350,6 +345,14 @@ public class SplitSelectStateController {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean isAnimateCurrentTaskDismissal() {
|
||||
return mAnimateCurrentTaskDismissal;
|
||||
}
|
||||
|
||||
public void setAnimateCurrentTaskDismissal(boolean animateCurrentTaskDismissal) {
|
||||
mAnimateCurrentTaskDismissal = animateCurrentTaskDismissal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Requires Shell Transitions
|
||||
*/
|
||||
@@ -456,6 +459,7 @@ public class SplitSelectStateController {
|
||||
mLaunchingTaskView = null;
|
||||
mItemInfo = null;
|
||||
mSplitEvent = null;
|
||||
mAnimateCurrentTaskDismissal = false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user