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

Commit 1c1ad04c authored by András Kurucz's avatar András Kurucz
Browse files

[Flexiglass] Ensure that NSSL.intrinsicPadding is always 0 with SceneContainer enabled 

Bug: 332574413
Test: make sure that the new assertion is passing
Flag: com.android.systemui.scene_container

Change-Id: I7bc90693a970cb946eda3de23c8a0140e9337edb
parent aba7df49

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

+15 −5
Original line number Diff line number Diff line
@@ -1591,7 +1591,7 @@ public class NotificationStackScrollLayout 
            if (mShouldShowShelfOnly) {

                stackHeight = getTopPadding() + mShelf.getIntrinsicHeight();

            } else if (mQsFullScreen) {

                int stackStartPosition = mContentHeight - getTopPadding() + mIntrinsicPadding;

                int stackStartPosition = mContentHeight - getTopPadding() + getIntrinsicPadding();

                int stackEndPosition = mMaxTopPadding + mShelf.getIntrinsicHeight();

                if (stackStartPosition <= stackEndPosition) {

                    stackHeight = stackEndPosition;
@@ -1776,7 +1776,7 @@ public class NotificationStackScrollLayout 
        } else {

            appearPosition = mEmptyShadeView.getHeight();

        }

        return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding);

        return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding());

    }



    /**
@@ -1802,7 +1802,7 @@ public class NotificationStackScrollLayout 
        } else {

            appearPosition = mEmptyShadeView.getHeight();

        }

        return appearPosition + (onKeyguard() ? getTopPadding() : mIntrinsicPadding);

        return appearPosition + (onKeyguard() ? getTopPadding() : getIntrinsicPadding());

    }



    private boolean isHeadsUpTransition() {
@@ -2505,9 +2505,9 @@ public class NotificationStackScrollLayout 
        // The topPadding can be bigger than the regular padding when qs is expanded, in that

        // state the maxPanelHeight and the contentHeight should be bigger

        mContentHeight =

                (int) (height + Math.max(mIntrinsicPadding, getTopPadding()) + mBottomPadding);

                (int) (height + Math.max(getIntrinsicPadding(), getTopPadding()) + mBottomPadding);

        mScrollViewFields.setIntrinsicStackHeight(

                (int) (mIntrinsicPadding + mIntrinsicContentHeight + footerIntrinsicHeight

                (int) (getIntrinsicPadding() + mIntrinsicContentHeight + footerIntrinsicHeight

                        + mBottomPadding));

        updateScrollability();

        clampScrollPosition();
@@ -4551,10 +4551,20 @@ public class NotificationStackScrollLayout 
    }



    void setIntrinsicPadding(int intrinsicPadding) {

        SceneContainerFlag.assertInLegacyMode();

        mIntrinsicPadding = intrinsicPadding;

    }



    /**

     * Distance from the top of the screen in, where notifications should start when fully expanded

     * or in the LS.

     *

     * Always 0 with SceneContainer enabled.

     */

    int getIntrinsicPadding() {

        if (SceneContainerFlag.isEnabled()) {

            return 0;

        }

        return mIntrinsicPadding;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
    }



    public void setIntrinsicPadding(int intrinsicPadding) {

        SceneContainerFlag.assertInLegacyMode();

        mView.setIntrinsicPadding(intrinsicPadding);

    }