Revert "Move/Launch task on the TaskView's display."
This reverts commit 2cdc359b84.
Reason for revert: this brokes split screen and result to device reboot.
Bug: 197293995
Change-Id: I154287230fa3849cad1c0e337e3bf3fd826257a4
This commit is contained in:
@@ -654,7 +654,6 @@ public class TaskView extends FrameLayout implements Reusable {
|
||||
TestLogging.recordEvent(
|
||||
TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
|
||||
ActivityOptionsWrapper opts = mActivity.getActivityLaunchOptions(this, null);
|
||||
opts.options.setLaunchDisplayId(getRootViewDisplayId());
|
||||
if (ActivityManagerWrapper.getInstance()
|
||||
.startActivityFromRecents(mTask.key, opts.options)) {
|
||||
RecentsView recentsView = getRecentsView();
|
||||
@@ -695,7 +694,6 @@ public class TaskView extends FrameLayout implements Reusable {
|
||||
// Indicate success once the system has indicated that the transition has started
|
||||
ActivityOptions opts = ActivityOptionsCompat.makeCustomAnimation(
|
||||
getContext(), 0, 0, () -> callback.accept(true), MAIN_EXECUTOR.getHandler());
|
||||
opts.setLaunchDisplayId(getRootViewDisplayId());
|
||||
if (freezeTaskList) {
|
||||
ActivityOptionsCompat.setFreezeRecentTasksList(opts);
|
||||
}
|
||||
@@ -1507,10 +1505,6 @@ public class TaskView extends FrameLayout implements Reusable {
|
||||
mDigitalWellBeingToast.setBannerColorTint(tintColor, amount);
|
||||
}
|
||||
|
||||
private int getRootViewDisplayId() {
|
||||
return getRootView().getDisplay().getDisplayId();
|
||||
}
|
||||
|
||||
/**
|
||||
* We update and subsequently draw these in {@link #setFullscreenProgress(float)}.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user