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

Commit f3003485 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I33e247b6,I27f8f209 into udc-qpr-dev am: b89d4210 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24266357



Change-Id: I3836da5ecc0e6a09a288db7402c86eae917fb3e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f92110f b89d4210

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

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ import com.android.systemui.statusbar.notification.row.dagger.NotificationRowCom 
import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;

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

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

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

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -184,6 +185,7 @@ import javax.inject.Named; 
            MediaProjectionModule.class,

            MediaProjectionTaskSwitcherModule.class,

            MotionToolModule.class,

            NotificationIconAreaControllerModule.class,

            PeopleHubModule.class,

            PeopleModule.class,

            PluginModule.class,