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

Commit 29c8dcf5 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Remove full qualifier in SystemUIModule for... 

Merge "Remove full qualifier in SystemUIModule for SystemStatusAnimationScheduler" into udc-dev am: 985854c5 am: bcbf41f1

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



Change-Id: If5972df6cfe25259a849e1c28b32d3b18005cfd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 524123f2 bcbf41f1

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

+2 −3
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.connectivity.ConnectivityModule;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
@@ -257,9 +258,7 @@ public abstract class SystemUIModule { 
    abstract FingerprintInteractiveToAuthProvider optionalFingerprintInteractiveToAuthProvider();



    @BindsOptionalOf

    //TODO(b/269430792 remove full qualifier. Full qualifier is used to avoid merge conflict.)

    abstract com.android.systemui.statusbar.events.SystemStatusAnimationScheduler

    optionalSystemStatusAnimationScheduler();

    abstract SystemStatusAnimationScheduler optionalSystemStatusAnimationScheduler();



    @SysUISingleton

    @Binds