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

Commit c4a06403 authored by Alex Florescu's avatar Alex Florescu Committed by Android (Google) Code Review
Browse files

Merge "Fix split-shade expansion animation on non-lockscreen." into tm-qpr-dev

parents 4f677e9d 1775617a

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

+0 −5
Original line number Diff line number Diff line
@@ -1371,12 +1371,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
     */

    @ShadeViewRefactor(RefactorComponent.COORDINATOR)

    public void setExpandedHeight(float height) {

        final float shadeBottom = getHeight() - getEmptyBottomMargin();

        final boolean skipHeightUpdate = shouldSkipHeightUpdate();

        if (!skipHeightUpdate) {

            final float expansionFraction = MathUtils.saturate(height / shadeBottom);

            mAmbientState.setExpansionFraction(expansionFraction);

        }

        updateStackPosition();



        if (!skipHeightUpdate) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java

+1 −0
Original line number Diff line number Diff line
@@ -808,6 +808,7 @@ public abstract class PanelViewController { 
            mExpansionDragDownAmountPx = h;

            mExpandedFraction = Math.min(1f,

                    maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight);

            mAmbientState.setExpansionFraction(mExpandedFraction);

            onHeightUpdated(mExpandedHeight);

            updatePanelExpansionAndVisibility();

        });