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

Commit d0461971 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Fix notifications z-height when they don't have shadows." into sc-dev am: 824fa2d2 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4d1d6bd5d4a4620d03ff4047a6ff53bc1e57a5a
parents f090aa88 824fa2d2

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+1 −2
Original line number Diff line number Diff line
@@ -2052,8 +2052,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                mNotificationLaunchHeight,

                zProgress);

        setTranslationZ(translationZ);

        float extraWidthForClipping = params.getWidth() - getWidth()

                + MathUtils.lerp(0, mOutlineRadius * 2, params.getProgress());

        float extraWidthForClipping = params.getWidth() - getWidth();

        setExtraWidthForClipping(extraWidthForClipping);

        int top = params.getTop();

        float interpolation = Interpolators.FAST_OUT_SLOW_IN.getInterpolation(params.getProgress());

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

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class AmbientState { 
     */

    public static int getNotificationLaunchHeight(Context context) {

        int zDistance = getZDistanceBetweenElements(context);

        return getBaseHeight(zDistance) * 2;

        return NOTIFICATIONS_HAVE_SHADOWS ? 2 * getBaseHeight(zDistance) : 4 * zDistance;

    }



    /**