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

Commit ad4b41ad authored by Aaron Liu's avatar Aaron Liu
Browse files

[Bouncer] Fix overlap from notif shade 

Noticed there is in notif shade if we swipe from bottom to show bouncer.
This is a regression that was caused in ag/17697952.

Fixes: 226108150
Test: Manual on phone device
Change-Id: Ic8c1a1ea871f009a592097b77e5a96bbdec9d6ba
parent b5310919

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

+5 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.graphics.ColorUtils;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.policy.SystemBarUtils;

import com.android.keyguard.BouncerPanelExpansionCalculator;

import com.android.keyguard.KeyguardSliceView;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;
@@ -1313,7 +1314,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        final float endTopPosition = mTopPadding + mExtraTopInsetForFullShadeTransition

                + mAmbientState.getOverExpansion()

                - getCurrentOverScrollAmount(false /* top */);

        final float fraction = mAmbientState.getExpansionFraction();

        float fraction = mAmbientState.getExpansionFraction();

        if (mAmbientState.isBouncerInTransit()) {

            fraction = BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(fraction);

        }

        final float stackY = MathUtils.lerp(0, endTopPosition, fraction);

        mAmbientState.setStackY(stackY);

        if (mOnStackYChanged != null) {