commit 299de3f2925804512ad6de19cc6b086761f25f4c
author Tracy Zhou <tracyzhou@google.com> Mon May 03 18:08:37 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 03 18:08:37 2021 +0000
tree dfcfe13314723c6f5d07f3568285c8cff09db761
parent ada0acd75cfab337bbfb0d522cdd559c52215841
parent ef7b4d5dae976c1c6f4dbf5e43d6ab020361aa3a

Merge "Revert "Revert "Finish recents animation upon home rotation""" into sc-dev

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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index c9e7a73..53f880f 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2481,6 +2481,15 @@
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        if (LIVE_TILE.get() && mRunningTaskId != -1) {
+            switchToScreenshot(
+                    () -> finishRecentsAnimation(true, this::onConfigurationChangedInternal));
+        } else {
+            onConfigurationChangedInternal();
+        }
+    }
+
+    private void onConfigurationChangedInternal() {
         final int rotation = mActivity.getDisplay().getRotation();
         if (mOrientationState.setRecentsRotation(rotation)) {
             updateOrientationHandler();
@@ -3433,7 +3442,7 @@
      * capturing the snapshot at the same time.
      */
     public void switchToScreenshot(Runnable onFinishRunnable) {
-        switchToScreenshot(mRunningTaskId == -1 ? null
+        switchToScreenshot(mRecentsAnimationController == null || mRunningTaskId == -1 ? null
                 : mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
     }