From 3db6f288a377308095d07a35ef25d675dd449996 Mon Sep 17 00:00:00 2001 From: Johannes Gallmann Date: Thu, 20 Mar 2025 13:20:32 +0100 Subject: [PATCH] Fix back button not reacting to accessibility actions (2) This line was accidentally not put behind the flag in the last CL. Bug: 403184586 Test: Manual, i.e. verified that back button is clickable with TalkBack enabled. Also verified no regressions in kids themed taskbar. Flag: com.android.window.flags.predictive_back_three_button_nav Change-Id: Ia495e3f25e0c15815cb8d26254ecacfe245864a4 --- .../launcher3/taskbar/NavbarButtonsViewController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index f03b7d147b..cf3b95274a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -693,7 +693,11 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT if (mBackButton == null) { return; } - setupBackButtonAccessibility(mBackButton, accessibilityDelegate); + if (predictiveBackThreeButtonNav()) { + setupBackButtonAccessibility(mBackButton, accessibilityDelegate); + } else { + mBackButton.setAccessibilityDelegate(accessibilityDelegate); + } } public void setWallpaperVisible(boolean isVisible) {