Merge "Fix customized activity open/close animation backdrop color" into tm-qpr-dev am: 53c5aa6792
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20662608 Change-Id: I741fe83ed27a928751607d232de94cd4857f010b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user