diff options
| author | Jagrut Desai <jagrutdesai@google.com> | 2023-06-30 23:05:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-30 23:05:06 +0000 |
| commit | d4b4e95bea631196de7caf7d0f75fb1e42961c25 (patch) | |
| tree | 5c97711e00b24085d2d053cbe2a6a19862ca2109 /src/com/android | |
| parent | 4de15620c2fc885a9b6b6d4819fec9b083bc7905 (diff) | |
| parent | fa2a81844f0921913448cbe80d492e553e85d62b (diff) | |
| download | Launcher3-d4b4e95bea631196de7caf7d0f75fb1e42961c25.tar.gz | |
Merge "Taskbar All Apps Shortcut Menu Acccessibility Focus" into udc-dev am: fa2a81844f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422
Change-Id: I33a1ec0e54a662878f981bd599abb3f1d5c6f105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 9 |
1 files changed, 8 insertions, 1 deletions
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; |