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

Commit acea4976 authored by Heemin Seog's avatar Heemin Seog
Browse files

Make StatusBarKeyguardViewManager injectable 

There is a circular dependency between KeyguardViewMediator and
StatusBarKeyguardViewManager which is addressed via Lazy<> for the
ViewMediatorCallback.

Test: manual (sdk_gphone_x86 and hawk), atest SystemUITests
Change-Id: I10e37a40ba966a9f458155fff2957f5534cb9f91
parent 23186341

packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java

+0 −9
Original line number Diff line number Diff line
@@ -18,12 +18,8 @@ package com.android.systemui; 


import android.content.Context;



import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.navigationbar.car.CarFacetButtonController;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

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



import javax.inject.Singleton;
@@ -50,11 +46,6 @@ public class CarSystemUIFactory extends SystemUIFactory { 
        return mCarDependencyComponent;

    }



    public StatusBarKeyguardViewManager createStatusBarKeyguardViewManager(Context context,

            ViewMediatorCallback viewMediatorCallback, LockPatternUtils lockPatternUtils) {

        return new CarStatusBarKeyguardViewManager(context, viewMediatorCallback, lockPatternUtils);

    }



    @Singleton

    @Component(modules = ContextHolder.class)

    public interface CarDependencyComponent {

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+6 −0
Original line number Diff line number Diff line
@@ -35,12 +35,14 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.car.CarStatusBar;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

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

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

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

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

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

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

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

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;
@@ -122,4 +124,8 @@ abstract class CarSystemUIModule { 
    @Binds

    abstract VolumeDialogComponent bindVolumeDialogComponent(

            CarVolumeDialogComponent carVolumeDialogComponent);



    @Binds

    abstract StatusBarKeyguardViewManager bindStatusBarKeyguardViewManager(

            CarStatusBarKeyguardViewManager keyguardViewManager);

}

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

+27 −2
Original line number Diff line number Diff line
@@ -20,18 +20,43 @@ import android.content.Context; 
import android.view.View;



import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.R;

import com.android.systemui.dock.DockManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

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

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

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

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



import javax.inject.Inject;

import javax.inject.Singleton;



/** Car implementation of the {@link StatusBarKeyguardViewManager}. */

@Singleton

public class CarStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {



    protected boolean mShouldHideNavBar;



    @Inject

    public CarStatusBarKeyguardViewManager(Context context,

            ViewMediatorCallback callback,

            LockPatternUtils lockPatternUtils) {

        super(context, callback, lockPatternUtils);

            LockPatternUtils lockPatternUtils,

            SysuiStatusBarStateController sysuiStatusBarStateController,

            ConfigurationController configurationController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            NavigationModeController navigationModeController,

            DockManager dockManager,

            StatusBarWindowController statusBarWindowController,

            KeyguardStateController keyguardStateController,

            NotificationMediaManager notificationMediaManager) {

        super(context, callback, lockPatternUtils, sysuiStatusBarStateController,

                configurationController, keyguardUpdateMonitor, navigationModeController,

                dockManager, statusBarWindowController, keyguardStateController,

                notificationMediaManager);

        mShouldHideNavBar = context.getResources()

                .getBoolean(R.bool.config_hideNavWhenKeyguardBouncerShown);

    }

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

+0 −6
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.LockIcon;

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

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

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

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



import dagger.Module;
@@ -120,11 +119,6 @@ public class SystemUIFactory { 
        return mRootComponent;

    }



    public StatusBarKeyguardViewManager createStatusBarKeyguardViewManager(Context context,

            ViewMediatorCallback viewMediatorCallback, LockPatternUtils lockPatternUtils) {

        return new StatusBarKeyguardViewManager(context, viewMediatorCallback, lockPatternUtils);

    }



    /**

     * Creates an instance of ScreenshotNotificationSmartActionsProvider.

     * This method is overridden in vendor specific implementation of Sys UI.

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

+8 −0
Original line number Diff line number Diff line
@@ -35,12 +35,14 @@ 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;

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

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

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

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

import com.android.systemui.doze.AlwaysOnDisplayPolicy;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.PluginInitializerImpl;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.shared.plugins.PluginManagerImpl;
@@ -249,4 +251,10 @@ public class DependencyProvider { 
    public UserManager providesUserManager(Context context) {

        return context.getSystemService(UserManager.class);

    }



    /** */

    @Provides

    public ViewMediatorCallback providesViewMediatorCallback(KeyguardViewMediator viewMediator) {

        return viewMediator.getViewMediatorCallback();

    }

}