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

Commit b046707a authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix customized activity open/close animation backdrop color" into... 

Merge "Fix customized activity open/close animation backdrop color" into tm-qpr-dev am: 53c5aa67 am: b735a1cb

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



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

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

+5 −2
Original line number Diff line number Diff line
@@ -3025,13 +3025,16 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
                    // When there are more than one changing containers, it may leave part of the

                    // screen empty. Show background color to cover that.

                    showBackdrop = getDisplayContent().mChangingContainers.size() > 1;

                    backdropColor = appTransition.getNextAppTransitionBackgroundColor();

                } else {

                    // Check whether the app has requested to show backdrop for open/close

                    // transition.

                    final Animation a = appTransition.getNextAppRequestedAnimation(enter);

                    showBackdrop = a != null && a.getShowBackdrop();

                    if (a != null) {

                        showBackdrop = a.getShowBackdrop();

                        backdropColor = a.getBackdropColor();

                    }

                }

                backdropColor = appTransition.getNextAppTransitionBackgroundColor();

            }

            final Rect localBounds = new Rect(mTmpRect);

            localBounds.offsetTo(mTmpPoint.x, mTmpPoint.y);