diff options
author | Jagrut Desai <jagrutdesai@google.com> | 2023-06-28 11:51:18 -0700 |
---|---|---|
committer | Jagrut Desai <jagrutdesai@google.com> | 2023-06-28 14:48:54 -0700 |
commit | 53d953ccd24cd378418d9bd8c9964589fb1af44a (patch) | |
tree | 376f66ef9628498c6d6c83f71b2465dbeb789584 | |
parent | 9f566dec6bab0f351685078f7f713b674f5bc1b7 (diff) | |
download | Launcher3-53d953ccd24cd378418d9bd8c9964589fb1af44a.tar.gz |
Taskbar All Apps Shortcut Menu Acccessibility Focus
Bug: 280657266
Test: manual
Flag: not needed
Change-Id: I2426636067ce3635b8b24b9f5d093dad7d9ddf4c
-rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index 5eec726e27..512b77a92a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -177,7 +177,6 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba systemShortcuts); } - icon.clearAccessibilityFocus(); container.addOnAttachStateChangeListener( new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) { @Override diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 8274789ef5..1f26bab502 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -125,6 +125,14 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> this(context, null, 0); } + @Override + protected View getAccessibilityInitialFocusView() { + if (mSystemShortcutContainer != null) { + return mSystemShortcutContainer.getChildAt(0); + } + return super.getAccessibilityInitialFocusView(); + } + public LauncherAccessibilityDelegate getAccessibilityDelegate() { return mAccessibilityDelegate; } @@ -242,7 +250,6 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> popupDataProvider.getNotificationKeysForItem(item), systemShortcuts); } - launcher.tryClearAccessibilityFocus(icon); launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item)); container.requestFocus(); return container; |