diff options
| author | 2022-12-20 07:03:38 +0000 | |
|---|---|---|
| committer | 2022-12-22 09:52:01 +0000 | |
| commit | 265cdc3a689c05ccf11a0e3840beaba94bb425ae (patch) | |
| tree | fa925e9be8bc6d5d87ca489febd08e6df05a83af | |
| parent | 13459ada3a7c525619acec451044d9c5973d2f9d (diff) | |
[ShellTransit] Reset alpha in buildFinishTransaction
The alpha of a window container can be 0 after it play a fade-out app
transition, (e.g. start/finish activity with overridePendingTransition)
And since there doesn't have another animation layer like legacy
transition do, that window will stay invisible because of alpha=0,
unless somewhere trigger another animation with apply a new alpha on it.
Also it won't able to receive touch event since the alpha is 0.
To make it visible, always reset the alpha to 1 in
buildFinishTransaction.
Bug: 263439418
Test: manual, finish activity with an overridePendingTransition which
apply fade-out animation for the entering one, the activity should be
visible after animation finish.
Change-Id: I5be555e33b76aa799e1f96b3ea340d365bad4c66
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index b714d2e5e1e0..39fe4559c88f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -370,8 +370,6 @@ public class Transitions implements RemoteCallable<Transitions> { // If this is a transferred starting window, we want it immediately visible. && (change.getFlags() & FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT) == 0) { t.setAlpha(leash, 0.f); - // fix alpha in finish transaction in case the animator itself no-ops. - finishT.setAlpha(leash, 1.f); } } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) { finishT.hide(leash); diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index c874747b0b5a..c911b83a9a87 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -653,6 +653,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { t.setCornerRadius(targetLeash, 0); t.setShadowRadius(targetLeash, 0); t.setMatrix(targetLeash, 1, 0, 0, 1); + t.setAlpha(targetLeash, 1); // The bounds sent to the transition is always a real bounds. This means we lose // information about "null" bounds (inheriting from parent). Core will fix-up // non-organized window surface bounds; however, since Core can't touch organized |