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

Commit 6e286810 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Use @ShadeDisplayAware Context and configuration in notification classes 

This will enable showing notifications correctly when the shade window is moved to another display.

Nothing changes as long as the flag is off.

Not injecting "unannotated" contexes or configuration providers will be banned in a follow up cl.

Bug: 362719719
Bug: 374267505
Test: SysUI unit tests
Flag: com.android.systemui.shade_window_goes_around
Change-Id: If720141a1dee7b4b967d764845010b1aec6a4663
parent 6dbe6f55

packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.internal.widget.MessagingLayout 
import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection
@@ -141,7 +142,7 @@ class ConversationNotificationManager 
@Inject

constructor(

    bindEventManager: BindEventManager,

    private val context: Context,

    @ShadeDisplayAware private val context: Context,

    private val notifCollection: CommonNotifCollection,

    @Main private val mainHandler: Handler

) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinator.kt

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.notification.collection.coordinator 


import android.content.Context

import com.android.systemui.res.R

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.statusbar.notification.AssistantFeedbackController

import com.android.systemui.statusbar.notification.collection.ListEntry

import com.android.systemui.statusbar.notification.collection.NotifPipeline
@@ -33,7 +34,7 @@ import javax.inject.Inject 
 */

@CoordinatorScope

class RowAppearanceCoordinator @Inject internal constructor(

    context: Context,

    @ShadeDisplayAware context: Context,

    private var mAssistantFeedbackController: AssistantFeedbackController,

    private var mSectionStyleProvider: SectionStyleProvider

) : Coordinator {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.statusbar.notification.row.NotificationGutsManager 
import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.util.Compile

import com.android.app.tracing.traceSection

import com.android.systemui.shade.ShadeDisplayAware

import javax.inject.Inject



/**
@@ -39,7 +40,7 @@ import javax.inject.Inject 
 */

@CoordinatorScope

class ViewConfigCoordinator @Inject internal constructor(

    private val mConfigurationController: ConfigurationController,

    @ShadeDisplayAware private val mConfigurationController: ConfigurationController,

    private val mLockscreenUserManager: NotificationLockscreenUserManager,

    private val mGutsManager: NotificationGutsManager,

    private val mKeyguardUpdateMonitor: KeyguardUpdateMonitor,

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.internal.util.NotificationMessagingUtil; 
import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.shade.ShadeDisplayAware;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -86,7 +87,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 


    @Inject

    public NotificationRowBinderImpl(

            Context context,

            @ShadeDisplayAware Context context,

            NotificationMessagingUtil notificationMessagingUtil,

            NotificationRemoteInputManager notificationRemoteInputManager,

            NotificationLockscreenUserManager notificationLockscreenUserManager,

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.statusbar.notification.collection.PipelineDumper 
import com.android.systemui.statusbar.notification.collection.provider.SectionHeaderVisibilityProvider

import com.android.systemui.statusbar.notification.stack.NotificationListContainer

import com.android.app.tracing.traceSection

import com.android.systemui.shade.ShadeDisplayAware

import dagger.assisted.Assisted

import dagger.assisted.AssistedFactory

import dagger.assisted.AssistedInject
@@ -36,7 +37,7 @@ import dagger.assisted.AssistedInject 
 * currently populate the notification shade.

 */

class ShadeViewManager @AssistedInject constructor(

    context: Context,

    @ShadeDisplayAware context: Context,

    @Assisted listContainer: NotificationListContainer,

    @Assisted private val stackController: NotifStackController,

    mediaContainerController: MediaContainerController,