summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tiger <tigerhuang@google.com> 2023-02-15 17:24:41 +0800
committer Tiger <tigerhuang@google.com> 2023-02-15 17:24:41 +0800
commitea014d425f77154228600a167223c2a96a6eb605 (patch)
treec174a5cd2d378e6ff42d13e8f6783d6af64971e0
parent722601a8384ee21617c1fd86ed2fdc5bdbd334d0 (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java4
1 files 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();