Merge "Ignore the Recents animation target when collecting keep clear areas." into tm-qpr-dev am: 47e8a77202
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19263822 Change-Id: Ifdc4252171f6c4a4e127bcd45b3e841f4d834702 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -5669,7 +5669,16 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
|
||||
void getKeepClearAreas(Set<Rect> outRestricted, Set<Rect> outUnrestricted) {
|
||||
final Matrix tmpMatrix = new Matrix();
|
||||
final float[] tmpFloat9 = new float[9];
|
||||
final RecentsAnimationController recentsAnimationController =
|
||||
mWmService.getRecentsAnimationController();
|
||||
forAllWindows(w -> {
|
||||
// Skip the window if it is part of Recents animation
|
||||
final boolean ignoreRecentsAnimationTarget = recentsAnimationController != null
|
||||
&& recentsAnimationController.shouldApplyInputConsumer(w.getActivityRecord());
|
||||
if (ignoreRecentsAnimationTarget) {
|
||||
return false; // continue traversal
|
||||
}
|
||||
|
||||
if (w.isVisible() && !w.inPinnedWindowingMode()) {
|
||||
w.getKeepClearAreas(outRestricted, outUnrestricted, tmpMatrix, tmpFloat9);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user