Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e6d747d authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Skip passing gesture to bubble when notif expanded" into tm-dev

parents b73c57b2 0d3772b6

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+7 −0
Original line number Diff line number Diff line
@@ -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

     */

quickstep/src/com/android/quickstep/TouchInteractionService.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

            }