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

Commit c080a9f8 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Optimize SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE flag update frequency"... 

Merge "Optimize SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE flag update frequency" into udc-dev am: 26e2af36

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22698895



Change-Id: I17f221f4159b4cbd400e5b9a7157c65761f8967b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a0538b2 26e2af36

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -3416,8 +3416,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            Log.d(TAG, "Updating panel sysui state flags: fullyExpanded="

                    + isFullyExpanded() + " inQs=" + mQsController.getExpanded());

        }

        boolean isPanelVisible = mCentralSurfaces != null && mCentralSurfaces.isPanelExpanded();

        mSysUiState

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, getExpandedFraction() > 0)

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, isPanelVisible)

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

                        isFullyExpanded() && !mQsController.getExpanded())

                .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED,

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+9 −4
Original line number Diff line number Diff line
@@ -1514,14 +1514,15 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        boolean tracking = event.getTracking();

        dispatchPanelExpansionForKeyguardDismiss(fraction, tracking);



        if (getShadeViewController() != null) {

            getShadeViewController().updateSystemUiStateFlags();

        }



        if (fraction == 0 || fraction == 1) {

            if (getNavigationBarView() != null) {

                getNavigationBarView().onStatusBarPanelStateChanged();

            }

            if (getShadeViewController() != null) {

                // Needed to update SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED and

                // SYSUI_STATE_QUICK_SETTINGS_EXPANDED

                getShadeViewController().updateSystemUiStateFlags();

            }

        }

    }
@@ -1529,6 +1530,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    void onShadeExpansionFullyChanged(Boolean isExpanded) {

        if (mPanelExpanded != isExpanded) {

            mPanelExpanded = isExpanded;

            if (getShadeViewController() != null) {

                // Needed to update SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE

                getShadeViewController().updateSystemUiStateFlags();

            }

            if (isExpanded && mStatusBarStateController.getState() != StatusBarState.KEYGUARD) {

                if (DEBUG) {

                    Log.v(TAG, "clearing notification effects from Height");