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

Commit bb46f550 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: I5cd2435c0608968a2d880d742ebb1a307c48b02b
Merged-In: I5cd2435c0608968a2d880d742ebb1a307c48b02b
parent 7ae652e5

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

+10 −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;
@@ -190,7 +192,10 @@ public abstract class ReferenceSystemUIModule { 
            KeyguardBypassController bypassController,

            GroupMembershipManager groupManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController) {

            ConfigurationController configurationController,

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger) {

        return new HeadsUpManagerPhone(

                context,

                headsUpManagerLogger,
@@ -198,7 +203,10 @@ public abstract class ReferenceSystemUIModule { 
                bypassController,

                groupManager,

                visualStabilityProvider,

                configurationController

                configurationController,

                handler,

                accessibilityManagerWrapper,

                uiEventLogger

        );

    }

packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java

+4 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ package com.android.systemui.statusbar; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Handler;

import android.os.Looper;

import android.os.SystemClock;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.view.accessibility.AccessibilityEvent;



import com.android.internal.annotations.VisibleForTesting;

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

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

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;

import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;
@@ -43,14 +43,15 @@ public abstract class AlertingNotificationManager { 
    protected final ArrayMap<String, AlertEntry> mAlertEntries = new ArrayMap<>();

    protected final HeadsUpManagerLogger mLogger;



    public AlertingNotificationManager(HeadsUpManagerLogger logger) {

    public AlertingNotificationManager(HeadsUpManagerLogger logger, @Main Handler handler) {

        mLogger = logger;

        mHandler = handler;

    }



    protected int mMinimumDisplayTime;

    protected int mAutoDismissNotificationDecay;

    @VisibleForTesting

    public Handler mHandler = new Handler(Looper.getMainLooper());

    public Handler mHandler;



    /**

     * Called when posting a new notification that should alert the user and appear on screen.

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

+9 −2
Original line number Diff line number Diff line
@@ -21,14 +21,17 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.content.res.Resources;

import android.graphics.Region;

import android.os.Handler;

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;

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

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

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

import com.android.systemui.statusbar.StatusBarState;
@@ -37,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;
@@ -104,8 +108,11 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
            KeyguardBypassController bypassController,

            GroupMembershipManager groupMembershipManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController) {

        super(context, logger);

            ConfigurationController configurationController,

            @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

+10 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.app.Notification; 
import android.content.Context;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.os.Handler;

import android.provider.Settings;

import android.util.ArrayMap;

import android.view.accessibility.AccessibilityManager;
@@ -31,9 +32,9 @@ 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;

import com.android.systemui.statusbar.AlertingNotificationManager;

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

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;
@@ -79,11 +80,15 @@ public abstract class HeadsUpManager extends AlertingNotificationManager { 
        }

    }



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

        super(logger);

    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

+10 −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;
@@ -172,7 +174,10 @@ public abstract class TvSystemUIModule { 
            KeyguardBypassController bypassController,

            GroupMembershipManager groupManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController) {

            ConfigurationController configurationController,

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger) {

        return new HeadsUpManagerPhone(

                context,

                headsUpManagerLogger,
@@ -180,7 +185,10 @@ public abstract class TvSystemUIModule { 
                bypassController,

                groupManager,

                visualStabilityProvider,

                configurationController

                configurationController,

                handler,

                accessibilityManagerWrapper,

                uiEventLogger

        );

    }