summaryrefslogtreecommitdiff
path: root/quickstep/src
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-20 15:43:52 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-20 15:43:52 -0700
commitfe1502122663158fd31fb4da731abb156b63abf4 (patch)
tree4e6456e1683ec3d6fb7e19ca4012279ba7ec924d /quickstep/src
parentce62f1d47ab7e791f7887a736e405dfc2d824f32 (diff)
parent3db6f288a377308095d07a35ef25d675dd449996 (diff)
Merge "Fix back button not reacting to accessibility actions (2)" into main
Diffstat (limited to 'quickstep/src')
-rw-r--r--quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java6
1 files changed, 5 insertions, 1 deletions
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) {