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

Commit 15da7c98 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-31e2cf59f8e14c2cb90f5ce39ffc53ba" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] Fix bug where shade is infinitely squishy after wallpaper change 2p: cf293657
  Fix bug where shade is infinitely squishy after wallpaper change
parents 0a358cb1 b00ba732

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

+1 −1
Original line number Diff line number Diff line
@@ -279,11 +279,11 @@ public class NotificationStackScrollLayoutController { 


        @Override

        public void onThemeChanged() {

            updateShowEmptyShadeView();

            mView.updateCornerRadius();

            mView.updateBgColor();

            mView.updateDecorViews();

            mView.reinflateViews();

            updateShowEmptyShadeView();

            updateFooter();

        }

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

+5 −0
Original line number Diff line number Diff line
@@ -376,6 +376,11 @@ public class StackScrollAlgorithm { 


        final float stackHeight = ambientState.getStackHeight()  - shelfHeight - scrimPadding;

        final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding;

        if (stackEndHeight == 0f) {

            // This should not happen, since even when the shade is empty we show EmptyShadeView

            // but check just in case, so we don't return infinity or NaN.

            return 0f;

        }

        return stackHeight / stackEndHeight;

    }