Merge "Check whether the running task view is non null before setting it to be not clickable for live tile" into sc-dev

This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2021-01-29 02:21:57 +00:00
commit 6bdd00fa25
1 file changed
+4 -1
@@ -1451,7 +1451,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
private void finishCurrentTransitionToRecents() {
if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(true);
final TaskView runningTaskView = mRecentsView.getRunningTaskView();
if (runningTaskView != null) {
runningTaskView.setIsClickableAsLiveTile(true);
}
} else if (!hasTargets() || mRecentsAnimationController == null) {
// If there are no targets or the animation not started, then there is nothing to finish
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);