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

Commit 7f882a5e authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Reset the clearAllInProgress flag when the shade is collapsed" into... 

Merge "Reset the clearAllInProgress flag when the shade is collapsed" into udc-dev am: ee9049be am: ebb8ce22

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



Change-Id: I6958cd56b759063233473ee5bb389aa35b43d96c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e32454ab ebb8ce22

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

+19 −6
Original line number Original line Diff line number Diff line
@@ -4079,6 +4079,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
                if (!mIsExpansionChanging) {

                if (!mIsExpansionChanging) {

                    cancelActiveSwipe();

                    cancelActiveSwipe();

                }

                }

                finalizeClearAllAnimation();

            }

            }

            updateNotificationAnimationStates();

            updateNotificationAnimationStates();

            updateChronometers();

            updateChronometers();
@@ -4174,19 +4175,29 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        runAnimationFinishedRunnables();

        runAnimationFinishedRunnables();

        clearTransient();

        clearTransient();

        clearHeadsUpDisappearRunning();

        clearHeadsUpDisappearRunning();

        finalizeClearAllAnimation();

    }





    private void finalizeClearAllAnimation() {

        if (mAmbientState.isClearAllInProgress()) {

        if (mAmbientState.isClearAllInProgress()) {

            setClearAllInProgress(false);

            setClearAllInProgress(false);

            if (mShadeNeedsToClose) {

            if (mShadeNeedsToClose) {

                mShadeNeedsToClose = false;

                mShadeNeedsToClose = false;

                if (mIsExpanded) {

                    collapseShadeDelayed();

                }

            }

        }

    }



    private void collapseShadeDelayed() {

        postDelayed(

        postDelayed(

                () -> {

                () -> {

                            mShadeController.animateCollapseShade(CommandQueue.FLAG_EXCLUDE_NONE);

                    mShadeController.animateCollapseShade(

                            CommandQueue.FLAG_EXCLUDE_NONE);

                },

                },

                DELAY_BEFORE_SHADE_CLOSE /* delayMillis */);

                DELAY_BEFORE_SHADE_CLOSE /* delayMillis */);

    }

    }

        }

    }





    private void clearHeadsUpDisappearRunning() {

    private void clearHeadsUpDisappearRunning() {

        for (int i = 0; i < getChildCount(); i++) {

        for (int i = 0; i < getChildCount(); i++) {
@@ -4535,6 +4546,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mFooterView.setFooterLabelVisible(mHasFilteredOutSeenNotifications);

        mFooterView.setFooterLabelVisible(mHasFilteredOutSeenNotifications);

    }

    }





    @VisibleForTesting

    public void setClearAllInProgress(boolean clearAllInProgress) {

    public void setClearAllInProgress(boolean clearAllInProgress) {

        mClearAllInProgress = clearAllInProgress;

        mClearAllInProgress = clearAllInProgress;

        mAmbientState.setClearAllInProgress(clearAllInProgress);

        mAmbientState.setClearAllInProgress(clearAllInProgress);
@@ -5151,7 +5163,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mHeadsUpAppearanceController = headsUpAppearanceController;

        mHeadsUpAppearanceController = headsUpAppearanceController;

    }

    }





    private boolean isVisible(View child) {

    @VisibleForTesting

    public boolean isVisible(View child) {

        boolean hasClipBounds = child.getClipBounds(mTmpRect);

        boolean hasClipBounds = child.getClipBounds(mTmpRect);

        return child.getVisibility() == View.VISIBLE

        return child.getVisibility() == View.VISIBLE

                && (!hasClipBounds || mTmpRect.height() > 0);

                && (!hasClipBounds || mTmpRect.height() > 0);

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

+61 −4
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import static org.mockito.Mockito.atLeastOnce; 
import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;
@@ -575,10 +576,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScroller.inflateFooterView();

        mStackScroller.inflateFooterView();





        // add notification

        // add notification

        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        ExpandableNotificationRow row = createClearableRow();

        NotificationEntry entry = mock(NotificationEntry.class);

        when(row.getEntry()).thenReturn(entry);

        when(entry.isClearable()).thenReturn(true);

        mStackScroller.addContainerView(row);

        mStackScroller.addContainerView(row);





        mStackScroller.onUpdateRowStates();

        mStackScroller.onUpdateRowStates();
@@ -647,6 +645,50 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        assertEquals(ROWS_GENTLE, selected[0]);

        assertEquals(ROWS_GENTLE, selected[0]);

    }

    }





    @Test

    public void testClearNotifications_clearAllInProgress() {

        ExpandableNotificationRow row = createClearableRow();

        when(row.getEntry().hasFinishedInitialization()).thenReturn(true);

        doReturn(true).when(mStackScroller).isVisible(row);

        mStackScroller.addContainerView(row);



        mStackScroller.clearNotifications(ROWS_ALL, false);



        assertClearAllInProgress(true);

        verify(mNotificationRoundnessManager).setClearAllInProgress(true);

    }



    @Test

    public void testOnChildAnimationFinished_resetsClearAllInProgress() {

        mStackScroller.setClearAllInProgress(true);



        mStackScroller.onChildAnimationFinished();



        assertClearAllInProgress(false);

        verify(mNotificationRoundnessManager).setClearAllInProgress(false);

    }



    @Test

    public void testShadeCollapsed_resetsClearAllInProgress() {

        mStackScroller.setClearAllInProgress(true);



        mStackScroller.setIsExpanded(false);



        assertClearAllInProgress(false);

        verify(mNotificationRoundnessManager).setClearAllInProgress(false);

    }



    @Test

    public void testShadeExpanded_doesntChangeClearAllInProgress() {

        mStackScroller.setClearAllInProgress(true);

        clearInvocations(mNotificationRoundnessManager);



        mStackScroller.setIsExpanded(true);



        assertClearAllInProgress(true);

        verify(mNotificationRoundnessManager, never()).setClearAllInProgress(anyBoolean());

    }



    @Test

    @Test

    public void testAddNotificationUpdatesSpeedBumpIndex() {

    public void testAddNotificationUpdatesSpeedBumpIndex() {

        // initial state calculated == 0

        // initial state calculated == 0
@@ -896,6 +938,21 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScroller.setStatusBarState(state);

        mStackScroller.setStatusBarState(state);

    }

    }





    private ExpandableNotificationRow createClearableRow() {

        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        NotificationEntry entry = mock(NotificationEntry.class);

        when(row.canViewBeCleared()).thenReturn(true);

        when(row.getEntry()).thenReturn(entry);

        when(entry.isClearable()).thenReturn(true);



        return row;

    }



    private void assertClearAllInProgress(boolean expected) {

        assertEquals(expected, mStackScroller.getClearAllInProgress());

        assertEquals(expected, mAmbientState.isClearAllInProgress());

    }



    private static void mockBoundsOnScreen(View view, Rect bounds) {

    private static void mockBoundsOnScreen(View view, Rect bounds) {

        doAnswer(invocation -> {

        doAnswer(invocation -> {

            Rect out = invocation.getArgument(0);

            Rect out = invocation.getArgument(0);