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

Commit b0768f6a authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix jumping animation when using two-finger expand" into lmp-dev

parents bed17d21 1d49ec9f

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class NotificationPanelView extends PanelView implements 
    private static final int CAP_HEIGHT = 1456;

    private static final int FONT_HEIGHT = 2163;



    private static final float HEADER_RUBBERBAND_FACTOR = 2.15f;

    private static final float HEADER_RUBBERBAND_FACTOR = 2.05f;

    private static final float LOCK_ICON_ACTIVE_SCALE = 1.2f;



    private KeyguardAffordanceHelper mAfforanceHelper;
@@ -1665,7 +1665,7 @@ public class NotificationPanelView extends PanelView implements 
    @Override

    protected boolean fullyExpandedClearAllVisible() {

        return mNotificationStackScroller.isDismissViewNotGone()

                && mNotificationStackScroller.isScrolledToBottom();

                && mNotificationStackScroller.isScrolledToBottom() && !mTwoFingerQsExpand;

    }



    @Override

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

+9 −1
Original line number Diff line number Diff line
@@ -2150,7 +2150,15 @@ public class NotificationStackScrollLayout extends ViewGroup 
    }



    public int getDismissViewHeight() {

        return mDismissView.getHeight() + mPaddingBetweenElementsNormal;

        int height = mDismissView.getHeight() + mPaddingBetweenElementsNormal;



        // Hack: Accommodate for additional distance when we only have one notification and the

        // dismiss all button.

        if (getNotGoneChildCount() == 2 && getLastChildNotGone() == mDismissView

                && getFirstChildNotGone() instanceof ActivatableNotificationView) {

            height += mCollapseSecondCardPadding;

        }

        return height;

    }



    public float getBottomMostNotificationBottom() {