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

Commit 479b6e75 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23852178',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23852178', 'googleplex-android-review.googlesource.com/23845422'] into udc-release.

Change-Id: Id2f13f18793e0a6b6c00368be8cf2de6cf329092
parents 4fa7d267 7cc6f650

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

+5 −0
Original line number Diff line number Diff line
@@ -202,6 +202,11 @@ public class TaskbarLauncherStateController { 
                public void onStateTransitionComplete(LauncherState finalState) {

                    mLauncherState = finalState;

                    updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, false);

                    // TODO(b/279514548) Cleans up bad state that can occur when user interacts with

                    // taskbar on top of transparent activity.

                    if (finalState == LauncherState.NORMAL && mLauncher.isResumed()) {

                        updateStateForFlag(FLAG_RESUMED, true);

                    }

                    applyState();

                    boolean disallowLongClick = finalState == LauncherState.OVERVIEW_SPLIT_SELECT;

                    com.android.launcher3.taskbar.Utilities.setOverviewDragState(

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;