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

Commit 3c07855e authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Make PhoneStatusBarPolicy injectable." into rvc-dev am:... 

Merge "Merge "Make PhoneStatusBarPolicy injectable." into rvc-dev am: 2f9694c6 am: 553de2c9" into rvc-d1-dev-plus-aosp
parents 515a01ca 1dd22253

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

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ import com.android.systemui.statusbar.phone.LockscreenLockIconController; 
import com.android.systemui.statusbar.phone.LockscreenWallpaper;

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

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBar;
@@ -324,6 +325,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            PhoneStatusBarPolicy phoneStatusBarPolicy,

            DismissCallbackRegistry dismissCallbackRegistry,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            /* Car Settings injected components. */
@@ -407,6 +409,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                phoneStatusBarPolicy,

                dismissCallbackRegistry,

                statusBarTouchableRegionManager);

        mUserSwitcherController = userSwitcherController;

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

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ import com.android.systemui.statusbar.phone.LockscreenLockIconController; 
import com.android.systemui.statusbar.phone.LockscreenWallpaper;

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

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -197,6 +198,7 @@ public class CarStatusBarModule { 
            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            PhoneStatusBarPolicy phoneStatusBarPolicy,

            DismissCallbackRegistry dismissCallbackRegistry,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            CarServiceProvider carServiceProvider,
@@ -278,6 +280,7 @@ public class CarStatusBarModule { 
                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                phoneStatusBarPolicy,

                dismissCallbackRegistry,

                statusBarTouchableRegionManager,

                carServiceProvider,

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public final class Prefs { 
        get(context).unregisterOnSharedPreferenceChangeListener(listener);

    }



    private static SharedPreferences get(Context context) {

    public static SharedPreferences get(Context context) {

        return context.getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE);

    }

}

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

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME; 


import android.app.INotificationManager;

import android.content.Context;

import android.content.SharedPreferences;

import android.hardware.display.AmbientDisplayConfiguration;

import android.hardware.display.NightDisplayListener;

import android.os.Handler;
@@ -34,6 +35,7 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.util.NotificationMessagingUtil;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.Prefs;

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

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

import com.android.systemui.doze.AlwaysOnDisplayPolicy;
@@ -77,6 +79,13 @@ public class DependencyProvider { 
        return new Handler(thread.getLooper());

    }



    /** */

    @Provides

    @Main

    public SharedPreferences provideSharePreferences(Context context) {

        return Prefs.get(context);

    }



    /** */

    @Provides

    public AmbientDisplayConfiguration provideAmbientDispalyConfiguration(Context context) {

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

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ public class SystemServicesModule { 


    @Provides

    @Singleton

    @Nullable

    static TelecomManager provideTelecomManager(Context context) {

        return context.getSystemService(TelecomManager.class);

    }