Merge "Don't allow Taskbar unstash during Assistant gesture" into udc-dev

This commit is contained in:
TreeHugger Robot
2023-06-06 01:33:31 +00:00
committed by Android (Google) Code Review

View File

@@ -911,9 +911,9 @@ public class TouchInteractionService extends Service
base = tryCreateAssistantInputConsumer(base, newGestureState, event, reasonString);
}
// If Taskbar is present, we listen for long press or cursor hover events to unstash it.
// If Taskbar is present, we listen for swipe or cursor hover events to unstash it.
TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext();
if (tac != null) {
if (tac != null && !(base instanceof AssistantInputConsumer)) {
// Present always on large screen or on small screen w/ flag
DeviceProfile dp = tac.getDeviceProfile();
boolean useTaskbarConsumer = dp.isTaskbarPresent && !TaskbarManager.isPhoneMode(dp)