Merge "Refine when to move live tile app below recents view" into sc-v2-dev (a37f8baa) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java

+8 −1

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

		import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;
		import static com.android.quickstep.ViewUtils.postFrameDrawn;
		import static com.android.quickstep.fallback.RecentsState.DEFAULT;
		import static com.android.quickstep.fallback.RecentsState.HOME;
		import static com.android.quickstep.fallback.RecentsState.MODAL_TASK;
		@@ -218,8 +219,14 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta

		@Override
		public void onStateTransitionComplete(RecentsState finalState) {
		setOverlayEnabled(finalState == DEFAULT \|\| finalState == MODAL_TASK);
		boolean isOverlayEnabled = finalState == DEFAULT \|\| finalState == MODAL_TASK;
		setOverlayEnabled(isOverlayEnabled);
		setFreezeViewVisibility(false);

		if (isOverlayEnabled) {
		postFrameDrawn(this, () -> runActionOnRemoteHandles(remoteTargetHandle ->
		remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(true)));
		}
		}

		@Override

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
		import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
		import static com.android.launcher3.LauncherState.SPRING_LOADED;
		import static com.android.quickstep.ViewUtils.postFrameDrawn;

		import android.annotation.TargetApi;
		import android.content.Context;
		@@ -104,8 +105,14 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun

		@Override
		public void onStateTransitionComplete(LauncherState finalState) {
		setOverlayEnabled(finalState == OVERVIEW \|\| finalState == OVERVIEW_MODAL_TASK);
		boolean isOverlayEnabled = finalState == OVERVIEW \|\| finalState == OVERVIEW_MODAL_TASK;
		setOverlayEnabled(isOverlayEnabled);
		setFreezeViewVisibility(false);

		if (isOverlayEnabled) {
		postFrameDrawn(this, () -> runActionOnRemoteHandles(remoteTargetHandle ->
		remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(true)));
		}
		}

		@Override

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

+1 −13

Original line number	Diff line number	Diff line
		@@ -1508,17 +1508,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		}
		}
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		// Since we reuse the same mLiveTileTaskViewSimulator in the RecentsView, we need
		// to reset the params after it settles in Overview from swipe up so that we don't
		// render with obsolete param values.
		runActionOnRemoteHandles(remoteTargetHandle -> {
		TaskViewSimulator simulator = remoteTargetHandle.getTaskViewSimulator();
		simulator.taskPrimaryTranslation.value = 0;
		simulator.taskSecondaryTranslation.value = 0;
		simulator.fullScreenProgress.value = 0;
		simulator.recentsViewScale.value = 1;
		});

		// Similar to setRunningTaskHidden below, reapply the state before runningTaskView is
		// null.
		if (!mRunningTaskShowScreenshot) {
		@@ -1906,7 +1895,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		setEnableDrawingLiveTile(false);
		runActionOnRemoteHandles(remoteTargetHandle -> {
		remoteTargetHandle.getTransformParams().setTargetSet(null);
		remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(true);
		remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(false);
		});
		mSplitSelectStateController.resetState();

		@@ -4389,7 +4378,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		TaskViewSimulator tvs = remoteTargetHandle.getTaskViewSimulator();
		tvs.setOrientationState(mOrientationState);
		tvs.setDp(mActivity.getDeviceProfile());
		tvs.setDrawsBelowRecents(true);
		tvs.recentsViewScale.value = 1;
		}
		}

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -647,22 +647,8 @@ public class TaskView extends FrameLayout implements Reusable {
		mActivity.getStateManager(), recentsView,
		recentsView.getDepthController());
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animator) {
		recentsView.runActionOnRemoteHandles(
		(Consumer<RemoteTargetHandle>) remoteTargetHandle ->
		remoteTargetHandle
		.getTaskViewSimulator()
		.setDrawsBelowRecents(false));
		}

		@Override
		public void onAnimationEnd(Animator animator) {
		recentsView.runActionOnRemoteHandles(
		(Consumer<RemoteTargetHandle>) remoteTargetHandle ->
		remoteTargetHandle
		.getTaskViewSimulator()
		.setDrawsBelowRecents(true));
		mIsClickableAsLiveTile = true;
		}
		});