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

Commit f9f6e082 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Fix the premature hiding of notifications while expanding QS." into sc-dev

parents 02cb86c4 053aa627

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -420,8 +420,9 @@ public class StackScrollAlgorithm { 
                // When pulsing (incoming notification on AOD), innerHeight is 0; clamp all

                // When pulsing (incoming notification on AOD), innerHeight is 0; clamp all

                // to shelf start, thereby hiding all notifications (except the first one, which we

                // to shelf start, thereby hiding all notifications (except the first one, which we

                // later unhide in updatePulsingState)

                // later unhide in updatePulsingState)

                final int shelfStart = ambientState.getInnerHeight()

                final int stackBottom = !ambientState.isShadeExpanded() || ambientState.isDozing()

                        - ambientState.getShelf().getIntrinsicHeight();

                        ? ambientState.getInnerHeight() : (int) ambientState.getStackHeight();

                final int shelfStart = stackBottom - ambientState.getShelf().getIntrinsicHeight();

                viewState.yTranslation = Math.min(viewState.yTranslation, shelfStart);

                viewState.yTranslation = Math.min(viewState.yTranslation, shelfStart);

                if (viewState.yTranslation >= shelfStart) {

                if (viewState.yTranslation >= shelfStart) {

                    viewState.hidden = !view.isExpandAnimationRunning()

                    viewState.hidden = !view.isExpandAnimationRunning()