Merge "Allow trackpad gestures in immersive mode ignoring bar visibility" into udc-qpr-dev am: e4c55f8811

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

Change-Id: Ib59d175d2a84a6f9484e8e9a195d788eeb5f65d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2023-06-24 00:26:09 +00:00
committed by Automerger Merge Worker
2 changed files with 13 additions and 3 deletions
@@ -338,8 +338,16 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
boolean canStartWithNavHidden = (mSystemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) == 0
|| (mSystemUiStateFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0
|| mRotationTouchHelper.isTaskListFrozen();
return canStartWithNavHidden
&& (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
return canStartWithNavHidden && canStartTrackpadGesture();
}
/**
* @return whether SystemUI is in a state where we can start a system gesture from the trackpad.
* Trackpad gestures can start even when the nav bar / task bar is hidden in sticky immersive
* mode.
*/
public boolean canStartTrackpadGesture() {
return (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0
&& (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0
@@ -847,7 +847,9 @@ public class TouchInteractionService extends Service
return consumer;
}
boolean canStartSystemGesture = mDeviceState.canStartSystemGesture();
boolean canStartSystemGesture =
mGestureState.isTrackpadGesture() ? mDeviceState.canStartTrackpadGesture()
: mDeviceState.canStartSystemGesture();
if (!LockedUserState.get(this).isUserUnlocked()) {
CompoundString reasonString = newCompoundString("device locked");