diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 9b0f8c4993..49dec1e5f0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -560,8 +560,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) { mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags, fromInit); - mControllers.taskbarViewController.setImeIsVisible( - mControllers.navbarButtonsViewController.isImeVisible()); int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED | SYSUI_STATE_QUICK_SETTINGS_EXPANDED; onNotificationShadeExpandChanged((systemUiStateFlags & shadeExpandedFlags) != 0, fromInit); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index 483f711a0f..c1e85aac2a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -76,9 +76,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar private View.OnClickListener mIconClickListener; private View.OnLongClickListener mIconLongClickListener; - // Prevents dispatching touches to children if true - private boolean mTouchEnabled = true; - // Only non-null when the corresponding Folder is open. private @Nullable FolderIcon mLeaveBehindFolderIcon; @@ -390,14 +387,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar } } - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (!mTouchEnabled) { - return true; - } - return super.dispatchTouchEvent(ev); - } - @Override public boolean onInterceptTouchEvent(MotionEvent ev) { mControllerCallbacks.onInterceptTouchEvent(ev); @@ -406,9 +395,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar @Override public boolean onTouchEvent(MotionEvent event) { - if (!mTouchEnabled) { - return true; - } if (mIconLayoutBounds.left <= event.getX() && event.getX() <= mIconLayoutBounds.right && !DisplayController.isTransientTaskbar(mActivityContext)) { @@ -429,11 +415,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar return super.onTouchEvent(event); } - public void setTouchesEnabled(boolean touchEnabled) { - this.mTouchEnabled = touchEnabled; - mControllerCallbacks.clearTouchInProgress(); - } - /** * Returns whether the given MotionEvent, *in screen coorindates*, is within any Taskbar item's * touch bounds. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index a25ca8cc5f..c7088382d0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -199,14 +199,6 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar return mTaskbarIconAlpha; } - /** - * Should be called when the IME visibility changes, so we can make Taskbar not steal touches. - */ - public void setImeIsVisible(boolean isImeVisible) { - mTaskbarView.setTouchesEnabled(!isImeVisible - || DisplayController.isTransientTaskbar(mActivity)); - } - /** * Should be called when the recents button is disabled, so we can hide taskbar icons as well. */