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

Commit 5eee5988 authored by Ian Pedowitz's avatar Ian Pedowitz
Browse files

resolve merge conflicts of 7ea4f66f to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
parents 1520d813 7ea4f66f

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

+1 −0
Original line number Diff line number Diff line
@@ -1451,6 +1451,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        if (mIsSummaryWithChildren) {

            mChildrenContainer.setDark(dark, fade, delay);

        }

        updateShelfIconColor();

    }



    public boolean isExpandable() {

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

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        verify(row).updateShelfIconColor();

    }



    @Test

    public void testIconColorShouldBeUpdatedWhenSettingDark() throws Exception {

        ExpandableNotificationRow row = spy(mNotificationTestHelper.createRow());

        row.setDark(true, false, 0);

        verify(row).updateShelfIconColor();

    }



    @Test

    public void testAboveShelfChangedListenerCalled() throws Exception {

        ExpandableNotificationRow row = mNotificationTestHelper.createRow();