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

Merge "Appear notifications at min height instead of 0 height" into sc-dev

Browse Source
This commit is contained in:
Lyn Han
2021-05-04 21:54:41 +00:00
committed by Android (Google) Code Review
parent 83d4508a12 317e3b44fd
commit 61b39c06df
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1143,16 +1143,18 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
*/
private void updateStackPosition() {
// Consider interpolating from an mExpansionStartY for use on lockscreen and AOD
final float stackY = MathUtils.lerp(0, mTopPadding, mAmbientState.getExpansionFraction());
final float fraction = mAmbientState.getExpansionFraction();
final float stackY = MathUtils.lerp(0, mTopPadding, fraction);
mAmbientState.setStackY(stackY);
if (mOnStackYChanged != null) {
mOnStackYChanged.run();
}
final float shadeBottom = getHeight() - getEmptyBottomMargin();
mAmbientState.setStackEndHeight(shadeBottom - mTopPadding);
final float stackEndHeight = getHeight() - getEmptyBottomMargin() - mTopPadding;
mAmbientState.setStackEndHeight(stackEndHeight);
mAmbientState.setStackHeight(
MathUtils.lerp(0, shadeBottom - mTopPadding, mAmbientState.getExpansionFraction()));
MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,
stackEndHeight, fraction));
}
void setOnStackYChanged(Runnable onStackYChanged) {

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

@@ -42,6 +42,8 @@ import java.util.List;
*/
public class StackScrollAlgorithm {
public static final float START_FRACTION = 0.3f;
private static final String LOG_TAG = "StackScrollAlgorithm";
private final ViewGroup mHostView;
@@ -442,7 +444,8 @@ public class StackScrollAlgorithm {
maxViewHeight = algorithmState.viewHeightBeforeShelf;
}
}
viewState.height = (int) MathUtils.lerp(0, maxViewHeight, expansionFraction);
viewState.height = (int) MathUtils.lerp(maxViewHeight * START_FRACTION, maxViewHeight,
expansionFraction);
}
currentYPosition += viewState.height + expansionFraction * mPaddingBetweenElements;