Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc6f650 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android Build Coastguard Worker
Browse files

Taskbar All Apps Shortcut Menu Acccessibility Focus

Bug: 280657266
Test: manual
Flag: not needed
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:53d953ccd24cd378418d9bd8c9964589fb1af44a)
Merged-In: I2426636067ce3635b8b24b9f5d093dad7d9ddf4c
Change-Id: I2426636067ce3635b8b24b9f5d093dad7d9ddf4c
parent df537ccd
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba
                    systemShortcuts);
        }

        icon.clearAccessibilityFocus();
        container.addOnAttachStateChangeListener(
                new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) {
                    @Override
+8 −1
Original line number Diff line number Diff line
@@ -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;