From 6ceb084c7b8d565ca1456ac7d95976493ee3768f Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 27 Sep 2022 18:14:21 +0000 Subject: [PATCH] Fix issue with touches falling through nav bar in 3 button nav - This fixes a regression from ag/17185260 where we are no longer returning early when computing the touchable region in different nav bar states. Bug: 249053817 Test: Enable 3 button nav, dumpsys input and verify the touchable region matches the window frame Change-Id: Ib5767494973bbb23b3125988b94dcf46a2a6df24 --- .../src/com/android/systemui/navigationbar/NavigationBar.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index 30947e839f0ae..50a10bc0b15ac 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -541,10 +541,12 @@ public class NavigationBar extends ViewController implements if (!mImeVisible) { // IME not showing, take all touches info.setTouchableInsets(InternalInsetsInfo.TOUCHABLE_INSETS_FRAME); + return; } if (!mView.isImeRenderingNavButtons()) { // IME showing but not drawing any buttons, take all touches info.setTouchableInsets(InternalInsetsInfo.TOUCHABLE_INSETS_FRAME); + return; } }