aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20590940

Change-Id: Ie07cb2abf9cadb3812014585691e58cf63c5baf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-21 21:45:28 +00:00
committed by Automerger Merge Worker
parent 52f3078c7f 73a2334f7f
commit f94e71eca0
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
View File

@@ -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);

19
quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
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.

8
quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
View File

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