diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java | 1 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 3efeb6ed2d69..27fa48aee216 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -1635,6 +1635,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView mTranslateableViews.get(i).setTranslationX(0); } invalidateOutline(); + getEntry().expandedIcon.setScrollX(0); } mMenuRow.resetMenu(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java index ab042d4ce491..2a4a5adb7d0f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java @@ -298,4 +298,13 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 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()); + } } |