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

Commit 886cc125 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 tm-qpr-dev am: d56e9d59

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



Change-Id: I4ed87e61a27da44243ef46e5d12453d026e30286
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf78af27 d56e9d59

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.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;
@@ -256,9 +257,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