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

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

Merge "Taskbar All Apps Icon Shortcuts Popup Accesiiblity" into udc-dev

parents 26668901 29fcd9a6

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

+1 −1
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba 
                    deepShortcutCount,

                    mPopupDataProvider.getNotificationKeysForItem(item),

                    systemShortcuts);

            icon.clearAccessibilityFocus();

        }



        icon.clearAccessibilityFocus();

        container.addOnAttachStateChangeListener(

                new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) {

                    @Override

quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java

+5 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { 
        return mOverlayController.getLauncherDeviceProfile();

    }



    @Override

    public View.AccessibilityDelegate getAccessibilityDelegate() {

        return mTaskbarContext.getAccessibilityDelegate();

    }



    @Override

    public TaskbarDragController getDragController() {

        return mDragController;

src/com/android/launcher3/folder/FolderIcon.java

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import com.android.launcher3.model.data.FolderInfo.LabelState; 
import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.WorkspaceItemFactory;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.util.Executors;

import com.android.launcher3.util.MultiTranslateDelegate;

import com.android.launcher3.util.Thunk;

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

+1 −1
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 
                    deepShortcutCount,

                    popupDataProvider.getNotificationKeysForItem(item),

                    systemShortcuts);

            launcher.tryClearAccessibilityFocus(icon);

        }

        launcher.tryClearAccessibilityFocus(icon);

        launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));

        container.requestFocus();

        return container;