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

Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-27 16:56:51 +00:00
committed by Android (Google) Code Review
parent 9f3f150ff3 2aaafaa1a8
commit e077c526d2
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,6 +415,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
private boolean mForwardScrollable; private boolean mForwardScrollable;
private boolean mBackwardScrollable; private boolean mBackwardScrollable;
private NotificationShelf mShelf; private NotificationShelf mShelf;
/**
* Limits the number of visible notifications. The remaining are collapsed in the notification
* shelf. -1 when there is no limit.
*/
private int mMaxDisplayedNotifications = -1; private int mMaxDisplayedNotifications = -1;
private float mKeyguardBottomPadding = -1; private float mKeyguardBottomPadding = -1;
@VisibleForTesting int mStatusBarHeight; @VisibleForTesting int mStatusBarHeight;
@@ -1323,7 +1327,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
} }
private float updateStackEndHeight(float height, float bottomMargin, float topPadding) { private float updateStackEndHeight(float height, float bottomMargin, float topPadding) {
final float stackEndHeight = Math.max(0f, height - bottomMargin - topPadding); final float stackEndHeight;
if (mMaxDisplayedNotifications != -1) {
// The stack intrinsic height already contains the correct value when there is a limit
// in the max number of notifications (e.g. as in keyguard).
stackEndHeight = mIntrinsicContentHeight;
} else {
stackEndHeight = Math.max(0f, height - bottomMargin - topPadding);
}
mAmbientState.setStackEndHeight(stackEndHeight); mAmbientState.setStackEndHeight(stackEndHeight);
return stackEndHeight; return stackEndHeight;
} }