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

Commit 4c73e655 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Make StatusBarNotificationActivityStarter injectable. 

This is one step in the process of removing calls to
Dependency.get(MAIN_HANDLER) and Dependency.get(BG_HANDLER).

Bug: 144503618
Test: atest SystemUITests
Change-Id: Ifbd49efcfe1eaf8af355e6dde4c70bb26c823cd2
parent 47ad1542

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ import com.android.systemui.statusbar.phone.ScrimController; 
import com.android.systemui.statusbar.phone.StatusBar;

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

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

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

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

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

import com.android.systemui.statusbar.policy.BatteryController;
@@ -306,6 +307,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            LightsOutNotifController lightsOutNotifController,

            StatusBarNotificationActivityStarter.Builder

                    statusBarNotificationActivityStarterBuilder,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            DismissCallbackRegistry dismissCallbackRegistry,
@@ -383,6 +386,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                remoteInputUriController,

                dividerOptional,

                lightsOutNotifController,

                statusBarNotificationActivityStarterBuilder,

                superStatusBarViewFactory,

                statusBarKeyguardViewManager,

                viewMediatorCallback,

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; 
import com.android.systemui.statusbar.phone.ScrimController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.BatteryController;
@@ -179,6 +180,8 @@ public class CarStatusBarModule { 
            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            LightsOutNotifController lightsOutNotifController,

            StatusBarNotificationActivityStarter.Builder

                    statusBarNotificationActivityStarterBuilder,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            DismissCallbackRegistry dismissCallbackRegistry,
@@ -255,6 +258,7 @@ public class CarStatusBarModule { 
                dividerOptional,

                superStatusBarViewFactory,

                lightsOutNotifController,

                statusBarNotificationActivityStarterBuilder,

                statusBarKeyguardViewManager,

                viewMediatorCallback,

                dismissCallbackRegistry,

packages/SystemUI/src/com/android/systemui/ActivityIntentHelper.java

+6 −0
Original line number Diff line number Diff line
@@ -24,14 +24,20 @@ import android.content.pm.ResolveInfo; 


import java.util.List;



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * Contains useful methods for querying properties of an Activity Intent.

 */

@Singleton

public class ActivityIntentHelper {



    private final Context mContext;



    @Inject

    public ActivityIntentHelper(Context context) {

        // TODO: inject a package manager, not a context.

        mContext = context;

    }

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

+0 −8
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.view.IWindowManager; 
import android.view.LayoutInflater;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -141,13 +140,6 @@ public class DependencyProvider { 
        return new DisplayMetrics();

    }



    @Singleton

    @Provides

    public IStatusBarService provideIStatusBarService() {

        return IStatusBarService.Stub.asInterface(

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));

    }



    /** */

    @Singleton

    @Provides

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

+24 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.ActivityManager; 
import android.app.AlarmManager;

import android.app.IActivityManager;

import android.app.IWallpaperManager;

import android.app.KeyguardManager;

import android.app.WallpaperManager;

import android.content.Context;

import android.content.res.Resources;
@@ -30,10 +31,13 @@ import android.os.Handler; 
import android.os.PowerManager;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.service.dreams.DreamService;

import android.service.dreams.IDreamManager;

import android.view.IWindowManager;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;



import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.LatencyTracker;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.systemui.dagger.qualifiers.BgHandler;
@@ -63,6 +67,20 @@ public class SystemServicesModule { 
        return ActivityManager.getService();

    }



    @Provides

    @Singleton

    static IDreamManager provideIDreamManager() {

        return IDreamManager.Stub.asInterface(

                ServiceManager.checkService(DreamService.DREAM_SERVICE));

    }



    @Singleton

    @Provides

    static IStatusBarService provideIStatusBarService() {

        return IStatusBarService.Stub.asInterface(

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));

    }



    @Provides

    @Nullable

    static IWallpaperManager provideIWallPaperManager() {
@@ -76,6 +94,12 @@ public class SystemServicesModule { 
        return WindowManagerGlobal.getWindowManagerService();

    }



    @Singleton

    @Provides

    static KeyguardManager provideKeyguardManager(Context context) {

        return context.getSystemService(KeyguardManager.class);

    }



    @Singleton

    @Provides

    static LatencyTracker provideLatencyTracker(Context context) {