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

Commit 53a345f8 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato Committed by Nicolò Mazzucato
Browse files

Use @ShadeDisplayAware ConfigurationState in shade window 

This makes all shade window classes use the ShadeDisplayAware annotated ConfigurationState. This ensures the config change related to the correct window is propagated.

When the flag is disabled, no new behaviour happens (as the old global ConfigurationState is provided)

A linter will follow up to flag usages of the global one in potential shade classes.

Bug: 362719719
Bug: 374267505
Test: None
Flag: com.android.systemui.shade_window_goes_around
Change-Id: Ieac267d1e4b05cb4015cf765b29d7755efb31bee
parent 796ed183

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.systemui.plugins.FalsingManager 
import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.shade.NotificationShadeWindowView

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.KeyguardIndicationController

import com.android.systemui.statusbar.LightRevealScrim
@@ -93,7 +94,7 @@ constructor( 
    private val chipbarCoordinator: ChipbarCoordinator,

    private val keyguardBlueprintViewModel: KeyguardBlueprintViewModel,

    private val keyguardStatusViewComponentFactory: KeyguardStatusViewComponent.Factory,

    private val configuration: ConfigurationState,

    @ShadeDisplayAware private val configuration: ConfigurationState,

    private val context: Context,

    private val keyguardIndicationController: KeyguardIndicationController,

    private val shadeInteractor: ShadeInteractor,

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt

+6 −5
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.keyguard.MigrateClocksToBlueprint 
import com.android.systemui.keyguard.shared.model.KeyguardSection

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel

import com.android.systemui.res.R

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDisplayNotificationIconViewStore

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.StatusBarIconViewBindingFailureTracker
@@ -47,7 +48,7 @@ class AodNotificationIconsSection 
@Inject

constructor(

    private val context: Context,

    private val configurationState: ConfigurationState,

    @ShadeDisplayAware private val configurationState: ConfigurationState,

    private val iconBindingFailureTracker: StatusBarIconViewBindingFailureTracker,

    private val nicAodViewModel: NotificationIconContainerAlwaysOnDisplayViewModel,

    private val nicAodIconViewStore: AlwaysOnDisplayNotificationIconViewStore,
@@ -70,7 +71,7 @@ constructor( 
                    resources.getDimensionPixelSize(R.dimen.below_clock_padding_start_icons),

                    0,

                    0,

                    0

                    0,

                )

                setVisibility(View.INVISIBLE)

            }
@@ -113,18 +114,18 @@ constructor( 
                START,

                PARENT_ID,

                START,

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal),

            )

            connect(

                nicId,

                END,

                PARENT_ID,

                END,

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal),

            )

            constrainHeight(

                nicId,

                context.resources.getDimensionPixelSize(R.dimen.notification_shelf_height)

                context.resources.getDimensionPixelSize(R.dimen.notification_shelf_height),

            )

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerAlwaysOnDisplayViewBinder.kt

+3 −2
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
package com.android.systemui.statusbar.notification.icon.ui.viewbinder



import androidx.lifecycle.lifecycleScope

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.app.tracing.traceSection

import com.android.systemui.common.ui.ConfigurationState

import com.android.systemui.keyguard.ui.binder.KeyguardRootViewBinder

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.shade.ShadeDisplayAware

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

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.IconViewStore

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel
@@ -30,7 +32,6 @@ import com.android.systemui.statusbar.phone.ScreenOffAnimationController 
import com.android.systemui.statusbar.ui.SystemBarUtilsState

import javax.inject.Inject

import kotlinx.coroutines.DisposableHandle

import com.android.app.tracing.coroutines.launchTraced as launch



/** Binds a [NotificationIconContainer] to a [NotificationIconContainerAlwaysOnDisplayViewModel]. */

class NotificationIconContainerAlwaysOnDisplayViewBinder
@@ -38,7 +39,7 @@ class NotificationIconContainerAlwaysOnDisplayViewBinder 
constructor(

    private val viewModel: NotificationIconContainerAlwaysOnDisplayViewModel,

    private val keyguardRootViewModel: KeyguardRootViewModel,

    private val configuration: ConfigurationState,

    @ShadeDisplayAware private val configuration: ConfigurationState,

    private val failureTracker: StatusBarIconViewBindingFailureTracker,

    private val screenOffAnimationController: ScreenOffAnimationController,

    private val systemBarUtilsState: SystemBarUtilsState,

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerShelfViewBinder.kt

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.notification.icon.ui.viewbinder



import com.android.systemui.common.ui.ConfigurationState

import com.android.systemui.shade.ShadeDisplayAware

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

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.IconViewStore

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.bindIcons
@@ -30,7 +31,7 @@ class NotificationIconContainerShelfViewBinder 
@Inject

constructor(

    private val viewModel: NotificationIconContainerShelfViewModel,

    private val configuration: ConfigurationState,

    @ShadeDisplayAware private val configuration: ConfigurationState,

    private val systemBarUtilsState: SystemBarUtilsState,

    private val failureTracker: StatusBarIconViewBindingFailureTracker,

    private val viewStore: ShelfNotificationIconViewStore,

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerStatusBarViewBinder.kt

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
package com.android.systemui.statusbar.notification.icon.ui.viewbinder



import androidx.lifecycle.lifecycleScope

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.app.tracing.traceSection

import com.android.systemui.common.ui.ConfigurationState

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.shade.ShadeDisplayAware

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

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder.IconViewStore

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerStatusBarViewModel
@@ -27,14 +29,13 @@ import com.android.systemui.statusbar.phone.NotificationIconContainer 
import com.android.systemui.statusbar.ui.SystemBarUtilsState

import javax.inject.Inject

import kotlinx.coroutines.DisposableHandle

import com.android.app.tracing.coroutines.launchTraced as launch



/** Binds a [NotificationIconContainer] to a [NotificationIconContainerStatusBarViewModel]. */

class NotificationIconContainerStatusBarViewBinder

@Inject

constructor(

    private val viewModel: NotificationIconContainerStatusBarViewModel,

    private val configuration: ConfigurationState,

    @ShadeDisplayAware private val configuration: ConfigurationState,

    private val systemBarUtilsState: SystemBarUtilsState,

    private val failureTracker: StatusBarIconViewBindingFailureTracker,

    private val viewStore: StatusBarNotificationIconViewStore,