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

Commit 0cce70c9 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix jump in two-finger expand motion with no notifications

Bug: 18185048
Change-Id: Ib54789e45b7b68a5fc9d6056cb53de23b2be3260
parent 946863b6
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1329,6 +1329,16 @@ public class NotificationPanelView extends PanelView implements
        float notificationHeight = mNotificationStackScroller.getHeight()
                - mNotificationStackScroller.getEmptyBottomMargin()
                - mNotificationStackScroller.getTopPadding();

        // When only empty shade view is visible in QS collapsed state, simulate that we would have
        // it in expanded QS state as well so we don't run into troubles when fading the view in/out
        // and expanding/collapsing the whole panel from/to quick settings.
        if (mNotificationStackScroller.getNotGoneChildCount() == 0
                && mShadeEmpty) {
            notificationHeight = mNotificationStackScroller.getEmptyShadeViewHeight()
                    + mNotificationStackScroller.getBottomStackPeekSize()
                    + mNotificationStackScroller.getCollapseSecondCardPadding();
        }
        float totalHeight = Math.max(
                mQsMaxExpansionHeight + mNotificationStackScroller.getNotificationTopPadding(),
                mClockPositionResult.stackScrollerPadding - mTopPaddingAdjustment)
+4 −0
Original line number Diff line number Diff line
@@ -2272,6 +2272,10 @@ public class NotificationStackScrollLayout extends ViewGroup
        return height;
    }

    public int getEmptyShadeViewHeight() {
        return mEmptyShadeView.getHeight();
    }

    public float getBottomMostNotificationBottom() {
        final int count = getChildCount();
        float max = 0;