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

Commit 0ea604ca authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e77 am:... 

Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e77 am: f6b4f625 am: 8962276c

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



Change-Id: I7ac59c7c7754deb03f7825f55304c0856d50e89c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bfbe508 8962276c

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) {