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

Commit 84912122 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where the shade would jump" into oc-dev 

am: 1e2340da

Change-Id: I8afe831ef47d877b57535919cbd135eee9b5a93a
parents c08a4026 1e2340da

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

+3 −2
Original line number Diff line number Diff line
@@ -815,7 +815,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
     */

    private float getAppearEndPosition() {

        int appearPosition;

        if (mEmptyShadeView.getVisibility() == GONE) {

        int notGoneChildCount = getNotGoneChildCount();

        if (mEmptyShadeView.getVisibility() == GONE && notGoneChildCount != 0) {

            int minNotificationsForShelf = 1;

            if (mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp()) {

                appearPosition = mHeadsUpManager.getTopHeadsUpPinnedHeight();
@@ -823,7 +824,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
            } else {

                appearPosition = 0;

            }

            if (getNotGoneChildCount() >= minNotificationsForShelf) {

            if (notGoneChildCount >= minNotificationsForShelf) {

                appearPosition += mShelf.getIntrinsicHeight();

            }

        } else {