Merge "Fix flicker when swiping from desktop to home" into main (d4d114f9) · Commits · e / os / android_packages_apps_Trebuchet

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,9 @@ public class DesktopVisibilityController {
		if (mInOverviewState) {
		setLauncherViewsVisibility(View.VISIBLE);
		markLauncherResumed();
		} else if (mFreeformTasksVisible) {
		} else if (mFreeformTasksVisible && !mGestureInProgress) {
		// Switching out of overview state and gesture finished.
		// If freeform tasks are still visible, hide launcher again.
		setLauncherViewsVisibility(View.INVISIBLE);
		markLauncherPaused();
		}

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		package com.android.quickstep.views;

		import static android.app.ActivityTaskManager.INVALID_TASK_ID;

		import static com.android.launcher3.LauncherState.ALL_APPS;
		import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;
		import static com.android.launcher3.LauncherState.EDIT_MODE;
		@@ -136,6 +135,10 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
		@Override
		public void onStateTransitionStart(LauncherState toState) {
		setOverviewStateEnabled(toState.overviewUi);
		if (toState.overviewUi) {
		// If overview is enabled, we want to update at the start
		updateOverviewStateForDesktop(true);
		}
		setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mActivity.getDeviceProfile()));
		setOverviewFullscreenEnabled(toState.getOverviewFullscreenProgress() == 1);
		if (toState == OVERVIEW_MODAL_TASK) {
		@@ -162,6 +165,11 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
		runActionOnRemoteHandles(remoteTargetHandle ->
		remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(true));
		}

		if (!finalState.overviewUi) {
		// If overview is disabled, we want to update at the end
		updateOverviewStateForDesktop(false);
		}
		}

		@Override
		@@ -273,4 +281,11 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
		SystemUiProxy.INSTANCE.get(mActivity).showDesktopApps(mActivity.getDisplayId());
		}
		}

		private void updateOverviewStateForDesktop(boolean enabled) {
		DesktopVisibilityController controller = mActivity.getDesktopVisibilityController();
		if (controller != null) {
		controller.setOverviewStateEnabled(enabled);
		}
		}
		}