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

Commit b8d3417b authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Remove unused removeAllChildren() from ExpandableNotificationRow" into... 

Merge "Remove unused removeAllChildren() from ExpandableNotificationRow" into tm-qpr-dev am: 9ac39f2d am: 314f5b05

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



Change-Id: I7b14fb127ae99dcdbd30249b1be5e430b530f76d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bedef9c2 314f5b05

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+0 −15
Original line number Diff line number Diff line
@@ -1341,21 +1341,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        return mOnKeyguard;

    }



    public void removeAllChildren() {

        List<ExpandableNotificationRow> notificationChildren =

                mChildrenContainer.getAttachedChildren();

        ArrayList<ExpandableNotificationRow> clonedList = new ArrayList<>(notificationChildren);

        for (int i = 0; i < clonedList.size(); i++) {

            ExpandableNotificationRow row = clonedList.get(i);

            if (row.keepInParent()) {

                continue;

            }

            mChildrenContainer.removeNotification(row);

            row.setIsChildInGroup(false, null);

        }

        onAttachedChildrenCountChanged();

    }



    @Override

    public void dismiss(boolean refocusOnDismiss) {

        super.dismiss(refocusOnDismiss);

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+4 −6
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
    @Test

    public void testUserLockedResetEvenWhenNoChildren() {

        mGroupRow.setUserLocked(true);

        mGroupRow.removeAllChildren();

        mGroupRow.setUserLocked(false);

        assertFalse("The childrencontainer should not be userlocked but is, the state "

                + "seems out of sync.", mGroupRow.getChildrenContainer().isUserLocked());
@@ -240,12 +239,11 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 


    @Test

    public void testReinflatedOnDensityChange() {

        mGroupRow.setUserLocked(true);

        mGroupRow.removeAllChildren();

        mGroupRow.setUserLocked(false);

        NotificationChildrenContainer mockContainer = mock(NotificationChildrenContainer.class);

        mGroupRow.setChildrenContainer(mockContainer);

        mGroupRow.onDensityOrFontScaleChanged();

        mNotifRow.setChildrenContainer(mockContainer);



        mNotifRow.onDensityOrFontScaleChanged();



        verify(mockContainer).reInflateViews(any(), any());

    }