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

Commit a7e47717 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Revert "Have backup TouchController of Taskbar All Apps AFV." 

This reverts commit 91a4aca5.

Reason for revert: b/300482980

Change-Id: If910bad31816851283de834b11db5151f237dadd
Fix: 300482980
Bug: 299165179
Test: Presubmit
parent 4e520286

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java

+0 −4
Original line number Diff line number Diff line
@@ -174,9 +174,6 @@ public final class TaskbarAllAppsController { 


        mSlideInView = (TaskbarAllAppsSlideInView) mOverlayContext.getLayoutInflater().inflate(

                R.layout.taskbar_all_apps_sheet, mOverlayContext.getDragLayer(), false);

        // Ensures All Apps gets touch events in case it is not the top floating view. Floating

        // views above it may not be able to intercept the touch, so All Apps should try to.

        mOverlayContext.getDragLayer().addTouchController(mSlideInView);

        mSlideInView.addOnCloseListener(() -> {

            mControllers.getSharedState().allAppsVisible = false;

            cleanUpOverlay();
@@ -215,7 +212,6 @@ public final class TaskbarAllAppsController { 
            mSearchSessionController = null;

        }

        if (mOverlayContext != null) {

            mOverlayContext.getDragLayer().removeTouchController(mSlideInView);

            mOverlayContext.setSearchSessionController(null);

            mOverlayContext = null;

        }

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

+4 −21
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.launcher3.util.DisplayController; 
import com.android.launcher3.util.TouchController;

import com.android.launcher3.views.BaseDragLayer;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CopyOnWriteArrayList;
@@ -70,7 +69,6 @@ public class TaskbarOverlayDragLayer extends 
            return true;

        }

    };

    private final List<TouchController> mTouchControllers = new ArrayList<>();



    TaskbarOverlayDragLayer(Context context) {

        super(context, null, 1);
@@ -95,13 +93,10 @@ public class TaskbarOverlayDragLayer extends 


    @Override

    public void recreateControllers() {

        List<TouchController> controllers = new ArrayList<>();

        controllers.add(mActivity.getDragController());

        controllers.addAll(mTouchControllers);

        if (!mOnClickListeners.isEmpty()) {

            controllers.add(mClickListenerTouchController);

        }

        mControllers = controllers.toArray(new TouchController[0]);

        mControllers = mOnClickListeners.isEmpty()

                ? new TouchController[]{mActivity.getDragController()}

                : new TouchController[] {

                        mActivity.getDragController(), mClickListenerTouchController};

    }



    @Override
@@ -188,18 +183,6 @@ public class TaskbarOverlayDragLayer extends 
        });

    }



    /** Adds a {@link TouchController} to this drag layer. */

    public void addTouchController(@NonNull TouchController touchController) {

        mTouchControllers.add(touchController);

        recreateControllers();

    }



    /** Removes a {@link TouchController} from this drag layer. */

    public void removeTouchController(@NonNull TouchController touchController) {

        mTouchControllers.remove(touchController);

        recreateControllers();

    }



    /**

     * Taskbar automatically stashes when opening all apps, but we don't report the insets as

     * changing to avoid moving the underlying app. But internally, the apps view should still