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

Commit e7319690 authored by Omar Miatello's avatar Omar Miatello Committed by Automerger Merge Worker
Browse files

Merge "Fix notifications wrong corners after "clear all"" into udc-dev am:... 

Merge "Fix notifications wrong corners after "clear all"" into udc-dev am: 3620213c am: bf7df3ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23793183



Change-Id: I366832369f29e45b667568763fba017c19203374
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 949e6eaf bf7df3ed

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);