Merge "Add spring animations for neighboring tasks on dismiss cancel" into main
diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index 7465a4c..d4cea8d 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -615,3 +615,10 @@
description: "Enable Strict Mode for the Launcher app"
bug: "394651876"
}
+
+flag {
+ name: "extendible_theme_manager"
+ namespace: "launcher"
+ description: "Enables custom theme manager in Launcher"
+ bug: "381897614"
+}
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 828322b..7d5b471 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -169,9 +169,6 @@
if (sourceRectHint.isEmpty()) {
mSourceRectHint.set(getEnterPipWithOverlaySrcRectHint(appBounds, aspectRatio));
- // Create a new overlay layer. We do not call detach on this instance, it's propagated
- // to other classes like PipTaskOrganizer / RecentsAnimationController to complete
- // the cleanup.
mPipContentOverlay = new PipContentOverlay.PipAppIconOverlay(view.getContext(),
mAppBounds, mDestinationBounds,
new IconProvider(context).getIcon(mActivityInfo), appIconSizePx);