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

Commit 53c5aa67 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Fix customized activity open/close animation backdrop color" into tm-qpr-dev

parents 72e5627c ff3428b1
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -3011,13 +3011,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);