Merge "Do not pip when ending live tile in Overview" into sc-dev (6dce7b63) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/TaskOverlayFactory.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
		if (LIVE_TILE.get()) {
		RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
		recentsView.switchToScreenshot(
		() -> recentsView.finishRecentsAnimation(true /* toRecents */, callback));
		() -> recentsView.finishRecentsAnimation(true /* toRecents */,
		false /* shouldPip */, callback));
		} else {
		callback.run();
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -3370,6 +3370,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		}

		public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
		finishRecentsAnimation(toRecents, true /* shouldPip */, onFinishComplete);
		}

		public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,
		Runnable onFinishComplete) {
		if (!toRecents && LIVE_TILE.get()) {
		// Reset the minimized state since we force-toggled the minimized state when entering
		// overview, but never actually finished the recents animation. This is a catch all for
		@@ -3387,7 +3392,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		return;
		}

		final boolean sendUserLeaveHint = toRecents && LIVE_TILE.get();
		final boolean sendUserLeaveHint = toRecents && shouldPip;
		if (sendUserLeaveHint) {
		// Notify the SysUI to use fade-in animation when entering PiP from live tile.
		final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext());