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

Merge "Fix fluctuating notification height during shade open" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-18 06:58:43 +00:00
committed by Android (Google) Code Review
parent 846ae25be5 1d9a175ae7
commit 51f0592fe6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1142,7 +1142,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
if (mQsExpansionFraction <= 0) {
final float scrimTopPadding = mAmbientState.isOnKeyguard() ? 0 : mSidePaddings;
final float stackEndHeight = Math.max(0f,
getHeight() - getEmptyBottomMargin() - stackY);
getHeight() - getEmptyBottomMargin() - mTopPadding);
mAmbientState.setStackEndHeight(stackEndHeight);
mAmbientState.setStackHeight(
MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,

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

@@ -348,14 +348,14 @@ public class StackScrollAlgorithm {
StackScrollAlgorithmState algorithmState,
AmbientState ambientState) {
final boolean isShowingShelf = ambientState.getShelf() != null
final boolean showingShelf = ambientState.getShelf() != null
&& algorithmState.firstViewInShelf != null;
final float stackHeight = ambientState.getStackHeight()
- (isShowingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f);
final float shelfHeight = showingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f;
final float scrimPadding = ambientState.isOnKeyguard() ? 0 : mNotificationScrimPadding;
float stackEndHeight = ambientState.getStackEndHeight()
- (isShowingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f);
final float stackHeight = ambientState.getStackHeight() - shelfHeight - scrimPadding;
final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding;
return stackHeight / stackEndHeight;
}
@@ -459,8 +459,7 @@ public class StackScrollAlgorithm {
maxViewHeight = algorithmState.viewHeightBeforeShelf;
}
}
viewState.height = (int) MathUtils.lerp(maxViewHeight * START_FRACTION, maxViewHeight,
expansionFraction);
viewState.height = (int) (maxViewHeight * expansionFraction);
}
currentYPosition += viewState.height + expansionFraction * mPaddingBetweenElements;