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

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);

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