Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ShellTransit] Reset alpha in buildFinishTransaction" into tm-qpr-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-01-04 13:13:33 +00:00
committed by Android (Google) Code Review
parent 36993538df 265cdc3a68
commit bcccf96a0a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -370,8 +370,6 @@ public class Transitions implements RemoteCallable<Transitions> {
// If this is a transferred starting window, we want it immediately visible. // If this is a transferred starting window, we want it immediately visible.
&& (change.getFlags() & FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT) == 0) { && (change.getFlags() & FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT) == 0) {
t.setAlpha(leash, 0.f); 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) { } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) {
finishT.hide(leash); finishT.hide(leash);

1
services/core/java/com/android/server/wm/Transition.java
View File

@@ -653,6 +653,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
t.setCornerRadius(targetLeash, 0); t.setCornerRadius(targetLeash, 0);
t.setShadowRadius(targetLeash, 0); t.setShadowRadius(targetLeash, 0);
t.setMatrix(targetLeash, 1, 0, 0, 1); 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 // 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 // information about "null" bounds (inheriting from parent). Core will fix-up
// non-organized window surface bounds; however, since Core can't touch organized // non-organized window surface bounds; however, since Core can't touch organized