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

Commit 9410a384 authored by Steve Elliott's avatar Steve Elliott
Browse files

Remove NSSL#isChildInInvisibleGroup 

This method has been made irrelevant with the new pipeline; Notification
that would return "true" here are now pruned from the NSSL entirely by
the ShadeListBuilder, so this method will always return false.

Bug: 145659174
Test: atest SystemUITests
Change-Id: I65d67bf90084e704b41774404c83e40200b0331a
parent 92d75db8

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

+2 −23
Original line number Diff line number Diff line
@@ -2794,10 +2794,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (mDebugRemoveAnimation) {

            Log.d(TAG, "generateRemove " + key

                    + "\nmIsExpanded " + mIsExpanded

                    + "\nmAnimationsEnabled " + mAnimationsEnabled

                    + "\n!invisible group " + !isChildInInvisibleGroup(child));

                    + "\nmAnimationsEnabled " + mAnimationsEnabled);

        }

        if (mIsExpanded && mAnimationsEnabled && !isChildInInvisibleGroup(child)) {

        if (mIsExpanded && mAnimationsEnabled) {

            if (!mChildrenToAddAnimated.contains(child)) {

                if (mDebugRemoveAnimation) {

                    Log.d(TAG, "needsAnimation = true " + key);
@@ -2845,26 +2844,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        return hasAddEvent && mAddedHeadsUpChildren.contains(child);

    }



    // TODO (b/162832756): remove since this won't happen in new pipeline (we prune groups in

    //  ShadeListBuilder)

    /**

     * @param child the child to query

     * @return whether a view is not a top level child but a child notification and that group is

     * not expanded

     */

    @ShadeViewRefactor(RefactorComponent.ADAPTER)

    private boolean isChildInInvisibleGroup(View child) {

        if (child instanceof ExpandableNotificationRow) {

            ExpandableNotificationRow row = (ExpandableNotificationRow) child;

            NotificationEntry groupSummary =

                    mGroupMembershipManager.getGroupSummary(row.getEntry());

            if (groupSummary != null && groupSummary.getRow() != row) {

                return row.getVisibility() == View.INVISIBLE;

            }

        }

        return false;

    }



    /**

     * Updates the scroll position when a child was removed

     *