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

Commit e684ec38 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Central Surfaces] Make NotifQSContainer(&Controller) a singleton. 

Bug: 277762009
Test: compiles
Test: QS & shade still work
Change-Id: I25640fba97cc89724954dc7afd4e2cdd782ca5ec
parent 2057b587

packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID 
import androidx.constraintlayout.widget.ConstraintSet.START

import androidx.constraintlayout.widget.ConstraintSet.TOP

import com.android.systemui.R

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.fragments.FragmentService

import com.android.systemui.navigationbar.NavigationModeController
@@ -45,6 +46,7 @@ import kotlin.reflect.KMutableProperty0 
@VisibleForTesting

internal const val INSET_DEBOUNCE_MILLIS = 500L



@SysUISingleton

class NotificationsQSContainerController @Inject constructor(

        view: NotificationsQuickSettingsContainer,

        private val navigationModeController: NavigationModeController,

packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt

+9 −0
Original line number Diff line number Diff line
@@ -147,6 +147,15 @@ abstract class ShadeModule { 
            return notificationPanelView.findViewById(R.id.shade_falsing_tap_again)

        }



        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.

        @Provides

        @SysUISingleton

        fun providesNotificationsQuickSettingsContainer(

            notificationShadeWindowView: NotificationShadeWindowView,

        ): NotificationsQuickSettingsContainer {

            return notificationShadeWindowView.findViewById(R.id.notification_container_parent)

        }



        // TODO(b/277762009): Only allow this view's controller to inject the view. See above.

        @Provides

        @SysUISingleton

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+0 −10
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import com.android.systemui.flags.Flags; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shade.NotificationPanelView;

import com.android.systemui.shade.NotificationPanelViewController;

import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.NotificationsQuickSettingsContainer;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.statusbar.CommandQueue;
@@ -122,14 +120,6 @@ public abstract class StatusBarViewModule { 
    abstract ShadeViewController bindsShadeViewController(

            NotificationPanelViewController notificationPanelViewController);



    /** */

    @Provides

    @CentralSurfacesComponent.CentralSurfacesScope

    public static NotificationsQuickSettingsContainer getNotificationsQuickSettingsContainer(

            NotificationShadeWindowView notificationShadeWindowView) {

        return notificationShadeWindowView.findViewById(R.id.notification_container_parent);

    }



    @Binds

    @IntoSet

    abstract StatusBarBoundsProvider.BoundsChangeListener sysBarAttrsListenerAsBoundsListener(