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

Commit b267edb9 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix bug where lockscreen notification is minimized and not dismissable"... 

Merge "Fix bug where lockscreen notification is minimized and not dismissable" into sc-dev am: f4a03dcd

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

Change-Id: Ia3015d11f93baf86b2b5e2961d9c5cc934a047b4
parents 0dff6028 f4a03dcd

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+6 −1
Original line number Diff line number Diff line
@@ -2068,6 +2068,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        int height = 0;

        float previousPaddingRequest = mPaddingBetweenElements;

        int numShownItems = 0;

        int numShownNotifs = 0;

        boolean finish = false;

        int maxDisplayedNotifications = mMaxDisplayedNotifications;

        ExpandableView previousView = null;
@@ -2077,7 +2078,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            if (expandableView.getVisibility() != View.GONE

                    && !expandableView.hasNoContentHeight() && !footerViewOnLockScreen) {

                boolean limitReached = maxDisplayedNotifications != -1

                        && numShownItems >= maxDisplayedNotifications;

                        && numShownNotifs >= maxDisplayedNotifications;

                final float viewHeight;

                if (limitReached) {

                    viewHeight = mShelf.getIntrinsicHeight();
@@ -2090,7 +2091,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
                }

                height += calculateGapHeight(previousView, expandableView, numShownItems);

                height += viewHeight;



                numShownItems++;

                if (!(expandableView instanceof MediaHeaderView)) {

                    numShownNotifs++;

                }

                previousView = expandableView;

                if (finish) {

                    break;