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

This commit is contained in:
Tracy Zhou 2021-05-04 21:17:45 +00:00 committed by Android (Google) Code Review
commit a570b82aff
1 changed files with 1 additions and 10 deletions

View File

@ -2481,15 +2481,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
@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();
@ -3442,7 +3433,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
* capturing the snapshot at the same time.
*/
public void switchToScreenshot(Runnable onFinishRunnable) {
switchToScreenshot(mRecentsAnimationController == null || mRunningTaskId == -1 ? null
switchToScreenshot(mRunningTaskId == -1 ? null
: mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
}