Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 695f21a661

Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086
This commit is contained in:
Ian Pedowitz
2017-06-08 00:10:39 +00:00
committed by android-build-merger
parent b42e50a3a0 695f21a661
commit 7ea4f66f35
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -1395,6 +1395,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
if (mIsSummaryWithChildren) { if (mIsSummaryWithChildren) {
mChildrenContainer.setDark(dark, fade, delay); mChildrenContainer.setDark(dark, fade, delay);
} }
updateShelfIconColor();
} }
public boolean isExpandable() { public boolean isExpandable() {

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

@@ -95,4 +95,11 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {
row.setHideSensitive(true, false, 0, 0); row.setHideSensitive(true, false, 0, 0);
verify(row).updateShelfIconColor(); verify(row).updateShelfIconColor();
} }
@Test
public void testIconColorShouldBeUpdatedWhenSettingDark() throws Exception {
ExpandableNotificationRow row = spy(mNotificationTestHelper.createRow());
row.setDark(true, false, 0);
verify(row).updateShelfIconColor();
}
} }