Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0f8fad0 authored May 17, 2024 by Pierre Barbier de Reuille

WMShell signals when a task's visibility changes

If a freeform task's visibility changes (and it's not a move between
displays), then WMShell signals it so launcher can listen and show the
information to the user.

Test: atest ShellTaskOrganizerTests
Test: atest RecentTasksControllerTest
Flag: com.android.window.flags.enable_desktop_windowing_taskbar_running_apps
Bug: 333872717
Change-Id: I229de5c1f297960e99319ccc0f7523219770cd3e

parent ed1c5430

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -552,10 +552,12 @@ public class ShellTaskOrganizer extends TaskOrganizer implements
		// Notify the compat UI if the listener or task info changed.
		notifyCompatUI(taskInfo, newListener);
		}
		if (data.getTaskInfo().getWindowingMode() != taskInfo.getWindowingMode()) {
		// Notify the recent tasks when a task changes windowing modes
		final boolean windowModeChanged =
		data.getTaskInfo().getWindowingMode() != taskInfo.getWindowingMode();
		final boolean visibilityChanged = data.getTaskInfo().isVisible != taskInfo.isVisible;
		if (windowModeChanged \|\| visibilityChanged) {
		mRecentTasks.ifPresent(recentTasks ->
		recentTasks.onTaskWindowingModeChanged(taskInfo));
		recentTasks.onTaskRunningInfoChanged(taskInfo));
		}
		// TODO (b/207687679): Remove check for HOME once bug is fixed
		final boolean isFocusedOrHome = taskInfo.isFocused

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -253,8 +253,12 @@ public class RecentTasksController implements TaskStackListenerCallback,
		notifyRunningTaskVanished(taskInfo);
		}

		/** Notify listeners that the windowing mode of the given Task was updated. */
		public void onTaskWindowingModeChanged(ActivityManager.RunningTaskInfo taskInfo) {
		/**
		* Notify listeners that the running infos related to recent tasks was updated.
		*
		* This currently includes windowing mode and visibility.
		*/
		public void onTaskRunningInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {
		notifyRecentTasksChanged();
		notifyRunningTaskChanged(taskInfo);
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java

+103 −52

File changed.

Preview size limit exceeded, changes collapsed.

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -511,7 +511,7 @@ public class RecentTasksControllerTest extends ShellTestCase {
		mRecentTasksControllerReal.registerRecentTasksListener(mRecentTasksListener);
		ActivityManager.RunningTaskInfo taskInfo = makeRunningTaskInfo(/* taskId= */10);

		mRecentTasksControllerReal.onTaskWindowingModeChanged(taskInfo);
		mRecentTasksControllerReal.onTaskRunningInfoChanged(taskInfo);

		verify(mRecentTasksListener).onRunningTaskChanged(taskInfo);
		}
		@@ -525,7 +525,7 @@ public class RecentTasksControllerTest extends ShellTestCase {
		mRecentTasksControllerReal.registerRecentTasksListener(mRecentTasksListener);
		ActivityManager.RunningTaskInfo taskInfo = makeRunningTaskInfo(/* taskId= */10);

		mRecentTasksControllerReal.onTaskWindowingModeChanged(taskInfo);
		mRecentTasksControllerReal.onTaskRunningInfoChanged(taskInfo);

		verify(mRecentTasksListener, never()).onRunningTaskChanged(any());
		}