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

Commit 5a647dea authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

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

am: 33540449

Change-Id: I11b7166b0179b28a347dfa017f7681ef5e93c1fd
parents cc6e8565 33540449

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+1 −0
Original line number Diff line number Diff line
@@ -1635,6 +1635,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                mTranslateableViews.get(i).setTranslationX(0);

            }

            invalidateOutline();

            getEntry().expandedIcon.setScrollX(0);

        }



        mMenuRow.resetMenu();

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

+9 −0
Original line number Diff line number Diff line
@@ -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());

    }

}