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

Merge "[Central Surfaces] Make NotifQSContainer(&Controller) a singleton." into udc-qpr-dev

Browse Source
This commit is contained in:
Caitlin Shkuratov
2023-06-12 15:40:19 +00:00
committed by Android (Google) Code Review
parent cd2cd22d96 e684ec3813
commit bee9e9de6a
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt
View File

@@ -27,6 +27,7 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID
import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.START
import androidx.constraintlayout.widget.ConstraintSet.TOP import androidx.constraintlayout.widget.ConstraintSet.TOP
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.fragments.FragmentService import com.android.systemui.fragments.FragmentService
import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.navigationbar.NavigationModeController
@@ -45,6 +46,7 @@ import kotlin.reflect.KMutableProperty0
@VisibleForTesting @VisibleForTesting
internal const val INSET_DEBOUNCE_MILLIS = 500L internal const val INSET_DEBOUNCE_MILLIS = 500L
@SysUISingleton
class NotificationsQSContainerController @Inject constructor( class NotificationsQSContainerController @Inject constructor(
view: NotificationsQuickSettingsContainer, view: NotificationsQuickSettingsContainer,
private val navigationModeController: NavigationModeController, private val navigationModeController: NavigationModeController,

9
packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt
View File

@@ -154,6 +154,15 @@ abstract class ShadeModule {
return notificationPanelView.findViewById(R.id.shade_falsing_tap_again) 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. // TODO(b/277762009): Only allow this view's controller to inject the view. See above.
@Provides @Provides
@SysUISingleton @SysUISingleton

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

@@ -27,8 +27,6 @@ import com.android.systemui.flags.Flags;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.shade.NotificationPanelView; import com.android.systemui.shade.NotificationPanelView;
import com.android.systemui.shade.NotificationPanelViewController; 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.ShadeExpansionStateManager;
import com.android.systemui.shade.ShadeViewController; import com.android.systemui.shade.ShadeViewController;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
@@ -122,14 +120,6 @@ public abstract class StatusBarViewModule {
abstract ShadeViewController bindsShadeViewController( abstract ShadeViewController bindsShadeViewController(
NotificationPanelViewController notificationPanelViewController); NotificationPanelViewController notificationPanelViewController);
/** */
@Provides
@CentralSurfacesComponent.CentralSurfacesScope
public static NotificationsQuickSettingsContainer getNotificationsQuickSettingsContainer(
NotificationShadeWindowView notificationShadeWindowView) {
return notificationShadeWindowView.findViewById(R.id.notification_container_parent);
}
@Binds @Binds
@IntoSet @IntoSet
abstract StatusBarBoundsProvider.BoundsChangeListener sysBarAttrsListenerAsBoundsListener( abstract StatusBarBoundsProvider.BoundsChangeListener sysBarAttrsListenerAsBoundsListener(