Merge cherrypicks of [16591950] into sc-v2-release. (af3034c3) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,22 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
		return mCallbacks;
		}

		public void endLiveTile() {
		if (mLastGestureState == null) {
		return;
		}
		BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
		if (ENABLE_QUICKSTEP_LIVE_TILE.get() && activityInterface.isInLiveTileMode()
		&& activityInterface.getCreatedActivity() != null) {
		RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
		if (recentsView != null) {
		recentsView.switchToScreenshot(null,
		() -> recentsView.finishRecentsAnimation(true /* toRecents */,
		false /* shouldPip */, null));
		}
		}
		}

		public void setLiveTileCleanUpHandler(Runnable cleanUpHandler) {
		mLiveTileCleanUpHandler = cleanUpHandler;
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHE
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SMARTSPACE_TRANSITION_CONTROLLER;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;

		import android.annotation.TargetApi;
		@@ -495,6 +496,15 @@ public class TouchInteractionService extends Service
		mOverviewComponentObserver.onSystemUiStateChanged();
		mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags);

		boolean wasExpanded = (lastSysUIFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0;
		boolean isExpanded =
		(systemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0;
		if (wasExpanded != isExpanded && isExpanded) {
		// End live tile when expanding the notification panel for the first time from
		// overview.
		mTaskAnimationManager.endLiveTile();
		}

		if ((lastSysUIFlags & SYSUI_STATE_TRACING_ENABLED) !=
		(systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED)) {
		// Update the tracing state