Merge "Remove setImeIsVisible/setTouchesEnabled as its already handled by insets." into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2023-02-21 21:15:22 +00:00
committed by Android (Google) Code Review
3 changed files with 0 additions and 29 deletions

View File

@@ -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.