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

Commit 01582b7e authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Fix SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE value on activity launch" into 24D1-dev

parents 09bb6c91 c1baf55b
Loading
Loading
Loading
Loading
+12 −1
Original line number Diff line number Diff line
@@ -1200,6 +1200,16 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
                        mNotificationStackScrollLayoutController.setMaxAlphaForExpansion(alpha);
                    }, mMainDispatcher);
        }

        // Ensures that flags are updated when an activity launches
        collectFlow(mView,
                mShadeAnimationInteractor.isLaunchingActivity(),
                isLaunchingActivity -> {
                    if (isLaunchingActivity) {
                        updateSystemUiStateFlags();
                    }
                },
                mMainDispatcher);
    }

    @VisibleForTesting
@@ -3622,7 +3632,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
                    + isFullyExpanded() + " inQs=" + mQsController.getExpanded());
        }
        mSysUiState
                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, isPanelExpanded())
                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE,
                        isPanelExpanded() && !isCollapsing())
                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
                        isFullyExpanded() && !mQsController.getExpanded())
                .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED,