Merge "Enable adjacent task animation for grid" into tm-qpr-dev (cec6e2c9) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/TaskViewUtils.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD
		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.annotation.TargetApi;
		import android.app.PendingIntent;
		@@ -198,8 +197,7 @@ public final class TaskViewUtils {
		BaseActivity baseActivity = BaseActivity.fromContext(context);
		DeviceProfile dp = baseActivity.getDeviceProfile();
		boolean showAsGrid = dp.isTablet;
		boolean parallaxCenterAndAdjacentTask =
		taskIndex != recentsView.getCurrentPage() && !showAsGrid;
		boolean parallaxCenterAndAdjacentTask = taskIndex != recentsView.getCurrentPage();
		int taskRectTranslationPrimary = recentsView.getScrollOffset(taskIndex);
		int taskRectTranslationSecondary = showAsGrid ? (int) v.getGridTranslationY() : 0;

		@@ -603,11 +601,7 @@ public final class TaskViewUtils {
		if (raController != null) {
		raController.setWillFinishToHome(false);
		}
		Context context = v.getContext();
		DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();
		launcherAnim = dp.isTablet
		? ObjectAnimator.ofFloat(recentsView, RecentsView.CONTENT_ALPHA, 0)
		: recentsView.createAdjacentPageAnimForTaskLaunch(taskView);
		launcherAnim = recentsView.createAdjacentPageAnimForTaskLaunch(taskView);
		launcherAnim.setInterpolator(Interpolators.TOUCH_RESPONSE_INTERPOLATOR);
		launcherAnim.setDuration(RECENTS_LAUNCH_DURATION);

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

+11 −9

Original line number	Diff line number	Diff line
		@@ -4317,25 +4317,27 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T

		int taskIndex = indexOfChild(tv);
		int centerTaskIndex = getCurrentPage();
		boolean launchingCenterTask = taskIndex == centerTaskIndex;

		float toScale = getMaxScaleForFullScreen();
		RecentsView recentsView = tv.getRecentsView();
		boolean showAsGrid = showAsGrid();
		boolean launchingCenterTask = showAsGrid
		? tv.isFocusedTask() && isTaskViewFullyVisible(tv)
		: taskIndex == centerTaskIndex;
		if (launchingCenterTask) {
		anim.play(ObjectAnimator.ofFloat(recentsView, RECENTS_SCALE_PROPERTY, toScale));
		anim.play(ObjectAnimator.ofFloat(recentsView, FULLSCREEN_PROGRESS, 1));
		} else {
		anim.play(ObjectAnimator.ofFloat(this, RECENTS_SCALE_PROPERTY, toScale));
		anim.play(ObjectAnimator.ofFloat(this, FULLSCREEN_PROGRESS, 1));
		} else if (!showAsGrid) {
		// We are launching an adjacent task, so parallax the center and other adjacent task.
		float displacementX = tv.getWidth() * (toScale - 1f);
		float primaryTranslation = mIsRtl ? -displacementX : displacementX;
		anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex),
		mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation));
		int runningTaskIndex = recentsView.getRunningTaskIndex();
		int runningTaskIndex = getRunningTaskIndex();
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()
		&& runningTaskIndex != -1
		&& runningTaskIndex != taskIndex
		&& recentsView.getRemoteTargetHandles() != null) {
		for (RemoteTargetHandle remoteHandle : recentsView.getRemoteTargetHandles()) {
		&& getRemoteTargetHandles() != null) {
		for (RemoteTargetHandle remoteHandle : getRemoteTargetHandles()) {
		anim.play(ObjectAnimator.ofFloat(
		remoteHandle.getTaskViewSimulator().taskPrimaryTranslation,
		AnimatedFloat.VALUE,
		@@ -4355,7 +4357,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		properties));
		}
		}
		anim.play(ObjectAnimator.ofFloat(recentsView, TASK_THUMBNAIL_SPLASH_ALPHA, 0, 1));
		anim.play(ObjectAnimator.ofFloat(this, TASK_THUMBNAIL_SPLASH_ALPHA, 0, 1));
		return anim;
		}