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

Commit fa2a8184 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

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

parents 2c3c1e46 53d953cc
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
@@ -177,7 +177,6 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba
                    systemShortcuts);
                    systemShortcuts);
        }
        }


        icon.clearAccessibilityFocus();
        container.addOnAttachStateChangeListener(
        container.addOnAttachStateChangeListener(
                new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) {
                new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) {
                    @Override
                    @Override
+8 −1
Original line number Original line Diff line number Diff line
@@ -125,6 +125,14 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext>
        this(context, null, 0);
        this(context, null, 0);
    }
    }


    @Override
    protected View getAccessibilityInitialFocusView() {
        if (mSystemShortcutContainer != null) {
            return mSystemShortcutContainer.getChildAt(0);
        }
        return super.getAccessibilityInitialFocusView();
    }

    public LauncherAccessibilityDelegate getAccessibilityDelegate() {
    public LauncherAccessibilityDelegate getAccessibilityDelegate() {
        return mAccessibilityDelegate;
        return mAccessibilityDelegate;
    }
    }
@@ -242,7 +250,6 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext>
                    popupDataProvider.getNotificationKeysForItem(item),
                    popupDataProvider.getNotificationKeysForItem(item),
                    systemShortcuts);
                    systemShortcuts);
        }
        }
        launcher.tryClearAccessibilityFocus(icon);
        launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));
        launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));
        container.requestFocus();
        container.requestFocus();
        return container;
        return container;