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

Commit df79c664 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Remove Dependency#get calls from NotificationGutsManager" into... 

Merge "Remove Dependency#get calls from NotificationGutsManager" into tm-qpr-dev am: c7549f00 am: ffabe54b

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



Change-Id: Ie72e33ea540b598da12677c4787ae8eba7f84c6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5de25030 ffabe54b

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java

+0 −60
Original line number Diff line number Diff line
@@ -16,27 +16,15 @@ 


package com.android.systemui.statusbar.notification.dagger;



import android.app.INotificationManager;

import android.content.Context;

import android.content.pm.LauncherApps;

import android.content.pm.ShortcutManager;

import android.os.Handler;

import android.view.accessibility.AccessibilityManager;



import com.android.internal.logging.UiEventLogger;

import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.people.widget.PeopleSpaceWidgetManager;

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

import com.android.systemui.settings.UserContextProvider;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeEventsModule;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.statusbar.NotificationListener;

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

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

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

import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore;
@@ -50,7 +38,6 @@ import com.android.systemui.statusbar.notification.collection.inflation.BindEven 
import com.android.systemui.statusbar.notification.collection.inflation.NotifInflater;

import com.android.systemui.statusbar.notification.collection.inflation.OnUserInteractionCallbackImpl;

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

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

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

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

import com.android.systemui.statusbar.notification.collection.provider.VisibilityLocationProviderDelegator;
@@ -72,22 +59,17 @@ import com.android.systemui.statusbar.notification.interruption.NotificationInte 
import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.logging.NotificationPanelLogger;

import com.android.systemui.statusbar.notification.logging.NotificationPanelLoggerImpl;

import com.android.systemui.statusbar.notification.row.ChannelEditorDialogController;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.row.OnUserInteractionCallback;

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager;

import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.wmshell.BubblesManager;



import java.util.Optional;

import java.util.concurrent.Executor;



import javax.inject.Provider;



import dagger.Binds;

import dagger.Lazy;

import dagger.Module;

import dagger.Provides;
@@ -109,48 +91,6 @@ public interface NotificationsModule { 
    @Binds

    StackScrollAlgorithm.BypassController bindBypassController(KeyguardBypassController impl);



    /** Provides an instance of {@link NotificationGutsManager} */

    @SysUISingleton

    @Provides

    static NotificationGutsManager provideNotificationGutsManager(

            Context context,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            @Main Handler mainHandler,

            @Background Handler bgHandler,

            AccessibilityManager accessibilityManager,

            HighPriorityProvider highPriorityProvider,

            INotificationManager notificationManager,

            PeopleSpaceWidgetManager peopleSpaceWidgetManager,

            LauncherApps launcherApps,

            ShortcutManager shortcutManager,

            ChannelEditorDialogController channelEditorDialogController,

            UserContextProvider contextTracker,

            AssistantFeedbackController assistantFeedbackController,

            Optional<BubblesManager> bubblesManagerOptional,

            UiEventLogger uiEventLogger,

            OnUserInteractionCallback onUserInteractionCallback,

            ShadeController shadeController) {

        return new NotificationGutsManager(

                context,

                centralSurfacesOptionalLazy,

                mainHandler,

                bgHandler,

                accessibilityManager,

                highPriorityProvider,

                notificationManager,

                peopleSpaceWidgetManager,

                launcherApps,

                shortcutManager,

                channelEditorDialogController,

                contextTracker,

                assistantFeedbackController,

                bubblesManagerOptional,

                uiEventLogger,

                onUserInteractionCallback,

                shadeController

        );

    }



    /** Provides an instance of {@link NotifGutsViewManager} */

    @Binds

    NotifGutsViewManager bindNotifGutsViewManager(NotificationGutsManager notificationGutsManager);

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

+20 −17
Original line number Diff line number Diff line
@@ -44,12 +44,10 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.settingslib.notification.ConversationIconFactory;

import com.android.systemui.Dependency;

import com.android.systemui.Dumpable;

import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.people.widget.PeopleSpaceWidgetManager;

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

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -65,28 +63,29 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; 
import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;

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

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

import com.android.systemui.statusbar.notification.stack.NotificationListContainer;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.wmshell.BubblesManager;



import java.io.PrintWriter;

import java.util.Optional;



import javax.inject.Inject;



import dagger.Lazy;



/**

 * Handles various NotificationGuts related tasks, such as binding guts to a row, opening and

 * closing guts, and keeping track of the currently exposed notification guts.

 */

@SysUISingleton

public class NotificationGutsManager implements NotifGutsViewManager {

    private static final String TAG = "NotificationGutsManager";



    // Must match constant in Settings. Used to highlight preferences when linking to Settings.

    private static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";



    private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class);

    private final MetricsLogger mMetricsLogger;

    private final Context mContext;

    private final AccessibilityManager mAccessibilityManager;

    private final HighPriorityProvider mHighPriorityProvider;
@@ -94,12 +93,9 @@ public class NotificationGutsManager implements NotifGutsViewManager { 
    private final OnUserInteractionCallback mOnUserInteractionCallback;



    // Dependencies:

    private final NotificationLockscreenUserManager mLockscreenUserManager =

            Dependency.get(NotificationLockscreenUserManager.class);

    private final StatusBarStateController mStatusBarStateController =

            Dependency.get(StatusBarStateController.class);

    private final DeviceProvisionedController mDeviceProvisionedController =

            Dependency.get(DeviceProvisionedController.class);

    private final NotificationLockscreenUserManager mLockscreenUserManager;

    private final StatusBarStateController mStatusBarStateController;

    private final DeviceProvisionedController mDeviceProvisionedController;

    private final AssistantFeedbackController mAssistantFeedbackController;



    // which notification is currently being longpress-examined by the user
@@ -124,9 +120,7 @@ public class NotificationGutsManager implements NotifGutsViewManager { 
    private final ShadeController mShadeController;

    private NotifGutsViewListener mGutsListener;



    /**

     * Injected constructor. See {@link NotificationsModule}.

     */

    @Inject

    public NotificationGutsManager(Context context,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            @Main Handler mainHandler,
@@ -143,7 +137,11 @@ public class NotificationGutsManager implements NotifGutsViewManager { 
            Optional<BubblesManager> bubblesManagerOptional,

            UiEventLogger uiEventLogger,

            OnUserInteractionCallback onUserInteractionCallback,

            ShadeController shadeController) {

            ShadeController shadeController,

            NotificationLockscreenUserManager notificationLockscreenUserManager,

            StatusBarStateController statusBarStateController,

            DeviceProvisionedController deviceProvisionedController,

            MetricsLogger metricsLogger) {

        mContext = context;

        mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;

        mMainHandler = mainHandler;
@@ -161,6 +159,10 @@ public class NotificationGutsManager implements NotifGutsViewManager { 
        mUiEventLogger = uiEventLogger;

        mOnUserInteractionCallback = onUserInteractionCallback;

        mShadeController = shadeController;

        mLockscreenUserManager = notificationLockscreenUserManager;

        mStatusBarStateController = statusBarStateController;

        mDeviceProvisionedController = deviceProvisionedController;

        mMetricsLogger = metricsLogger;

    }



    public void setUpWithPresenter(NotificationPresenter presenter,
@@ -372,7 +374,8 @@ public class NotificationGutsManager implements NotifGutsViewManager { 
                mDeviceProvisionedController.isDeviceProvisioned(),

                row.getIsNonblockable(),

                mHighPriorityProvider.isHighPriority(row.getEntry()),

                mAssistantFeedbackController);

                mAssistantFeedbackController,

                mMetricsLogger);

    }



    /**

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

+3 −2
Original line number Diff line number Diff line
@@ -204,10 +204,11 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
            boolean isDeviceProvisioned,

            boolean isNonblockable,

            boolean wasShownHighPriority,

            AssistantFeedbackController assistantFeedbackController)

            AssistantFeedbackController assistantFeedbackController,

            MetricsLogger metricsLogger)

            throws RemoteException {

        mINotificationManager = iNotificationManager;

        mMetricsLogger = Dependency.get(MetricsLogger.class);

        mMetricsLogger = metricsLogger;

        mOnUserInteractionCallback = onUserInteractionCallback;

        mChannelEditorDialogController = channelEditorDialogController;

        mAssistantFeedbackController = assistantFeedbackController;

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java

+14 −12
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.testing.UiEventLoggerFake;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.people.widget.PeopleSpaceWidgetManager;

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

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

import com.android.systemui.settings.UserContextProvider;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;
@@ -133,18 +133,13 @@ public class NotificationGutsManagerTest extends SysuiTestCase { 
    @Mock private ShadeController mShadeController;

    @Mock private PeopleSpaceWidgetManager mPeopleSpaceWidgetManager;

    @Mock private AssistantFeedbackController mAssistantFeedbackController;

    @Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager;

    @Mock private StatusBarStateController mStatusBarStateController;



    @Before

    public void setUp() {

        mTestableLooper = TestableLooper.get(this);

        allowTestableLooperAsMainThread();

        mDependency.injectTestDependency(DeviceProvisionedController.class,

                mDeviceProvisionedController);

        mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);

        mDependency.injectTestDependency(

                OnUserInteractionCallback.class,

                mOnUserInteractionCallback);

        mDependency.injectMockDependency(NotificationLockscreenUserManager.class);

        mHandler = Handler.createAsync(mTestableLooper.getLooper());

        mHelper = new NotificationTestHelper(mContext, mDependency, TestableLooper.get(this));

        when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false);
@@ -155,7 +150,11 @@ public class NotificationGutsManagerTest extends SysuiTestCase { 
                mPeopleSpaceWidgetManager, mLauncherApps, mShortcutManager,

                mChannelEditorDialogController, mContextTracker, mAssistantFeedbackController,

                Optional.of(mBubblesManager), new UiEventLoggerFake(), mOnUserInteractionCallback,

                mShadeController);

                mShadeController,

                mNotificationLockscreenUserManager,

                mStatusBarStateController,

                mDeviceProvisionedController,

                mMetricsLogger);

        mGutsManager.setUpWithPresenter(mPresenter, mNotificationListContainer,

                mOnSettingsClickListener);

        mGutsManager.setNotificationActivityStarter(mNotificationActivityStarter);
@@ -372,7 +371,8 @@ public class NotificationGutsManagerTest extends SysuiTestCase { 
                eq(false),

                eq(false),

                eq(true), /* wasShownHighPriority */

                eq(mAssistantFeedbackController));

                eq(mAssistantFeedbackController),

                any(MetricsLogger.class));

    }



    @Test
@@ -406,7 +406,8 @@ public class NotificationGutsManagerTest extends SysuiTestCase { 
                eq(true),

                eq(false),

                eq(false), /* wasShownHighPriority */

                eq(mAssistantFeedbackController));

                eq(mAssistantFeedbackController),

                any(MetricsLogger.class));

    }



    @Test
@@ -438,7 +439,8 @@ public class NotificationGutsManagerTest extends SysuiTestCase { 
                eq(false),

                eq(false),

                eq(false), /* wasShownHighPriority */

                eq(mAssistantFeedbackController));

                eq(mAssistantFeedbackController),

                any(MetricsLogger.class));

    }



    ////////////////////////////////////////////////////////////////////////////////////////////////

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java

+96 −49

File changed.

Preview size limit exceeded, changes collapsed.