Fix Restore transition
Don't replace a change transition type. This was happening
because the wallpaper was becoming visible and the transition
system seems to assume it will be the only thing visible and
replaced the transit with WALLPAPER_OPEN.
Also fixed some other exposed bugs:
- Animation was using stack bounds for freeform windows.
- Non-changing windows were using change anim spec.
Bug: 126956505
Test: atest AppWindowTokenTests AppTransitionControllerTest
manual, restore a maximized window.
Change-Id: I49bc9bb6c4314e8eb5415a1e2aefc8d61fc0476e
diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java
index 8f0a7c0..f6326957 100644
--- a/services/core/java/com/android/server/wm/AppTransitionController.java
+++ b/services/core/java/com/android/server/wm/AppTransitionController.java
@@ -513,8 +513,11 @@
// Given no app transition pass it through instead of a wallpaper transition.
// Never convert the crashing transition.
// Never update the transition for the wallpaper if we are just docking from recents
+ // Never convert a change transition since the top activity isn't changing and will likely
+ // still be above an opening wallpaper.
if (transit == TRANSIT_NONE || transit == TRANSIT_CRASHING_ACTIVITY_CLOSE
- || transit == TRANSIT_DOCK_TASK_FROM_RECENTS) {
+ || transit == TRANSIT_DOCK_TASK_FROM_RECENTS
+ || AppTransition.isChangeTransit(transit)) {
return transit;
}
@@ -601,6 +604,10 @@
*/
@VisibleForTesting
int maybeUpdateTransitToTranslucentAnim(int transit) {
+ if (AppTransition.isChangeTransit(transit)) {
+ // There's no special animation to handle change animations with translucent apps
+ return transit;
+ }
final boolean taskOrActivity = AppTransition.isTaskTransit(transit)
|| AppTransition.isActivityTransit(transit);
boolean allOpeningVisible = true;