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

Commit 1455264f authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix end-aligned short-shelf animation" into main

parents e1f6b0a2 e6e0a241

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

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ public class NotificationShelf extends ActivatableNotificationView { 


        // Fade in icons at shelf start

        // This is important for conversation icons, which are badged and need x reset

        iconState.setXTranslation(mShelfIcons.getActualPaddingStart());

        iconState.setXTranslation(mShelfIcons.getLeftBound());



        final boolean stayingInShelf = row.isInShelf() && !row.isTransformingIntoShelf();

        if (stayingInShelf) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/shelf/NotificationShelfIconContainer.kt

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ constructor(context: Context, attrs: AttributeSet? = null) : 
    /**

     * @return The left boundary (not the RTL compatible start) of the area that icons can be added.

     */

    @VisibleForTesting

    public override fun getLeftBound(): Float {

        if (!NotificationMinimalism.isEnabled) {

            return super.getLeftBound()