Merge "5/ Remove unused recents code" into main (380f11e9) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VAL
		import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
		import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
		import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
		import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
		import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
		import static com.android.quickstep.util.AnimUtils.clampToDuration;
		import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback;
		@@ -1228,9 +1227,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		* Registers remote animations used when closing apps to home screen.
		*/
		public void registerRemoteTransitions() {
		if (ENABLE_SHELL_TRANSITIONS) {
		SystemUiProxy.INSTANCE.get(mLauncher).shareTransactionQueue();
		}
		if (SEPARATE_RECENTS_ACTIVITY.get()) {
		return;
		}
		@@ -1294,9 +1291,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		}

		protected void unregisterRemoteTransitions() {
		if (ENABLE_SHELL_TRANSITIONS) {
		SystemUiProxy.INSTANCE.get(mLauncher).unshareTransactionQueue();
		}
		if (SEPARATE_RECENTS_ACTIVITY.get()) {
		return;
		}

+1 −4

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import static com.android.launcher3.QuickstepTransitionManager.TRANSIENT_TASKBAR
		import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE;
		import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES;
		import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE;
		import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
		import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;

		import android.animation.Animator;
		@@ -232,9 +231,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		LauncherState state = mLauncher.getStateManager().getState();
		boolean nonInteractiveState = state.hasFlag(FLAG_NON_INTERACTIVE)
		&& !state.isTaskbarAlignedWithHotseat(mLauncher);
		if ((ENABLE_SHELL_TRANSITIONS
		&& isVisible
		&& (nonInteractiveState \|\| mSkipLauncherVisibilityChange))) {
		if (isVisible && (nonInteractiveState \|\| mSkipLauncherVisibilityChange)) {
		return null;
		}

+1 −7

Original line number	Diff line number	Diff line
		@@ -498,10 +498,8 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
		boolean started = ((getActivityFlags() & ACTIVITY_STATE_STARTED)) != 0;
		if (started) {
		DeviceProfile profile = getDeviceProfile();
		boolean willUserBeActive =
		(getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;
		boolean visible = (state == NORMAL \|\| state == OVERVIEW)
		&& (willUserBeActive \|\| isUserActive())
		&& isUserActive()
		&& !profile.isVerticalBarLayout()
		&& !mIsOverlayVisible;
		SystemUiProxy.INSTANCE.get(this)
		@@ -1271,10 +1269,6 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
		return ObjectWrapper.wrap(new Integer(info.id));
		}

		public void setHintUserWillBeActive() {
		addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
		}

		@Override
		public void onDisplayInfoChanged(Context context, DisplayController.Info info, int flags) {
		super.onDisplayInfoChanged(context, info, flags);

+1 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides.states;

		import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation;
		import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
		import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

		import android.content.Context;
		import android.graphics.Color;
		@@ -107,8 +106,7 @@ public class BackgroundAppState extends OverviewState {

		@Override
		public boolean isTaskbarAlignedWithHotseat(Launcher launcher) {
		if (ENABLE_SHELL_TRANSITIONS) return false;
		return super.isTaskbarAlignedWithHotseat(launcher);
		return false;
		}

		@Override

+1 −3

Original line number	Diff line number	Diff line
		@@ -949,7 +949,6 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer,
		// We will handle the sysui flags based on the centermost task view.
		mRecentsAnimationController.setUseLauncherSystemBarFlags(swipeUpThresholdPassed
		\|\| (quickswitchThresholdPassed && centermostTaskFlags != 0));
		mRecentsAnimationController.setSplitScreenMinimized(mContext, swipeUpThresholdPassed);
		// Provide a hint to WM the direction that we will be settling in case the animation
		// needs to be canceled
		mRecentsAnimationController.setWillFinishToHome(swipeUpThresholdPassed);
		@@ -1767,8 +1766,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer,

		private int calculateWindowRotation(RemoteAnimationTarget runningTaskTarget,
		RecentsOrientedState orientationState) {
		if (runningTaskTarget.rotationChange != 0
		&& TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
		if (runningTaskTarget.rotationChange != 0) {
		return Math.abs(runningTaskTarget.rotationChange) == ROTATION_90
		? ROTATION_270 : ROTATION_90;
		} else {