Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev

This commit is contained in:
Jagrut Desai
2023-06-30 22:29:20 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 2 deletions

View File

@@ -177,7 +177,6 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba
systemShortcuts);
}
icon.clearAccessibilityFocus();
container.addOnAttachStateChangeListener(
new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) {
@Override

View File

@@ -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;