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

Commit 7ec4b805 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge "[Inline Reply] Not mark hasUserExpanded true for pinned notifs" into main

parents 5760c018 424df660

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

+0 −6
Original line number Diff line number Diff line
@@ -371,12 +371,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                setUserExpanded(nowExpanded);

            }



            if (ExpandHeadsUpOnInlineReply.isEnabled() && mExpandable) {

                // it is triggered by the user.

                // So, mHasUserChangedExpansion should be marked true.

                mHasUserChangedExpansion = true;

            }



            notifyHeightChanged(/* needsAnimation= */ true);

            mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded);

            if (shouldLogExpandClickMetric) {

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

+0 −15
Original line number Diff line number Diff line
@@ -1003,21 +1003,6 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        // THEN

        assertThat(row.isExpanded()).isFalse();

    }



    @Test

    @EnableFlags(ExpandHeadsUpOnInlineReply.FLAG_NAME)

    public void hasUserChangedExpansion_expandPinned_returnTrue() throws Exception {

        // GIVEN

        final ExpandableNotificationRow row = mNotificationTestHelper.createRow();

        row.setPinned(true);



        // WHEN

        row.expandNotification();



        // THEN

        assertThat(row.hasUserChangedExpansion()).isTrue();

    }



    @Test

    public void onDisappearAnimationFinished_shouldSetFalse_headsUpAnimatingAway()

            throws Exception {