aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't cancel or commit predictive back on multi touch in 3-button-nav

Browse Source 
Bug: 381054861
Test: Manual, i.e. verify that tapping the taskbar while predictive back is in progress does not cancel or commit it
Flag: com.android.window.flags.predictive_back_three_button_nav
Change-Id: I4117aca74216849519a0cabcbd3cb14f7fc5b38f
This commit is contained in:
Johannes Gallmann
2024-11-27 15:05:17 +00:00
parent 3be4c7d458
commit 200ee94279
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
View File

@@ -866,13 +866,19 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
TaskbarNavButtonController navButtonController) {
final RectF rect = new RectF();
buttonView.setOnTouchListener((v, event) -> {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
int motionEventAction = event.getAction();
if (motionEventAction == MotionEvent.ACTION_DOWN) {
rect.set(0, 0, v.getWidth(), v.getHeight());
}
boolean isCancelled = event.getAction() == MotionEvent.ACTION_CANCEL
|| !rect.contains(event.getX(), event.getY());
if (event.getAction() == MotionEvent.ACTION_MOVE && !isCancelled) return false;
int motionEventAction = event.getAction();
boolean isCancelled = motionEventAction == MotionEvent.ACTION_CANCEL
|| (!rect.contains(event.getX(), event.getY())
&& (motionEventAction == MotionEvent.ACTION_MOVE
|| motionEventAction == MotionEvent.ACTION_UP));
if (motionEventAction != MotionEvent.ACTION_DOWN
&& motionEventAction != MotionEvent.ACTION_UP && !isCancelled) {
// return early. we don't care about any other cases than DOWN, UP and CANCEL
return false;
}
int keyEventAction = motionEventAction == MotionEvent.ACTION_DOWN
? KeyEvent.ACTION_DOWN : ACTION_UP;
navButtonController.sendBackKeyEvent(keyEventAction, isCancelled);