Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46c20bf1 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Appear notifications at min height instead of 0 height" into sc-dev am: 61b39c06 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14416118

Change-Id: I798211eee91f9f3f2631001972a367508f07ff4d
parents b2abd801 61b39c06

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

+6 −4
Original line number Diff line number Diff line
@@ -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) {

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

+4 −1
Original line number Diff line number Diff line
@@ -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;