Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-v2-dev (8e92b412) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/RecentsActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
		public void startHome() {
		if (LIVE_TILE.get()) {
		RecentsView recentsView = getOverviewPanel();
		recentsView.switchToScreenshotAndFinishAnimationToRecents(this::startHomeInternal);
		recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true,
		this::startHomeInternal));
		} else {
		startHomeInternal();
		}

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -2409,7 +2409,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		public void accept(Boolean success) {
		if (LIVE_TILE.get() && mEnableDrawingLiveTile && dismissedTaskView.isRunningTask()
		&& success) {
		finishRecentsAnimation(true /* toHome */, () -> onEnd(success));
		finishRecentsAnimation(true /* toRecents /, false / shouldPip */,
		() -> onEnd(success));
		} else {
		onEnd(success);
		}
		@@ -2420,7 +2421,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		if (success) {
		if (shouldRemoveTask) {
		if (dismissedTaskView.getTask() != null) {
		switchToScreenshotAndFinishAnimationToRecents(() -> {
		finishRecentsAnimation(true /* toRecents /, false / shouldPip */,
		() -> {
		UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
		ActivityManagerWrapper.getInstance().removeTask(
		dismissedTaskId), REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
		@@ -2530,7 +2532,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		mPendingAnimation.addEndListener(isSuccess -> {
		if (isSuccess) {
		// Remove all the task views now
		switchToScreenshotAndFinishAnimationToRecents(() -> {
		finishRecentsAnimation(true /* toRecents /, false / shouldPip */, () -> {
		UI_HELPER_EXECUTOR.getHandler().postDelayed(
		ActivityManagerWrapper.getInstance()::removeAllRecentTasks,
		REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
		@@ -2691,7 +2693,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		protected void onConfigurationChanged(Configuration newConfig) {
		super.onConfigurationChanged(newConfig);
		if (LIVE_TILE.get() && mEnableDrawingLiveTile && newConfig.orientation != mOrientation) {
		switchToScreenshotAndFinishAnimationToRecents(this::updateRecentsRotation);
		switchToScreenshot(
		() -> finishRecentsAnimation(true /* toRecents /, false / showPip */,
		this::updateRecentsRotation));
		mEnableDrawingLiveTile = false;
		} else {
		updateRecentsRotation();
		@@ -3701,10 +3705,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		}
		}

		public void switchToScreenshotAndFinishAnimationToRecents(Runnable onFinishRunnable) {
		switchToScreenshot(() -> finishRecentsAnimation(true /* toRecents */, onFinishRunnable));
		}

		/**
		* Switch the current running task view to static snapshot mode,
		* capturing the snapshot at the same time.