From ea014d425f77154228600a167223c2a96a6eb605 Mon Sep 17 00:00:00 2001 From: Tiger Date: Wed, 15 Feb 2023 17:24:41 +0800 Subject: Fix calculateSystemGestureExclusion This CL sets the correct values to mSystemGestureFrameLeft and mSystemGestureFrameRight. The regression was casued by commit: 6b2391ae9d790f75d25f6ca4799c6772356b7b44 Bug: 234093736 Test: Add local logs to check if values in both system gesture frames are expected. Change-Id: I1fb2fa7a89e35e2baa5766af908359a711bcc487 --- services/core/java/com/android/server/wm/DisplayContent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 626bac449c64..d5924d0dfcaa 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -5668,8 +5668,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp final Rect df = state.getDisplayFrame(); final Insets gestureInsets = state.calculateInsets(df, systemGestures(), false /* ignoreVisibility */); - mSystemGestureFrameLeft.set(df.left, df.top, gestureInsets.left, df.bottom); - mSystemGestureFrameRight.set(gestureInsets.right, df.top, df.right, df.bottom); + mSystemGestureFrameLeft.set(df.left, df.top, df.left + gestureInsets.left, df.bottom); + mSystemGestureFrameRight.set(df.right - gestureInsets.right, df.top, df.right, df.bottom); final Region touchableRegion = Region.obtain(); final Region local = Region.obtain(); -- cgit v1.2.3-59-g8ed1b