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

Commit 6ae2c477 authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Getting rid of Dependency.get 

Moving Dependency.get from HeadsUpManager class and its children
classes by passing the AccessibiltyManagerWrapper and UIEventLogger
object in the constructor.

Bug: 218354106
Test: manual
Change-Id: Ia43cab46e07fe6c37e4c3e9e4ecd59fabcc208b5
parent f87c0d10

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java

+8 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.PowerManager; 


import androidx.annotation.Nullable;



import com.android.internal.logging.UiEventLogger;

import com.android.keyguard.KeyguardViewController;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.qualifiers.Background;
@@ -61,6 +62,7 @@ import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; 
import com.android.systemui.statusbar.phone.KeyguardBypassController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -191,7 +193,9 @@ public abstract class ReferenceSystemUIModule { 
            GroupMembershipManager groupManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController,

            @Main Handler handler) {

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger) {

        return new HeadsUpManagerPhone(

                context,

                headsUpManagerLogger,
@@ -200,7 +204,9 @@ public abstract class ReferenceSystemUIModule { 
                groupManager,

                visualStabilityProvider,

                configurationController,

                handler

                handler,

                accessibilityManagerWrapper,

                uiEventLogger

        );

    }

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

+6 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.util.Pools; 
import androidx.collection.ArraySet;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.policy.SystemBarUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.R;
@@ -39,6 +40,7 @@ import com.android.systemui.statusbar.notification.collection.provider.OnReorder 
import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;

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

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

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

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

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

import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;
@@ -107,8 +109,10 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
            GroupMembershipManager groupMembershipManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController,

            @Main Handler handler) {

        super(context, logger, handler);

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger) {

        super(context, logger, handler, accessibilityManagerWrapper, uiEventLogger);

        Resources resources = mContext.getResources();

        mExtensionTime = resources.getInteger(R.integer.ambient_notification_extension_time);

        statusBarStateController.addCallback(mStatusBarStateListener);

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

+7 −5
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.view.accessibility.AccessibilityManager; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.Dependency;

import com.android.systemui.EventLogTags;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Main;
@@ -81,12 +80,15 @@ public abstract class HeadsUpManager extends AlertingNotificationManager { 
        }

    }



    public HeadsUpManager(@NonNull final Context context, HeadsUpManagerLogger logger,

            @Main Handler handler) {

    public HeadsUpManager(@NonNull final Context context,

            HeadsUpManagerLogger logger,

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger) {

        super(logger, handler);

        mContext = context;

        mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);

        mUiEventLogger = Dependency.get(UiEventLogger.class);

        mAccessibilityMgr = accessibilityManagerWrapper;

        mUiEventLogger = uiEventLogger;

        Resources resources = context.getResources();

        mMinimumDisplayTime = resources.getInteger(R.integer.heads_up_notification_minimum_time);

        mAutoDismissNotificationDecay = resources.getInteger(R.integer.heads_up_notification_decay);

packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java

+8 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.PowerManager; 


import androidx.annotation.Nullable;



import com.android.internal.logging.UiEventLogger;

import com.android.keyguard.KeyguardViewController;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.SysUISingleton;
@@ -63,6 +64,7 @@ import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; 
import com.android.systemui.statusbar.phone.KeyguardBypassController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -173,7 +175,9 @@ public abstract class TvSystemUIModule { 
            GroupMembershipManager groupManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController,

            @Main Handler handler) {

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger) {

        return new HeadsUpManagerPhone(

                context,

                headsUpManagerLogger,
@@ -182,7 +186,9 @@ public abstract class TvSystemUIModule { 
                groupManager,

                visualStabilityProvider,

                configurationController,

                handler

                handler,

                accessibilityManagerWrapper,

                uiEventLogger

        );

    }

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

+5 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.view.LayoutInflater; 
import android.widget.RemoteViews;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.TestableDependency;

import com.android.systemui.classifier.FalsingCollectorFake;

import com.android.systemui.classifier.FalsingManagerFake;
@@ -75,6 +76,7 @@ import com.android.systemui.statusbar.notification.row.NotificationRowContentBin 
import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;

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

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

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

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

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

import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder;
@@ -145,7 +147,9 @@ public class NotificationTestHelper { 
                mock(GroupMembershipManager.class),

                mock(VisualStabilityProvider.class),

                mock(ConfigurationControllerImpl.class),

                new Handler(mTestLooper.getLooper())

                new Handler(mTestLooper.getLooper()),

                mock(AccessibilityManagerWrapper.class),

                mock(UiEventLogger.class)

        );

        mIconManager = new IconManager(

                mock(CommonNotifCollection.class),