Merge "Implement overlay window for Taskbar EDU and All Apps." into tm-qpr-dev am: c9928a1ddf am: 08092b2cfb

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

Change-Id: Ifad418ad73a6bf4a98d6bdfce80d0cbbdfb90790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-10-19 15:00:57 +00:00
committed by Automerger Merge Worker
18 changed files with 530 additions and 438 deletions

View File

@@ -76,6 +76,7 @@ import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.popup.PopupDataProvider;
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController;
import com.android.launcher3.taskbar.overlay.TaskbarOverlayController;
import com.android.launcher3.testing.TestLogging;
import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.touch.ItemClickHandler;
@@ -212,7 +213,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
new TaskbarAutohideSuspendController(this),
new TaskbarPopupController(this),
new TaskbarForceVisibleImmersiveController(this),
new TaskbarAllAppsController(this, dp),
new TaskbarOverlayController(this, dp),
new TaskbarAllAppsController(),
new TaskbarInsetsController(this),
new VoiceInteractionWindowController(this),
isDesktopMode
@@ -244,7 +246,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
/** Updates {@link DeviceProfile} instances for any Taskbar windows. */
public void updateDeviceProfile(DeviceProfile dp, NavigationMode navMode) {
mNavMode = navMode;
mControllers.taskbarAllAppsController.updateDeviceProfile(dp);
mControllers.taskbarOverlayController.updateDeviceProfile(dp);
mDeviceProfile = dp.copy(this);
updateIconSize(getResources());