Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b07264b7 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

Merge "[ShellTransit] Reset alpha in buildFinishTransaction" into tm-qpr-dev am: bcccf96a am: ecfdb697

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20808017



Change-Id: I03f8612e9aeb7ea6a2ecf596fe16f1e4833f23af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0a1cb54 ecfdb697

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

+0 −2
Original line number Diff line number Diff line
@@ -374,8 +374,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);

services/core/java/com/android/server/wm/Transition.java

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,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