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

Commit 7d016d76 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null checks for notification shelf" into sc-dev am: cecbd506 

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

Change-Id: Ia04529623505c0823281112f3c7bce74b634154e
parents 5d20649a cecbd506

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

+18 −12
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ public class StackScrollAlgorithm { 
                currentY += mGapHeight;

            }



            if (ambientState.getShelf() != null) {

                // Save index of first view in the shelf

                final float shelfStart = ambientState.getStackEndHeight()

                        - ambientState.getShelf().getIntrinsicHeight();
@@ -280,6 +281,7 @@ public class StackScrollAlgorithm { 
                        && state.firstViewInShelf == null) {

                    state.firstViewInShelf = view;

                }

            }



            // Record y position when fully expanded

            ExpansionData expansionData = new ExpansionData();
@@ -298,11 +300,15 @@ public class StackScrollAlgorithm { 
                float sectionEnd = state.expansionData.get(sectionEndView).fullyExpandedY

                        + sectionEndView.getIntrinsicHeight();



                if (ambientState.getShelf() != null) {

                    // If we show the shelf, trim section end to shelf start

                    // This means section end > start for views in the shelf

                    final float shelfStart = ambientState.getStackEndHeight()

                            - ambientState.getShelf().getIntrinsicHeight();

                    if (state.firstViewInShelf != null && sectionEnd > shelfStart) {

                        sectionEnd = shelfStart;

                    }

                }



                // Update section bounds of every view in the previous section

                // Consider using shared SectionInfo for views in same section to avoid looping back
@@ -460,7 +466,7 @@ public class StackScrollAlgorithm { 
                        && i >= algorithmState.visibleChildren.indexOf(

                                algorithmState.firstViewInShelf)

                        && !(view instanceof FooterView);

            } else {

            } else if (ambientState.getShelf() != null) {

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

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

                // later unhide in updatePulsingState)