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

Commit c14ae582 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6182290 from 25f9b23c to qt-qpr3-release 

Change-Id: I21f2db0ee5f5fe5ef5a58b4a73ed462aba02c366
parents 0836d2f7 25f9b23c

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

+5 −2
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        mRoundnessManager.setAnimatedChildren(mChildrenToAddAnimated);

        mRoundnessManager.setOnRoundingChangedCallback(this::invalidate);

        addOnExpandedHeightChangedListener(mRoundnessManager::setExpanded);

        mLockscreenUserManager.addUserChangedListener(userId ->

                updateSensitiveness(false /* animated */));

        setOutlineProvider(mOutlineProvider);



        // Blocking helper manager wants to know the expanded state, update as well.
@@ -4602,7 +4604,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    private void setHideSensitive(boolean hideSensitive, boolean animate) {

    private void updateSensitiveness(boolean animate) {

        boolean hideSensitive = mLockscreenUserManager.isAnyProfilePublicMode();

        if (hideSensitive != mAmbientState.isHideSensitive()) {

            int childCount = getChildCount();

            for (int i = 0; i < childCount; i++) {
@@ -5306,7 +5309,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 


        SysuiStatusBarStateController state = (SysuiStatusBarStateController)

                Dependency.get(StatusBarStateController.class);

        setHideSensitive(publicMode, state.goingToFullShade() /* animate */);

        updateSensitiveness(state.goingToFullShade() /* animate */);

        setDimmed(onKeyguard, state.fromShadeLocked() /* animate */);

        setExpandingEnabled(!onKeyguard);

        ActivatableNotificationView activatedChild = getActivatedChild();

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

+16 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ import com.android.systemui.classifier.FalsingManagerFake; 
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChangedListener;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShelf;
@@ -119,6 +121,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Mock private MetricsLogger mMetricsLogger;

    @Mock private NotificationRoundnessManager mNotificationRoundnessManager;

    @Mock private KeyguardBypassController mKeyguardBypassController;

    @Mock private NotificationLockscreenUserManager mLockscreenUserManager;

    private UserChangedListener mUserChangedListener;

    private TestableNotificationEntryManager mEntryManager;

    private int mOriginalInterruptionModelSetting;
@@ -138,6 +142,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
                NotificationBlockingHelperManager.class,

                mBlockingHelperManager);

        mDependency.injectTestDependency(SysuiStatusBarStateController.class, mBarState);

        mDependency.injectTestDependency(NotificationLockscreenUserManager.class,

                mLockscreenUserManager);

        mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);

        mDependency.injectTestDependency(NotificationRemoteInputManager.class,

                mRemoteInputManager);
@@ -152,6 +158,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 




        NotificationShelf notificationShelf = mock(NotificationShelf.class);

        ArgumentCaptor<UserChangedListener> userChangedCaptor = ArgumentCaptor

                .forClass(UserChangedListener.class);



        // The actual class under test.  You may need to work with this class directly when

        // testing anonymous class members of mStackScroller, like mMenuEventListener,
@@ -174,6 +182,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScroller.setGroupManager(mGroupManager);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        mStackScroller.setIconAreaController(mNotificationIconAreaController);

        verify(mLockscreenUserManager).addUserChangedListener(userChangedCaptor.capture());

        mUserChangedListener = userChangedCaptor.getValue();



        // Stub out functionality that isn't necessary to test.

        doNothing().when(mBar)
@@ -246,6 +256,12 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        verify(mBlockingHelperManager).setNotificationShadeExpanded(100f);

    }



    @Test

    public void testOnStatePostChange_verifyIfProfileIsPublic() {

        mUserChangedListener.onUserChanged(0);

        verify(mLockscreenUserManager).isAnyProfilePublicMode();

    }



    @Test

    public void manageNotifications_visible() {

        FooterView view = mock(FooterView.class);