Skip passing gesture to bubble when notif expanded
Notification panel can be expanded on top of expanded bubbles. Bubbles remain expanded in the back. Check for notification panel being expanded before passing home gesture to bubbles. Bug: 191565082 Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.NotificationPanelOverBubblesTest Change-Id: I59c429cceca0cef764b9d4e36389f902005e8b09
This commit is contained in:
@@ -418,6 +418,13 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener {
|
||||
return (mSystemUiStateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return whether notification panel is expanded
|
||||
*/
|
||||
public boolean isNotificationPanelExpanded() {
|
||||
return (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return whether the global actions dialog is showing
|
||||
*/
|
||||
|
||||
@@ -700,7 +700,10 @@ public class TouchInteractionService extends Service
|
||||
|
||||
// If Bubbles is expanded, use the overlay input consumer, which will close Bubbles
|
||||
// instead of going all the way home when a swipe up is detected.
|
||||
if (mDeviceState.isBubblesExpanded() || mDeviceState.isSystemUiDialogShowing()) {
|
||||
// Notification panel can be expanded on top of expanded bubbles. Bubbles remain
|
||||
// expanded in the back. Make sure swipe up is not passed to bubbles in this case.
|
||||
if ((mDeviceState.isBubblesExpanded() && !mDeviceState.isNotificationPanelExpanded())
|
||||
|| mDeviceState.isSystemUiDialogShowing()) {
|
||||
base = new SysUiOverlayInputConsumer(
|
||||
getBaseContext(), mDeviceState, mInputMonitorCompat);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user