Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove full qualifier in SystemUIModule for SystemStatusAnimationScheduler" into tm-qpr-dev

Browse Source
This commit is contained in:
Johannes Gallmann
2023-03-03 13:04:07 +00:00
committed by Android (Google) Code Review
parent 44aa0c7f2a 9351a09c9c
commit d56e9d5940
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
View File

@@ -75,6 +75,7 @@ import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationLockscreenUserManager;
import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.NotificationShadeWindowController;
import com.android.systemui.statusbar.connectivity.ConnectivityModule; 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.NotifPipeline;
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder; import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl; import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;
@@ -256,9 +257,7 @@ public abstract class SystemUIModule {
abstract FingerprintInteractiveToAuthProvider optionalFingerprintInteractiveToAuthProvider(); abstract FingerprintInteractiveToAuthProvider optionalFingerprintInteractiveToAuthProvider();
@BindsOptionalOf @BindsOptionalOf
//TODO(b/269430792 remove full qualifier. Full qualifier is used to avoid merge conflict.) abstract SystemStatusAnimationScheduler optionalSystemStatusAnimationScheduler();
abstract com.android.systemui.statusbar.events.SystemStatusAnimationScheduler
optionalSystemStatusAnimationScheduler();
@SysUISingleton @SysUISingleton
@Binds @Binds