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

Commit 4ca169f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "launch-animation-leak" into rvc-dev am: 89d05dc6 am: 012e5739 

Change-Id: Iec1dc92c0815720d389048aaec904ce070ac8976
parents 1822e24b 012e5739

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

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.car.bluetooth.CarBatteryController; 
import com.android.systemui.car.navigationbar.CarNavigationBarController;

import com.android.systemui.classifier.FalsingLog;

import com.android.systemui.colorextraction.SysuiColorExtractor;

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

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

import com.android.systemui.fragments.FragmentHostManager;

import com.android.systemui.keyguard.DismissCallbackRegistry;
@@ -172,6 +173,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            @UiBackground Executor uiBgExecutor,

            @Main Executor mainExecutor,

            NotificationMediaManager notificationMediaManager,

            NotificationLockscreenUserManager lockScreenUserManager,

            NotificationRemoteInputManager remoteInputManager,
@@ -252,6 +254,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                displayMetrics,

                metricsLogger,

                uiBgExecutor,

                mainExecutor,

                notificationMediaManager,

                lockScreenUserManager,

                remoteInputManager,

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

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.bubbles.BubbleController; 
import com.android.systemui.car.CarDeviceProvisionedController;

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

import com.android.systemui.colorextraction.SysuiColorExtractor;

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

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

import com.android.systemui.keyguard.DismissCallbackRegistry;

import com.android.systemui.keyguard.KeyguardViewMediator;
@@ -147,6 +148,7 @@ public class CarStatusBarModule { 
            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            @UiBackground Executor uiBgExecutor,

            @Main Executor mainExecutor,

            NotificationMediaManager notificationMediaManager,

            NotificationLockscreenUserManager lockScreenUserManager,

            NotificationRemoteInputManager remoteInputManager,
@@ -226,6 +228,7 @@ public class CarStatusBarModule { 
                displayMetrics,

                metricsLogger,

                uiBgExecutor,

                mainExecutor,

                notificationMediaManager,

                lockScreenUserManager,

                remoteInputManager,