Merge "[2/N] Replace global userId with per-function argument" into main (abf3d819) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -1833,7 +1833,6 @@ public abstract class WMShellModule {
		@WMSingleton
		@Provides
		static Optional<DesktopImeHandler> provideDesktopImeHandler(
		Optional<DesktopTasksController> desktopTasksController,
		Optional<DesktopUserRepositories> desktopUserRepositories,
		FocusTransitionObserver focusTransitionObserver,
		DisplayImeController displayImeController,
		@@ -1850,7 +1849,7 @@ public abstract class WMShellModule {
		return Optional.empty();
		}
		return Optional.of(
		new DesktopImeHandler(desktopTasksController.get(), desktopUserRepositories.get(),
		new DesktopImeHandler(desktopUserRepositories.get(),
		focusTransitionObserver, shellTaskOrganizer,
		displayImeController, desktopModeWindowDecorViewModel, displayController,
		transitions, mainExecutor,

+1 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import java.util.Optional

		/** Handles the interactions between IME and desktop tasks */
		class DesktopImeHandler(
		private val tasksController: DesktopTasksController,
		private val userRepositories: DesktopUserRepositories,
		private val focusTransitionObserver: FocusTransitionObserver,
		private val shellTaskOrganizer: ShellTaskOrganizer,
		@@ -94,7 +93,7 @@ class DesktopImeHandler(
		isFloating: Boolean,
		t: Transaction?,
		): Int {
		if (!tasksController.isAnyDeskActive(displayId) \|\| isFloating) {
		if (!userRepositories.current.isAnyDeskActive(displayId) \|\| isFloating) {
		return IME_ANIMATION_DEFAULT
		}

+13 −7

Original line number	Diff line number	Diff line
		@@ -79,8 +79,9 @@ class DesktopModeKeyGestureHandler(
		desktopTasksController
		.get()
		.moveToNextDesktopDisplay(
		it.taskId,
		EnterReason.KEYBOARD_SHORTCUT_ENTER,
		taskId = it.taskId,
		userId = desktopUserRepositories.current.userId,
		enterReason = EnterReason.KEYBOARD_SHORTCUT_ENTER,
		)
		}
		}
		@@ -91,8 +92,9 @@ class DesktopModeKeyGestureHandler(
		desktopTasksController
		.get()
		.activatePreviousDesk(
		focusTransitionObserver.globallyFocusedDisplayId,
		EnterReason.KEYBOARD_SHORTCUT_ENTER,
		displayId = focusTransitionObserver.globallyFocusedDisplayId,
		userId = desktopUserRepositories.current.userId,
		enterReason = EnterReason.KEYBOARD_SHORTCUT_ENTER,
		)
		}
		}
		@@ -102,8 +104,9 @@ class DesktopModeKeyGestureHandler(
		desktopTasksController
		.get()
		.activateNextDesk(
		focusTransitionObserver.globallyFocusedDisplayId,
		EnterReason.KEYBOARD_SHORTCUT_ENTER,
		displayId = focusTransitionObserver.globallyFocusedDisplayId,
		userId = desktopUserRepositories.current.userId,
		enterReason = EnterReason.KEYBOARD_SHORTCUT_ENTER,
		)
		}
		}
		@@ -221,7 +224,10 @@ class DesktopModeKeyGestureHandler(

		desktopTasksController
		.get()
		.getFocusedNonDesktopTasks(focusTransitionObserver.globallyFocusedDisplayId)
		.getFocusedNonDesktopTasks(
		displayId = focusTransitionObserver.globallyFocusedDisplayId,
		userId = desktopUserRepositories.current.userId,
		)
		.find { it.windowingMode == WINDOWING_MODE_FULLSCREEN }
		?.let { fullscreenTask ->
		logV(

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ class DesktopModeShellCommandHandler(
		pw.println("Error: desk id should be an integer")
		return false
		}
		controller.activateDesk(deskId, enterReason = EnterReason.ADB_COMMAND)
		controller.activateDesk(deskId = deskId, enterReason = EnterReason.ADB_COMMAND)
		return true
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,7 @@ class DesktopPipTransitionController(
		wct = wct,
		newTask = if (shouldAddParentToDesk) parentTask!! else runningTaskInfo,
		displayId = displayId,
		userId = desktopRepository.userId,
		enterReason = EnterReason.EXIT_PIP,
		)
		}