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

Commit 695f21a6 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Fixed an issue where the icons had the wrong color" into oc-dev

parents 2ff366a3 a7c69637

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

+1 −0
Original line number Diff line number Diff line
@@ -1395,6 +1395,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
@@ -95,4 +95,11 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        row.setHideSensitive(true, false, 0, 0);

        verify(row).updateShelfIconColor();

    }



    @Test

    public void testIconColorShouldBeUpdatedWhenSettingDark() throws Exception {

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

        row.setDark(true, false, 0);

        verify(row).updateShelfIconColor();

    }

}