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

Commit 865d21d3 authored by omarmt's avatar omarmt Committed by Android Build Coastguard Worker
Browse files

Fix notifications wrong corners after "clear all" 

If "Clear all" is pressed in the notification shelf, some notifications may remain with an incorrect roundness state. The solution is to call onSwipeEnd() for each notification at the end of the animation to allow the notification to correctly manage its state.

Test: atest NotificationStackScrollLayoutControllerTest
Bug: 287740047
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1e4f626c92d4937aca3fdb3f146a11d888c98f0)
Merged-In: Iaa1d831b00738acfdfa2309a48a9f54d554300bc
Change-Id: Iaa1d831b00738acfdfa2309a48a9f54d554300bc
parent b85caac0

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+4 −2
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ public class NotificationStackScrollLayoutController { 
        }

    };



    private final NotificationSwipeHelper.NotificationCallback mNotificationCallback =

    @VisibleForTesting

    final NotificationSwipeHelper.NotificationCallback mNotificationCallback =

            new NotificationSwipeHelper.NotificationCallback() {



                @Override
@@ -470,10 +471,11 @@ public class NotificationStackScrollLayoutController { 
                 */



                public void handleChildViewDismissed(View view) {

                    // The View needs to clean up the Swipe states, e.g. roundness.

                    mView.onSwipeEnd();

                    if (mView.getClearAllInProgress()) {

                        return;

                    }

                    mView.onSwipeEnd();

                    if (view instanceof ExpandableNotificationRow) {

                        ExpandableNotificationRow row = (ExpandableNotificationRow) view;

                        if (row.isHeadsUp()) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java

+31 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.systemui.statusbar.notification.collection.render.SectionHead 
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController.NotificationPanelEvent;

import com.android.systemui.statusbar.notification.stack.NotificationSwipeHelper.NotificationCallback;

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationListViewModel;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
@@ -338,6 +339,36 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
                MetricsProto.MetricsEvent.TYPE_ACTION));

    }



    @Test

    public void callSwipeCallbacksDuringClearAll() {

        initController(/* viewIsAttached= */ true);

        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        NotificationCallback notificationCallback = mController.mNotificationCallback;



        when(mNotificationStackScrollLayout.getClearAllInProgress()).thenReturn(true);



        notificationCallback.onBeginDrag(row);

        verify(mNotificationStackScrollLayout).onSwipeBegin(row);



        notificationCallback.handleChildViewDismissed(row);

        verify(mNotificationStackScrollLayout).onSwipeEnd();

    }



    @Test

    public void callSwipeCallbacksDuringClearNotification() {

        initController(/* viewIsAttached= */ true);

        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        NotificationCallback notificationCallback = mController.mNotificationCallback;



        when(mNotificationStackScrollLayout.getClearAllInProgress()).thenReturn(false);



        notificationCallback.onBeginDrag(row);

        verify(mNotificationStackScrollLayout).onSwipeBegin(row);



        notificationCallback.handleChildViewDismissed(row);

        verify(mNotificationStackScrollLayout).onSwipeEnd();

    }



    @Test

    public void testOnMenuClickedLogging() {

        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class, RETURNS_DEEP_STUBS);