commit 2ac2063b4f1c3f9a582df341c0eb9c02c6405d62
author Gaurav Bhola <gauravbhola@google.com> Tue Sep 13 19:15:33 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 13 19:15:33 2022 +0000
tree 0148e1cc769d0cf7a16576290c49b8a5ab379b53
parent 79dad392cc4e7eddcb2537c31f7f4cd0ac3ea51a
parent 626b0df41c97457b7306d2d9aeb82ec996b65b8b

Merge "Add the StartingWindowController so that splash screen is displayed as expected" into tm-qpr-dev am: 626b0df41c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Launcher/+/19933713

Change-Id: I9a7fba44b815b7ce9b3b42ad4f3097c23c95594f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/car/carlauncher/TaskViewManager.java

diff --git a/src/com/android/car/carlauncher/TaskViewManager.java b/src/com/android/car/carlauncher/TaskViewManager.java
index a51f055..df1434f 100644
--- a/src/com/android/car/carlauncher/TaskViewManager.java
+++ b/src/com/android/car/carlauncher/TaskViewManager.java
@@ -49,12 +49,15 @@
 
 import com.android.car.carlauncher.taskstack.TaskStackChangeListeners;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.launcher3.icons.IconProvider;
 import com.android.wm.shell.ShellTaskOrganizer;
 import com.android.wm.shell.common.HandlerExecutor;
 import com.android.wm.shell.common.SyncTransactionQueue;
 import com.android.wm.shell.common.TransactionPool;
 import com.android.wm.shell.common.annotations.ShellMainThread;
 import com.android.wm.shell.fullscreen.FullscreenTaskListener;
+import com.android.wm.shell.startingsurface.StartingWindowController;
+import com.android.wm.shell.startingsurface.phone.PhoneStartingWindowTypeAlgorithm;
 import com.android.wm.shell.sysui.ShellInit;
 
 import java.util.ArrayList;
@@ -321,6 +324,10 @@
                 carActivityManagerRef, mSyncQueue);
         mTaskOrganizer.addListenerForType(fullscreenTaskListener, TASK_LISTENER_TYPE_FULLSCREEN);
         ShellInit shellInit = new ShellInit(mShellExecutor);
+        // StartingWindowController needs to be initialized so that splash screen is displayed.
+        new StartingWindowController(mContext, shellInit, mTaskOrganizer, mShellExecutor,
+                new PhoneStartingWindowTypeAlgorithm(), new IconProvider(mContext),
+                new TransactionPool());
         shellInit.init();
         List<TaskAppearedInfo> taskAppearedInfos = mTaskOrganizer.registerOrganizer();
         cleanUpExistingTaskViewTasks(taskAppearedInfos);