Revert "Have backup TouchController of Taskbar All Apps AFV."
This reverts commit 91a4aca5a59a7550a22602940aa8786d283c08ed.
Reason for revert: b/300482980
Change-Id: If910bad31816851283de834b11db5151f237dadd
Fix: 300482980
Bug: 299165179
Test: Presubmit
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
index c54bb7e..e004acc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
@@ -174,9 +174,6 @@
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 @@
mSearchSessionController = null;
}
if (mOverlayContext != null) {
- mOverlayContext.getDragLayer().removeTouchController(mSlideInView);
mOverlayContext.setSearchSessionController(null);
mOverlayContext = null;
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
index e742a3d..ff00560 100644
--- a/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
+++ b/quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
@@ -38,7 +38,6 @@
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 @@
return true;
}
};
- private final List<TouchController> mTouchControllers = new ArrayList<>();
TaskbarOverlayDragLayer(Context context) {
super(context, null, 1);
@@ -95,13 +93,10 @@
@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 @@
});
}
- /** 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
