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

Commit d4b4e95b authored by Jagrut Desai's avatar Jagrut Desai Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23845422



Change-Id: I33a1ec0e54a662878f981bd599abb3f1d5c6f105
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4de15620 fa2a8184

quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java

+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

src/com/android/launcher3/popup/PopupContainerWithArrow.java

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