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

Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev

Browse Source
This commit is contained in:
Ian Pedowitz
2017-06-08 05:42:13 +00:00
committed by Android (Google) Code Review
parent 89d6859dc4 a27856d443
commit be261948cb
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

@@ -1451,6 +1451,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

@@ -98,6 +98,13 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {
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();
}
@Test @Test
public void testAboveShelfChangedListenerCalled() throws Exception { public void testAboveShelfChangedListenerCalled() throws Exception {
ExpandableNotificationRow row = mNotificationTestHelper.createRow(); ExpandableNotificationRow row = mNotificationTestHelper.createRow();