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

Commit b61d30d4 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Move DI related coded into new dagger package."

parents d648abd6 f4736814

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 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;

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 


import com.android.systemui.car.CarNotificationEntryManager;

import com.android.systemui.car.CarNotificationInterruptionStateProvider;

import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.power.EnhancedEstimates;

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.systemui;



import com.android.systemui.dagger.DependencyBinder;

import com.android.systemui.dagger.DependencyProvider;

import com.android.systemui.dagger.SystemServicesModule;

import com.android.systemui.dagger.SystemUIModule;

import com.android.systemui.dagger.SystemUIRootComponent;



import javax.inject.Singleton;



import dagger.Component;
@@ -26,6 +32,7 @@ import dagger.Component; 
                DependencyProvider.class,

                DependencyBinder.class,

                SystemUIFactory.ContextHolder.class,

                SystemServicesModule.class,

                SystemUIModule.class,

                CarSystemUIModule.class,

                CarSystemUIBinder.class

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java

+2 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.navigationbar.car;



import static com.android.systemui.Dependency.MAIN_HANDLER_NAME;



import android.content.Context;

import android.graphics.PixelFormat;

import android.inputmethodservice.InputMethodService;
@@ -35,6 +33,7 @@ import com.android.internal.statusbar.IStatusBarService; 
import com.android.internal.statusbar.RegisterStatusBarResult;

import com.android.systemui.R;

import com.android.systemui.SystemUI;

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

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;
@@ -47,7 +46,6 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;



import javax.inject.Inject;

import javax.inject.Named;



import dagger.Lazy;
@@ -96,7 +94,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
            WindowManager windowManager,

            DeviceProvisionedController deviceProvisionedController,

            Lazy<FacetButtonTaskStackListener> facetButtonTaskStackListener,

            @Named(MAIN_HANDLER_NAME) Handler mainHandler,

            @MainHandler Handler mainHandler,

            Lazy<KeyguardStateController> keyguardStateController,

            Lazy<CarFacetButtonController> facetButtonController,

            Lazy<NavigationBarController> navigationBarController,

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.Dependency.MAIN_LOOPER_NAME;



import android.annotation.AnyThread;

import android.annotation.MainThread;
@@ -101,6 +100,7 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.settingslib.WirelessUtils;

import com.android.systemui.DejankUtils;

import com.android.systemui.R;

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

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.TaskStackChangeListener;

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -118,7 +118,6 @@ import java.util.TimeZone; 
import java.util.function.Consumer;



import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Singleton;



/**
@@ -1500,7 +1499,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 


    @VisibleForTesting

    @Inject

    protected KeyguardUpdateMonitor(Context context, @Named(MAIN_LOOPER_NAME) Looper mainLooper) {

    protected KeyguardUpdateMonitor(Context context, @MainLooper Looper mainLooper) {

        mContext = context;

        mSubscriptionManager = SubscriptionManager.from(context);

        mDeviceProvisioned = isDeviceProvisionedInSettingsDb();