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

Commit 6acb12d5 authored by Selim Cinek's avatar Selim Cinek Committed by Ian Pedowitz
Browse files

Fixed an issue where the icons had the wrong color 

The color of the icons was taken from the ambient view
and wasn't updated when dark changed.

(cherry picked from commit a7c69637)

Change-Id: I558447f282bb54f13be1622c3f2528a383fbc3b7
Fixes: 62423352
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
parent 90ec96bc

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();