Snap for 7311204 from 60a4a0b33d051bf73e7785b60c5a05b579adaff7 to sc-v2-release
Change-Id: I95c3a59636e3d88fbe678d8b49b6fea7ee666e76
diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
index a1af77d..edc3ab2 100644
--- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
@@ -17,6 +17,8 @@
import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
+import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
+
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import java.util.ArrayList;
@@ -97,6 +99,10 @@
}
public void release() {
+ if (ENABLE_SHELL_TRANSITIONS) {
+ mReleaseChecks.clear();
+ return;
+ }
if (mReleased) {
return;
}
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d59d120..41076f3 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2515,15 +2515,6 @@
@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();