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

Commit ce42fd71 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15133292

Change-Id: Id748386f2c503ee2a30190febc757002473499ba
parents ccff6cdb f9f6e082

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()