drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert logic to calculate StackEndHeight

Browse Source 
This partially reverts the logic to compute the stackEndHeight, as it doesn't make the shelf stick at the bottom when scrolling notifications. This might reintroduce the bug of trimmed notifications on lockscreen, that will be addressed in another cl.

Bug: 227733494
Bug: 214504318
Fixes: 226054279
Test: Test: atest ShelfInvisibleWithLowNotifications && atest ShelfVisibleAtTheBottom
Change-Id: I20286eb961d46439a0d80980c085a41b93241cb8
This commit is contained in:
Nicolo' Mazzucato 2022-04-01 13:49:52 +02:00
parent 8599104286
commit 1352b07488
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1315,14 +1315,15 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
if (mOnStackYChanged != null) {
mOnStackYChanged.accept(listenerNeedsAnimation);
}
if ((mQsExpansionFraction <= 0 || !mQsFullScreen) && !shouldSkipHeightUpdate()) {
final float endHeight = updateStackEndHeight();
if (mQsExpansionFraction <= 0 && !shouldSkipHeightUpdate()) {
final float endHeight = updateStackEndHeight(
getHeight(), getEmptyBottomMargin(), mTopPadding);
updateStackHeight(endHeight, fraction);
}
}
private float updateStackEndHeight() {
final float stackEndHeight = Math.max(0f, mIntrinsicContentHeight);
private float updateStackEndHeight(float height, float bottomMargin, float topPadding) {
final float stackEndHeight = Math.max(0f, height - bottomMargin - topPadding);
mAmbientState.setStackEndHeight(stackEndHeight);
return stackEndHeight;
}