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

Merge "Fix incorrect icon alignment on shelf" into pi-dev

Browse Source
This commit is contained in:
Selim Cinek
2018-05-02 20:36:24 +00:00
committed by Android (Google) Code Review
parent 150bafd217 4fbeac4381
commit 33540449fc
2 changed files with 10 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

@@ -1635,6 +1635,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
mTranslateableViews.get(i).setTranslationX(0); mTranslateableViews.get(i).setTranslationX(0);
} }
invalidateOutline(); invalidateOutline();
getEntry().expandedIcon.setScrollX(0);
} }
mMenuRow.resetMenu(); mMenuRow.resetMenu();

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

@@ -298,4 +298,13 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {
assertEquals(3, mGroupRow.getNumUniqueChannels()); assertEquals(3, mGroupRow.getNumUniqueChannels());
} }
@Test
public void testIconScrollXAfterTranslationAndReset() throws Exception {
mGroupRow.setTranslation(50);
assertEquals(50, -mGroupRow.getEntry().expandedIcon.getScrollX());
mGroupRow.resetTranslation();
assertEquals(0, mGroupRow.getEntry().expandedIcon.getScrollX());
}
} }