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

Commit 440f58b4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ib10fa8e9,Iaad14420 into tm-qpr-dev am: 7169bb42 

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



Change-Id: I1c97880b9e7cffc976a2b45fdf3c22a23ec96ba7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 141db075 7169bb42

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

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.systemui.statusbar.notification.collection



import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.notification.NotifPipelineFlags

import com.android.systemui.statusbar.notification.collection.listbuilder.OnAfterRenderEntryListener

import com.android.systemui.statusbar.notification.collection.listbuilder.OnAfterRenderGroupListener

import com.android.systemui.statusbar.notification.collection.listbuilder.OnAfterRenderListListener

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -1167,9 +1167,6 @@ public class CentralSurfacesImpl extends CoreStartable implements 


        mStatusBarTouchableRegionManager.setup(this, mNotificationShadeWindowView);

        mHeadsUpManager.addListener(mNotificationPanelViewController.getOnHeadsUpChangedListener());

        if (!mNotifPipelineFlags.isNewPipelineEnabled()) {

            mHeadsUpManager.addListener(mVisualStabilityManager);

        }

        mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager);



        createNavigationBar(result);
@@ -4336,9 +4333,6 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());

            }



            if (!mNotifPipelineFlags.isNewPipelineEnabled()) {

                mViewHierarchyManager.updateRowStates();

            }

            mScreenPinningRequest.onConfigurationChanged();

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+6 −38
Original line number Diff line number Diff line
@@ -52,21 +52,15 @@ import com.android.systemui.EventLogTags; 
import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.plugins.ActivityStarter;

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationClickNotifier;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.NotificationActivityStarter;

import com.android.systemui.statusbar.notification.NotificationEntryListener;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;

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

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

import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -92,24 +86,19 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 


    private final Context mContext;



    private final CommandQueue mCommandQueue;

    private final Handler mMainThreadHandler;

    private final Executor mUiBgExecutor;



    private final NotificationEntryManager mEntryManager;

    private final NotifPipeline mNotifPipeline;

    private final NotificationVisibilityProvider mVisibilityProvider;

    private final HeadsUpManagerPhone mHeadsUpManager;

    private final ActivityStarter mActivityStarter;

    private final NotificationClickNotifier mClickNotifier;

    private final StatusBarStateController mStatusBarStateController;

    private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private final KeyguardManager mKeyguardManager;

    private final IDreamManager mDreamManager;

    private final Optional<BubblesManager> mBubblesManagerOptional;

    private final Lazy<AssistManager> mAssistManagerLazy;

    private final NotificationRemoteInputManager mRemoteInputManager;

    private final GroupMembershipManager mGroupMembershipManager;

    private final NotificationLockscreenUserManager mLockscreenUserManager;

    private final ShadeController mShadeController;

    private final KeyguardStateController mKeyguardStateController;
@@ -118,7 +107,6 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
    private final StatusBarRemoteInputCallback mStatusBarRemoteInputCallback;

    private final ActivityIntentHelper mActivityIntentHelper;



    private final NotifPipelineFlags mNotifPipelineFlags;

    private final MetricsLogger mMetricsLogger;

    private final StatusBarNotificationActivityStarterLogger mLogger;
@@ -134,23 +122,19 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
    @Inject

    StatusBarNotificationActivityStarter(

            Context context,

            CommandQueue commandQueue,

            Handler mainThreadHandler,

            Executor uiBgExecutor,

            NotificationEntryManager entryManager,

            NotifPipeline notifPipeline,

            NotificationVisibilityProvider visibilityProvider,

            HeadsUpManagerPhone headsUpManager,

            ActivityStarter activityStarter,

            NotificationClickNotifier clickNotifier,

            StatusBarStateController statusBarStateController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            KeyguardManager keyguardManager,

            IDreamManager dreamManager,

            Optional<BubblesManager> bubblesManagerOptional,

            Lazy<AssistManager> assistManagerLazy,

            NotificationRemoteInputManager remoteInputManager,

            GroupMembershipManager groupMembershipManager,

            NotificationLockscreenUserManager lockscreenUserManager,

            ShadeController shadeController,

            KeyguardStateController keyguardStateController,
@@ -158,7 +142,6 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
            LockPatternUtils lockPatternUtils,

            StatusBarRemoteInputCallback remoteInputCallback,

            ActivityIntentHelper activityIntentHelper,

            NotifPipelineFlags notifPipelineFlags,

            MetricsLogger metricsLogger,

            StatusBarNotificationActivityStarterLogger logger,

            OnUserInteractionCallback onUserInteractionCallback,
@@ -168,23 +151,18 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
            ActivityLaunchAnimator activityLaunchAnimator,

            NotificationLaunchAnimatorControllerProvider notificationAnimationProvider) {

        mContext = context;

        mCommandQueue = commandQueue;

        mMainThreadHandler = mainThreadHandler;

        mUiBgExecutor = uiBgExecutor;

        mEntryManager = entryManager;

        mNotifPipeline = notifPipeline;

        mVisibilityProvider = visibilityProvider;

        mHeadsUpManager = headsUpManager;

        mActivityStarter = activityStarter;

        mClickNotifier = clickNotifier;

        mStatusBarStateController = statusBarStateController;

        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mKeyguardManager = keyguardManager;

        mDreamManager = dreamManager;

        mBubblesManagerOptional = bubblesManagerOptional;

        mAssistManagerLazy = assistManagerLazy;

        mRemoteInputManager = remoteInputManager;

        mGroupMembershipManager = groupMembershipManager;

        mLockscreenUserManager = lockscreenUserManager;

        mShadeController = shadeController;

        mKeyguardStateController = keyguardStateController;
@@ -192,7 +170,6 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
        mLockPatternUtils = lockPatternUtils;

        mStatusBarRemoteInputCallback = remoteInputCallback;

        mActivityIntentHelper = activityIntentHelper;

        mNotifPipelineFlags = notifPipelineFlags;

        mMetricsLogger = metricsLogger;

        mLogger = logger;

        mOnUserInteractionCallback = onUserInteractionCallback;
@@ -203,22 +180,13 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
        mActivityLaunchAnimator = activityLaunchAnimator;

        mNotificationAnimationProvider = notificationAnimationProvider;



        if (!mNotifPipelineFlags.isNewPipelineEnabled()) {

            mEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

                @Override

                public void onPendingEntryAdded(NotificationEntry entry) {

                    handleFullScreenIntent(entry);

                }

            });

        } else {

            mNotifPipeline.addCollectionListener(new NotifCollectionListener() {

        notifPipeline.addCollectionListener(new NotifCollectionListener() {

            @Override

            public void onEntryAdded(NotificationEntry entry) {

                handleFullScreenIntent(entry);

            }

        });

    }

    }



    /**

     * Called when a notification is clicked.

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java

+8 −21
Original line number Diff line number Diff line
@@ -59,18 +59,15 @@ import com.android.systemui.assist.AssistManager; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.ActivityStarter.OnDismissAction;

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationClickNotifier;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;

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

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

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -127,8 +124,6 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
    @Mock

    private ShadeControllerImpl mShadeController;

    @Mock

    private NotifPipelineFlags mNotifPipelineFlags;

    @Mock

    private NotifPipeline mNotifPipeline;

    @Mock

    private NotificationVisibilityProvider mVisibilityProvider;
@@ -148,15 +143,13 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
    private ActivityLaunchAnimator mActivityLaunchAnimator;

    @Mock

    private InteractionJankMonitor mJankMonitor;

    private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());

    private NotificationTestHelper mNotificationTestHelper;

    private final FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());

    private ExpandableNotificationRow mNotificationRow;

    private ExpandableNotificationRow mBubbleNotificationRow;



    private final Answer<Void> mCallOnDismiss = answerVoid(

            (OnDismissAction dismissAction, Runnable cancel,

                    Boolean afterKeyguardGone) -> dismissAction.onDismiss());

    private ArrayList<NotificationEntry> mActiveNotifications;



    @Before

    public void setUp() throws Exception {
@@ -165,29 +158,28 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
        when(mContentIntent.getCreatorUserHandle()).thenReturn(UserHandle.of(1));

        when(mContentIntent.getIntent()).thenReturn(mContentIntentInner);



        mNotificationTestHelper = new NotificationTestHelper(

        NotificationTestHelper notificationTestHelper = new NotificationTestHelper(

                mContext,

                mDependency,

                TestableLooper.get(this));



        // Create standard notification with contentIntent

        mNotificationRow = mNotificationTestHelper.createRow();

        mNotificationRow = notificationTestHelper.createRow();

        StatusBarNotification sbn = mNotificationRow.getEntry().getSbn();

        sbn.getNotification().contentIntent = mContentIntent;

        sbn.getNotification().flags |= Notification.FLAG_AUTO_CANCEL;



        // Create bubble notification row with contentIntent

        mBubbleNotificationRow = mNotificationTestHelper.createBubble();

        mBubbleNotificationRow = notificationTestHelper.createBubble();

        StatusBarNotification bubbleSbn = mBubbleNotificationRow.getEntry().getSbn();

        bubbleSbn.getNotification().contentIntent = mContentIntent;

        bubbleSbn.getNotification().flags |= Notification.FLAG_AUTO_CANCEL;



        mActiveNotifications = new ArrayList<>();

        mActiveNotifications.add(mNotificationRow.getEntry());

        mActiveNotifications.add(mBubbleNotificationRow.getEntry());

        when(mEntryManager.getVisibleNotifications()).thenReturn(mActiveNotifications);

        ArrayList<NotificationEntry> activeNotifications = new ArrayList<>();

        activeNotifications.add(mNotificationRow.getEntry());

        activeNotifications.add(mBubbleNotificationRow.getEntry());

        when(mEntryManager.getVisibleNotifications()).thenReturn(activeNotifications);

        when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE);

        when(mNotifPipelineFlags.isNewPipelineEnabled()).thenReturn(false);

        when(mOnUserInteractionCallback.registerFutureDismissal(eq(mNotificationRow.getEntry()),

                anyInt())).thenReturn(mFutureDismissalRunnable);

        when(mVisibilityProvider.obtain(anyString(), anyBoolean()))
@@ -207,23 +199,19 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
        mNotificationActivityStarter =

                new StatusBarNotificationActivityStarter(

                        getContext(),

                        mock(CommandQueue.class),

                        mHandler,

                        mUiBgExecutor,

                        mEntryManager,

                        mNotifPipeline,

                        mVisibilityProvider,

                        headsUpManager,

                        mActivityStarter,

                        mClickNotifier,

                        mock(StatusBarStateController.class),

                        mStatusBarKeyguardViewManager,

                        mock(KeyguardManager.class),

                        mock(IDreamManager.class),

                        Optional.of(mBubblesManager),

                        () -> mAssistManager,

                        mRemoteInputManager,

                        mock(NotificationGroupManagerLegacy.class),

                        mock(NotificationLockscreenUserManager.class),

                        mShadeController,

                        mKeyguardStateController,
@@ -231,7 +219,6 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
                        mock(LockPatternUtils.class),

                        mock(StatusBarRemoteInputCallback.class),

                        mActivityIntentHelper,

                        mNotifPipelineFlags,

                        mock(MetricsLogger.class),

                        mock(StatusBarNotificationActivityStarterLogger.class),

                        mOnUserInteractionCallback,

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt

+1 −1

File changed.

Contains only whitespace changes.