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

Commit 0bc1809b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "status_bar_keyguard_view_manager" 

* changes:
  Inject StatusBarKeyguardViewManager into StatusBar
  Make StatusBarKeyguardViewManager injectable
parents 2f957aa7 032075cb

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/CarStatusBar.java

+10 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.car.notification.PreprocessingManager; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.RegisterStatusBarResult;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.BatteryMeterView;

import com.android.systemui.CarSystemUIFactory;

import com.android.systemui.Dependency;
@@ -68,6 +69,7 @@ import com.android.systemui.bubbles.BubbleController; 
import com.android.systemui.classifier.FalsingLog;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.fragments.FragmentHostManager;

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;
@@ -119,6 +121,7 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; 
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.StatusBarWindowController;

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

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

            SuperStatusBarViewFactory superStatusBarViewFactory,

            LightsOutNotifController lightsOutNotifController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            DismissCallbackRegistry dismissCallbackRegistry,

            /* Car Settings injected components. */

            CarNavigationBarController carNavigationBarController) {

        super(
@@ -364,7 +370,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                remoteInputUriController,

                dividerOptional,

                lightsOutNotifController,

                superStatusBarViewFactory);

                superStatusBarViewFactory,

                statusBarKeyguardViewManager,

                viewMediatorCallback,

                dismissCallbackRegistry);

        mScrimController = scrimController;

        mCarNavigationBarController = carNavigationBarController;

    }

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/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+9 −0
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ import android.util.DisplayMetrics; 


import com.android.internal.logging.MetricsLogger;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.UiOffloadThread;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;
@@ -73,6 +75,7 @@ import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper 
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.StatusBarWindowController;

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

import com.android.systemui.statusbar.policy.BatteryController;
@@ -167,6 +170,9 @@ public class CarStatusBarModule { 
            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            LightsOutNotifController lightsOutNotifController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            DismissCallbackRegistry dismissCallbackRegistry,

            CarNavigationBarController carNavigationBarController) {

        return new CarStatusBar(

                context,
@@ -232,6 +238,9 @@ public class CarStatusBarModule { 
                dividerOptional,

                superStatusBarViewFactory,

                lightsOutNotifController,

                statusBarKeyguardViewManager,

                viewMediatorCallback,

                dismissCallbackRegistry,

                carNavigationBarController);

    }

}