Rename freeform tasks to desktop tasks (0580379e) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java

+28 −28

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public class DesktopVisibilityController {
		"persist.wm.debug.desktop_stashing", false);
		private final Launcher mLauncher;

		private int mVisibleFreeformTasksCount;
		private int mVisibleDesktopTasksCount;
		private boolean mInOverviewState;
		private boolean mBackgroundStateEnabled;
		private boolean mGestureInProgress;
		@@ -73,7 +73,7 @@ public class DesktopVisibilityController {
		if (DEBUG) {
		Log.d(TAG, "desktop visible tasks count changed=" + visibleTasksCount);
		}
		setVisibleFreeformTasksCount(visibleTasksCount);
		setVisibleDesktopTasksCount(visibleTasksCount);
		}
		});
		}
		@@ -108,51 +108,51 @@ public class DesktopVisibilityController {
		}

		/**
		* Whether freeform windows are visible in desktop mode.
		* Whether desktop tasks are visible in desktop mode.
		*/
		public boolean areFreeformTasksVisible() {
		boolean freeformTasksVisible = mVisibleFreeformTasksCount > 0;
		public boolean areDesktopTasksVisible() {
		boolean desktopTasksVisible = mVisibleDesktopTasksCount > 0;
		if (DEBUG) {
		Log.d(TAG, "areFreeformTasksVisible: freeformVisible=" + freeformTasksVisible
		Log.d(TAG, "areDesktopTasksVisible: desktopVisible=" + desktopTasksVisible
		+ " overview=" + mInOverviewState);
		}
		return freeformTasksVisible && !mInOverviewState;
		return desktopTasksVisible && !mInOverviewState;
		}

		/**
		* Number of visible freeform windows in desktop mode.
		* Number of visible desktop windows in desktop mode.
		*/
		public int getVisibleFreeformTasksCount() {
		return mVisibleFreeformTasksCount;
		public int getVisibleDesktopTasksCount() {
		return mVisibleDesktopTasksCount;
		}

		/**
		* Sets the number of freeform windows that are visible and updates launcher visibility based on
		* Sets the number of desktop windows that are visible and updates launcher visibility based on
		* it.
		*/
		public void setVisibleFreeformTasksCount(int visibleTasksCount) {
		public void setVisibleDesktopTasksCount(int visibleTasksCount) {
		if (DEBUG) {
		Log.d(TAG, "setVisibleFreeformTasksCount: visibleTasksCount=" + visibleTasksCount
		+ " currentValue=" + mVisibleFreeformTasksCount);
		Log.d(TAG, "setVisibleDesktopTasksCount: visibleTasksCount=" + visibleTasksCount
		+ " currentValue=" + mVisibleDesktopTasksCount);
		}

		if (visibleTasksCount != mVisibleFreeformTasksCount) {
		final boolean wasVisible = mVisibleFreeformTasksCount > 0;
		if (visibleTasksCount != mVisibleDesktopTasksCount) {
		final boolean wasVisible = mVisibleDesktopTasksCount > 0;
		final boolean isVisible = visibleTasksCount > 0;
		mVisibleFreeformTasksCount = visibleTasksCount;
		mVisibleDesktopTasksCount = visibleTasksCount;

		if (wasVisible != isVisible) {
		if (mVisibleFreeformTasksCount > 0) {
		if (mVisibleDesktopTasksCount > 0) {
		setLauncherViewsVisibility(View.INVISIBLE);
		if (!mInOverviewState) {
		// When freeform is visible & we're not in overview, we want launcher to
		// appear paused, this ensures that taskbar displays.
		// When desktop tasks are visible & we're not in overview, we want launcher
		// to appear paused, this ensures that taskbar displays.
		markLauncherPaused();
		}
		} else {
		setLauncherViewsVisibility(View.VISIBLE);
		// If freeform isn't visible ensure that launcher appears resumed to behave
		// normally.
		// If desktop tasks aren't visible, ensure that launcher appears resumed to
		// behave normally.
		markLauncherResumed();
		}
		}
		@@ -181,9 +181,9 @@ public class DesktopVisibilityController {
		if (mInOverviewState) {
		setLauncherViewsVisibility(View.VISIBLE);
		markLauncherResumed();
		} else if (areFreeformTasksVisible() && !mGestureInProgress) {
		} else if (areDesktopTasksVisible() && !mGestureInProgress) {
		// Switching out of overview state and gesture finished.
		// If freeform tasks are still visible, hide launcher again.
		// If desktop tasks are still visible, hide launcher again.
		setLauncherViewsVisibility(View.INVISIBLE);
		markLauncherPaused();
		}
		@@ -200,8 +200,8 @@ public class DesktopVisibilityController {
		if (mBackgroundStateEnabled) {
		setLauncherViewsVisibility(View.VISIBLE);
		markLauncherResumed();
		} else if (areFreeformTasksVisible() && !mGestureInProgress) {
		// Switching out of background state. If freeform tasks are visible, pause launcher.
		} else if (areDesktopTasksVisible() && !mGestureInProgress) {
		// Switching out of background state. If desktop tasks are visible, pause launcher.
		setLauncherViewsVisibility(View.INVISIBLE);
		markLauncherPaused();
		}
		@@ -251,7 +251,7 @@ public class DesktopVisibilityController {
		* Handle launcher moving to home due to home gesture or home button press.
		*/
		public void onHomeActionTriggered() {
		if (IS_STASHING_ENABLED && areFreeformTasksVisible()) {
		if (IS_STASHING_ENABLED && areDesktopTasksVisible()) {
		SystemUiProxy.INSTANCE.get(mLauncher).stashDesktopApps(mLauncher.getDisplayId());
		}
		}
		@@ -270,7 +270,7 @@ public class DesktopVisibilityController {
		dragLayer.setVisibility(visibility);
		}
		if (mLauncher instanceof QuickstepLauncher ql && ql.getTaskbarUIController() != null
		&& mVisibleFreeformTasksCount != 0) {
		&& mVisibleDesktopTasksCount != 0) {
		ql.getTaskbarUIController().onLauncherVisibilityChanged(visibility == VISIBLE);
		}
		}

quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ public final class KeyboardQuickSwitchController implements
		DesktopVisibilityController desktopController =
		LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();
		final boolean onDesktop =
		desktopController != null && desktopController.areFreeformTasksVisible();
		desktopController != null && desktopController.areDesktopTasksVisible();

		if (mModel.isTaskListValid(mTaskListChangeId)) {
		// When we are opening the KQS with no focus override, check if the first task is

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		DesktopVisibilityController desktopController =
		LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();
		final boolean onDesktop =
		desktopController != null && desktopController.areFreeformTasksVisible();
		desktopController != null && desktopController.areDesktopTasksVisible();
		if (onDesktop) {
		isVisible = false;
		}
		@@ -433,7 +433,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		protected boolean canToggleHomeAllApps() {
		return mLauncher.isResumed()
		&& !mTaskbarLauncherStateController.isInOverviewUi()
		&& !mLauncher.areFreeformTasksVisible();
		&& !mLauncher.areDesktopTasksVisible();
		}

		@Override

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -985,7 +985,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		DesktopVisibilityController visibilityController =
		LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();
		if (visibilityController != null && mActivity.isHardwareKeyboard()
		&& mActivity.isThreeButtonNav() && visibilityController.areFreeformTasksVisible()) {
		&& mActivity.isThreeButtonNav() && visibilityController.areDesktopTasksVisible()) {
		return false;
		}

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -937,7 +937,7 @@ public class QuickstepLauncher extends Launcher {
		@Override
		public void setResumed() {
		if (mDesktopVisibilityController != null
		&& mDesktopVisibilityController.areFreeformTasksVisible()
		&& mDesktopVisibilityController.areDesktopTasksVisible()
		&& !mDesktopVisibilityController.isRecentsGestureInProgress()) {
		// Return early to skip setting activity to appear as resumed
		// TODO(b/255649902): shouldn't be needed when we have a separate launcher state
		@@ -1284,9 +1284,9 @@ public class QuickstepLauncher extends Launcher {
		}

		@Override
		public boolean areFreeformTasksVisible() {
		public boolean areDesktopTasksVisible() {
		if (mDesktopVisibilityController != null) {
		return mDesktopVisibilityController.areFreeformTasksVisible();
		return mDesktopVisibilityController.areDesktopTasksVisible();
		}
		return false;
		}