Merge "Add API to query number of visible desktop tasks" into tm-qpr-dev am: 0927efa873 (7c9c5b7d) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ import android.database.ContentObserver;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Handler;		import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;
			import android.os.RemoteException;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.provider.Settings;		import android.provider.Settings;
	import android.util.ArraySet;		import android.util.ArraySet;
	@@ -261,6 +262,11 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll
	}		}
	}		}

			/** Get number of tasks that are marked as visible */
			int getVisibleTaskCount() {
			return mDesktopModeTaskRepository.getVisibleTaskCount();
			}

	@NonNull		@NonNull
	private WindowContainerTransaction bringDesktopAppsToFront(boolean force) {		private WindowContainerTransaction bringDesktopAppsToFront(boolean force) {
	final WindowContainerTransaction wct = new WindowContainerTransaction();		final WindowContainerTransaction wct = new WindowContainerTransaction();
	@@ -438,5 +444,15 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll
	executeRemoteCallWithTaskPermission(mController, "showDesktopApps",		executeRemoteCallWithTaskPermission(mController, "showDesktopApps",
	DesktopModeController::showDesktopApps);		DesktopModeController::showDesktopApps);
	}		}

			@Override
			public int getVisibleTaskCount() throws RemoteException {
			int[] result = new int[1];
			executeRemoteCallWithTaskPermission(mController, "getVisibleTaskCount",
			controller -> result[0] = controller.getVisibleTaskCount(),
			true /* blocking */
			);
			return result[0];
			}
	}		}
	}		}

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -142,6 +142,13 @@ class DesktopModeTaskRepository {
	}		}
	}		}

			/**
			* Get number of tasks that are marked as visible
			*/
			fun getVisibleTaskCount(): Int {
			return visibleTasks.size
			}

	/**		/**
	* Add (or move if it already exists) the task to the top of the ordered list.		* Add (or move if it already exists) the task to the top of the ordered list.
	*/		*/

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,11 @@ class DesktopTasksController(
	}		}
	}		}

			/** Get number of tasks that are marked as visible */
			fun getVisibleTaskCount(): Int {
			return desktopModeTaskRepository.getVisibleTaskCount()
			}

	/** Move a task with given `taskId` to desktop */		/** Move a task with given `taskId` to desktop */
	fun moveToDesktop(taskId: Int) {		fun moveToDesktop(taskId: Int) {
	shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { task -> moveToDesktop(task) }		shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { task -> moveToDesktop(task) }
	@@ -309,5 +314,16 @@ class DesktopTasksController(
	Consumer(DesktopTasksController::showDesktopApps)		Consumer(DesktopTasksController::showDesktopApps)
	)		)
	}		}

			override fun getVisibleTaskCount(): Int {
			val result = IntArray(1)
			ExecutorUtils.executeRemoteCallWithTaskPermission(
			controller,
			"getVisibleTaskCount",
			{ controller -> result[0] = controller.getVisibleTaskCount() },
			true /* blocking */
			)
			return result[0]
			}
	}		}
	}		}

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,4 +23,7 @@ interface IDesktopMode {

	/** Show apps on the desktop */		/** Show apps on the desktop */
	void showDesktopApps();		void showDesktopApps();

			/** Get count of visible desktop tasks */
			int getVisibleTaskCount();
	}		}
			No newline at end of file

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

+35 −0

Original line number	Original line	Diff line number	Diff line
	@@ -333,6 +333,41 @@ public class DesktopModeControllerTest extends ShellTestCase {
	assertThat(op2.getContainer()).isEqualTo(task2.token.asBinder());		assertThat(op2.getContainer()).isEqualTo(task2.token.asBinder());
	}		}

			@Test
			public void testGetVisibleTaskCount_noTasks_returnsZero() {
			assertThat(mController.getVisibleTaskCount()).isEqualTo(0);
			}

			@Test
			public void testGetVisibleTaskCount_twoTasks_bothVisible_returnsTwo() {
			RunningTaskInfo task1 = createFreeformTask();
			mDesktopModeTaskRepository.addActiveTask(task1.taskId);
			mDesktopModeTaskRepository.addOrMoveFreeformTaskToTop(task1.taskId);
			mDesktopModeTaskRepository.updateVisibleFreeformTasks(task1.taskId, true /* visible */);

			RunningTaskInfo task2 = createFreeformTask();
			mDesktopModeTaskRepository.addActiveTask(task2.taskId);
			mDesktopModeTaskRepository.addOrMoveFreeformTaskToTop(task2.taskId);
			mDesktopModeTaskRepository.updateVisibleFreeformTasks(task2.taskId, true /* visible */);

			assertThat(mController.getVisibleTaskCount()).isEqualTo(2);
			}

			@Test
			public void testGetVisibleTaskCount_twoTasks_oneVisible_returnsOne() {
			RunningTaskInfo task1 = createFreeformTask();
			mDesktopModeTaskRepository.addActiveTask(task1.taskId);
			mDesktopModeTaskRepository.addOrMoveFreeformTaskToTop(task1.taskId);
			mDesktopModeTaskRepository.updateVisibleFreeformTasks(task1.taskId, true /* visible */);

			RunningTaskInfo task2 = createFreeformTask();
			mDesktopModeTaskRepository.addActiveTask(task2.taskId);
			mDesktopModeTaskRepository.addOrMoveFreeformTaskToTop(task2.taskId);
			mDesktopModeTaskRepository.updateVisibleFreeformTasks(task2.taskId, false /* visible */);

			assertThat(mController.getVisibleTaskCount()).isEqualTo(1);
			}

	@Test		@Test
	public void testHandleTransitionRequest_desktopModeNotActive_returnsNull() {		public void testHandleTransitionRequest_desktopModeNotActive_returnsNull() {
	when(DesktopModeStatus.isActive(any())).thenReturn(false);		when(DesktopModeStatus.isActive(any())).thenReturn(false);