Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lyn Han
2021-05-06 22:11:19 +00:00
committed by Android (Google) Code Review
parent 74d99a1b7d 1b37f90770
commit f4a03dcde6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2068,6 +2068,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
int height = 0; int height = 0;
float previousPaddingRequest = mPaddingBetweenElements; float previousPaddingRequest = mPaddingBetweenElements;
int numShownItems = 0; int numShownItems = 0;
int numShownNotifs = 0;
boolean finish = false; boolean finish = false;
int maxDisplayedNotifications = mMaxDisplayedNotifications; int maxDisplayedNotifications = mMaxDisplayedNotifications;
ExpandableView previousView = null; ExpandableView previousView = null;
@@ -2077,7 +2078,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
if (expandableView.getVisibility() != View.GONE if (expandableView.getVisibility() != View.GONE
&& !expandableView.hasNoContentHeight() && !footerViewOnLockScreen) { && !expandableView.hasNoContentHeight() && !footerViewOnLockScreen) {
boolean limitReached = maxDisplayedNotifications != -1 boolean limitReached = maxDisplayedNotifications != -1
&& numShownItems >= maxDisplayedNotifications; && numShownNotifs >= maxDisplayedNotifications;
final float viewHeight; final float viewHeight;
if (limitReached) { if (limitReached) {
viewHeight = mShelf.getIntrinsicHeight(); viewHeight = mShelf.getIntrinsicHeight();
@@ -2090,7 +2091,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
} }
height += calculateGapHeight(previousView, expandableView, numShownItems); height += calculateGapHeight(previousView, expandableView, numShownItems);
height += viewHeight; height += viewHeight;
numShownItems++; numShownItems++;
if (!(expandableView instanceof MediaHeaderView)) {
numShownNotifs++;
}
previousView = expandableView; previousView = expandableView;
if (finish) { if (finish) {
break; break;