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

Merge "Fix bug where shade is infinitely squishy after wallpaper change" into sc-v2-dev

Browse Source
This commit is contained in:
Lyn Han
2022-02-11 01:19:08 +00:00
committed by Android (Google) Code Review
parent d7d3c2d96b cf293657bf
commit 16e1d5104c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
View File

@@ -279,11 +279,11 @@ public class NotificationStackScrollLayoutController {
@Override @Override
public void onThemeChanged() { public void onThemeChanged() {
updateShowEmptyShadeView();
mView.updateCornerRadius(); mView.updateCornerRadius();
mView.updateBgColor(); mView.updateBgColor();
mView.updateDecorViews(); mView.updateDecorViews();
mView.reinflateViews(); mView.reinflateViews();
updateShowEmptyShadeView();
updateFooter(); updateFooter();
} }

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
View File

@@ -376,6 +376,11 @@ public class StackScrollAlgorithm {
final float stackHeight = ambientState.getStackHeight() - shelfHeight - scrimPadding; final float stackHeight = ambientState.getStackHeight() - shelfHeight - scrimPadding;
final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding; final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding;
if (stackEndHeight == 0f) {
// This should not happen, since even when the shade is empty we show EmptyShadeView
// but check just in case, so we don't return infinity or NaN.
return 0f;
}
return stackHeight / stackEndHeight; return stackHeight / stackEndHeight;
} }