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

Commit 699d5ab3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ie6af0533,I37d3d5dc into main 

* changes:
  Exempt all app notifs from vis stability when unbundling
  cleanup BooleanFlowOperators java interop
parents dc4e7941 b21e67fb

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryAdapterTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ class NotificationEntryAdapterTest : SysuiTestCase() { 
        val entry = NotificationEntryBuilder().setNotification(notification).build()

        underTest = factory.create(entry) as NotificationEntryAdapter



        underTest.onBundleDisabled()

        underTest.onBundleDisabledForEntry()

        verify(kosmos.mockVisualStabilityCoordinator)

            .temporarilyAllowFreeMovement(eq(entry), anyLong())

    }
@@ -627,7 +627,7 @@ class NotificationEntryAdapterTest : SysuiTestCase() { 
        whenever(summaryRow.attachedChildren).thenReturn(listOf(childRow))



        underTest = factory.create(summaryEntry) as NotificationEntryAdapter

        underTest.onBundleDisabled()

        underTest.onBundleDisabledForEntry()

        verify(kosmos.mockVisualStabilityCoordinator)

            .temporarilyAllowFreeMovement(eq(summaryEntry), anyLong())

        verify(kosmos.mockVisualStabilityCoordinator)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/PromotedNotificationInfoTest.java

+5 −5
Original line number Diff line number Diff line
@@ -50,13 +50,14 @@ import com.android.systemui.statusbar.notification.AssistantFeedbackController; 
import com.android.systemui.statusbar.notification.NotificationActivityStarter;

import com.android.systemui.statusbar.notification.collection.EntryAdapter;

import com.android.systemui.statusbar.notification.collection.EntryAdapterFactoryImpl;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager;

import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor;

import com.android.systemui.statusbar.notification.collection.coordinator.VisualStabilityCoordinator;

import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager;

import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;

import com.android.systemui.statusbar.notification.promoted.domain.interactor.PackageDemotionInteractor;

import com.android.systemui.statusbar.notification.row.icon.AppIconProvider;

import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider;
@@ -125,14 +126,13 @@ public class PromotedNotificationInfoTest extends SysuiTestCase { 
        }).build();

        mEntryAdapter = new EntryAdapterFactoryImpl(

                mock(NotificationActivityStarter.class),

                mock(MetricsLogger.class),

                mock(PeopleNotificationIdentifier.class),

                mock(NotificationIconStyleProvider.class),

                mock(VisualStabilityCoordinator.class),

                mock(NotificationActionClickManager.class),

                mock(HighPriorityProvider.class),

                mock(HeadsUpManager.class),

                mOnUserInteractionCallback

                mOnUserInteractionCallback,

                mock(NotifPipeline.class)

        ).create(mEntry);

        mRanking = mEntry.getRanking();

        when(mAssistantFeedbackController.isFeedbackEnabled()).thenReturn(false);

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class FalsingCollectorImpl implements FalsingCollector { 
        final CommunalInteractor communalInteractor = mCommunalInteractorLazy.get();

        final CommunalSceneInteractor communalSceneInteractor = mCommunalSceneInteractorLazy.get();

        mJavaAdapter.alwaysCollectFlow(

                BooleanFlowOperators.INSTANCE.allOf(

                BooleanFlowOperators.allOf(

                        communalInteractor.isCommunalEnabled(),

                        communalSceneInteractor.isIdleOnCommunal()),

                this::onShowingCommunalHubChanged

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
            mFlows.add(collectFlow(getLifecycle(), sceneInteractor.getCurrentOverlays(),

                    mCurrentOverlaysConsumer));

        } else {

            mFlows.add(collectFlow(getLifecycle(), BooleanFlowOperators.INSTANCE.anyOf(

            mFlows.add(collectFlow(getLifecycle(), BooleanFlowOperators.anyOf(

                    keyguardInteractor.primaryBouncerShowing,

                    keyguardInteractor.getAlternateBouncerShowing()),

                    mBouncerShowingConsumer));

packages/SystemUI/src/com/android/systemui/dreams/touch/CommunalTouchHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class CommunalTouchHandler implements TouchHandler { 


        mFlows.add(collectFlow(

                mLifecycle,

                BooleanFlowOperators.INSTANCE.allOf(

                BooleanFlowOperators.allOf(

                        mCommunalInteractor.isCommunalAvailable(),

                        keyguardInteractor.isKeyguardShowing()

                ),