Snap for 11876238 from 59fd8cbfaf4a37c4d7952902994d8c5b425935ac to 24Q3-release (31969d91) · Commits · e / os / android_packages_apps_Trebuchet

OWNERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ tracyzhou@google.com
		peanutbutter@google.com
		jeremysim@google.com
		atsjenk@google.com
		brianji@google.com

		# Overview eng team
		alexchau@google.com

go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ import com.android.launcher3.views.ArrowTipView;
		import com.android.quickstep.util.AssistContentRequester;
		import com.android.quickstep.util.RecentsOrientedState;
		import com.android.quickstep.views.GoOverviewActionsView;
		import com.android.quickstep.views.TaskThumbnailViewDeprecated;
		import com.android.quickstep.views.TaskView.TaskContainer;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.recents.model.ThumbnailData;

		@@ -101,8 +101,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
		/**
		* Create a new overlay instance for the given View
		*/
		public TaskOverlayGo createOverlay(TaskThumbnailViewDeprecated thumbnailView) {
		return new TaskOverlayGo(thumbnailView, mContentRequester);
		public TaskOverlayGo createOverlay(TaskContainer taskContainer) {
		return new TaskOverlayGo(taskContainer, mContentRequester);
		}

		/**
		@@ -120,9 +120,9 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
		private OverlayDialogGo mDialog;
		private ArrowTipView mArrowTipView;

		private TaskOverlayGo(TaskThumbnailViewDeprecated taskThumbnailView,
		private TaskOverlayGo(TaskContainer taskContainer,
		AssistContentRequester assistContentRequester) {
		super(taskThumbnailView);
		super(taskContainer);
		mFactoryContentRequester = assistContentRequester;
		mSharedPreferences = LauncherPrefs.getPrefs(mApplicationContext);
		}
		@@ -148,7 +148,8 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
		// Disable Overview Actions for Work Profile apps
		boolean isManagedProfileTask =
		UserManager.get(mApplicationContext).isManagedProfile(task.key.userId);
		boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot() && !isManagedProfileTask;
		boolean isAllowedByPolicy = mTaskContainer.getThumbnailViewDeprecated().isRealSnapshot()
		&& !isManagedProfileTask;
		getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
		mTaskPackageName = task.key.getPackageName();
		mSharedPreferences = LauncherPrefs.getPrefs(mApplicationContext);
		@@ -162,8 +163,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
		int taskId = task.key.id;
		mFactoryContentRequester.requestAssistContent(taskId, this::onAssistContentReceived);

		RecentsOrientedState orientedState =
		mThumbnailView.getTaskView().getRecentsView().getPagedViewOrientedState();
		RecentsOrientedState orientedState = mTaskContainer.getTaskView().getOrientedState();
		boolean isInLandscape = orientedState.getDisplayRotation() != ROTATION_0;

		// show tooltips in portrait mode only

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -269,8 +269,8 @@ public class TaskbarUIController {
		foundTaskView,
		foundTask,
		taskContainer.getIconView().getDrawable(),
		taskContainer.getThumbnailView(),
		taskContainer.getThumbnailView().getThumbnail(),
		taskContainer.getThumbnailViewDeprecated(),
		taskContainer.getThumbnailViewDeprecated().getThumbnail(),
		null /* intent */,
		null /* user */,
		info);

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -542,16 +542,18 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer
		if (mDesktopVisibilityController != null) {
		mDesktopVisibilityController.unregisterSystemUiListener();
		}
		mDesktopVisibilityController = null;

		if (mSplitSelectStateController != null) {
		removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());
		mSplitSelectStateController.onDestroy();
		}
		mSplitSelectStateController = null;

		super.onDestroy();
		mHotseatPredictionController.destroy();
		mSplitWithKeyboardShortcutController.onDestroy();
		if (mViewCapture != null) mViewCapture.close();
		removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());
		}

		@Override

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
		int sysuiFlags = 0;
		TaskView tv = mOverviewPanel.getTaskViewAt(0);
		if (tv != null) {
		sysuiFlags = tv.getFirstThumbnailView().getSysUiStatusNavFlags();
		sysuiFlags = tv.getFirstThumbnailViewDeprecated().getSysUiStatusNavFlags();
		}
		mLauncher.getSystemUiController().updateUiState(UI_STATE_FULLSCREEN_TASK, sysuiFlags);
		} else {