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

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

Merge "[Inline Reply] Trigger expanded visible listener" into main

parents e5b6f2aa 778dd609

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -258,8 +258,8 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 
        } else {

        } else {

            verify(mGroupExpansionManager).toggleGroupExpansion(enrEntry);

            verify(mGroupExpansionManager).toggleGroupExpansion(enrEntry);

        }

        }

        verify(privateLayout).setOnExpandedVisibleListener(any());

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(privateLayout, never()).setOnExpandedVisibleListener(any());

    }

    }





    @Test

    @Test
@@ -287,10 +287,10 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 
                enr, mock(View.class), false, onExpandedVisibleRunner);

                enr, mock(View.class), false, onExpandedVisibleRunner);





        // THEN

        // THEN

        verify(privateLayout).setOnExpandedVisibleListener(any());

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(enrEntry);

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(enrEntry);

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntryAdapter.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntryAdapter.class));

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(privateLayout, never()).setOnExpandedVisibleListener(any());

    }

    }





    @Test

    @Test
@@ -353,7 +353,7 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 




        // THEN

        // THEN

        verify(enr, never()).toggleExpansionState();

        verify(enr, never()).toggleExpansionState();

        verify(privateLayout, never()).setOnExpandedVisibleListener(onExpandedVisibleRunner);

        verify(privateLayout).setOnExpandedVisibleListener(onExpandedVisibleRunner);

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntry.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntry.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntryAdapter.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntryAdapter.class));
@@ -419,7 +419,7 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 




        // THEN

        // THEN

        verify(enr, never()).toggleExpansionState();

        verify(enr, never()).toggleExpansionState();

        verify(privateLayout, never()).setOnExpandedVisibleListener(onExpandedVisibleRunner);

        verify(privateLayout).setOnExpandedVisibleListener(onExpandedVisibleRunner);

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(enr, never()).setUserExpanded(anyBoolean());

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntry.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntry.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntryAdapter.class));

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any(NotificationEntryAdapter.class));

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -233,9 +233,9 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, 
                    if (expandNotification) {

                    if (expandNotification) {

                        // notification isn't expanded, let's make sure it's expanded!

                        // notification isn't expanded, let's make sure it's expanded!

                        row.toggleExpansionState();

                        row.toggleExpansionState();

                        row.getPrivateLayout().setOnExpandedVisibleListener(runnable);

                    }

                    }

                }

                }

                row.getPrivateLayout().setOnExpandedVisibleListener(runnable);

            } else {

            } else {

                if (row.isChildInGroup() && !row.areChildrenExpanded()) {

                if (row.isChildInGroup() && !row.areChildrenExpanded()) {

                    // The group isn't expanded, let's make sure it's visible!

                    // The group isn't expanded, let's make sure it's visible!