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

Commit 66c38a10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Wire-up window root view surface effects for flexiglass" into main

parents f455f723 98ffedf7

packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import kotlinx.coroutines.flow.StateFlow 
import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.stateIn



/** View binder that wires up scene container specific view bindings. */

object SceneWindowRootViewBinder {



    /** Binds between the view and view-model pertaining to a specific scene container. */

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

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.shade 
import android.annotation.SuppressLint

import android.content.ContentResolver

import android.os.Handler

import android.view.Choreographer

import android.view.LayoutInflater

import android.view.ViewStub

import androidx.constraintlayout.motion.widget.MotionLayout
@@ -45,6 +46,7 @@ import com.android.systemui.scene.ui.view.WindowRootView 
import com.android.systemui.scene.ui.view.WindowRootViewKeyEventHandler

import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel

import com.android.systemui.settings.UserTracker

import com.android.systemui.statusbar.BlurUtils

import com.android.systemui.statusbar.LightRevealScrim

import com.android.systemui.statusbar.NotificationInsetsController

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout
@@ -56,11 +58,14 @@ import com.android.systemui.statusbar.phone.TapAgainView 
import com.android.systemui.statusbar.policy.BatteryController

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.tuner.TunerService

import com.android.systemui.window.ui.WindowRootViewBinder

import com.android.systemui.window.ui.viewmodel.WindowRootViewModel

import dagger.Binds

import dagger.Module

import dagger.Provides

import javax.inject.Named

import javax.inject.Provider

import kotlinx.coroutines.CoroutineDispatcher



/** Module for providing views related to the shade. */

@Module
@@ -90,11 +95,22 @@ abstract class ShadeViewProviderModule { 
            qsSceneAdapter: Provider<QSSceneAdapter>,

            sceneJankMonitorFactory: SceneJankMonitor.Factory,

            windowRootViewKeyEventHandler: WindowRootViewKeyEventHandler,

            windowRootViewModelFactory: WindowRootViewModel.Factory,

            blurUtils: BlurUtils,

            choreographer: Choreographer?,

            @Main mainDispatcher: CoroutineDispatcher,

        ): WindowRootView {

            return if (SceneContainerFlag.isEnabled) {

                checkNoSceneDuplicates(scenesProvider.get())

                val sceneWindowRootView =

                    layoutInflater.inflate(R.layout.scene_window_root, null) as SceneWindowRootView

                WindowRootViewBinder.bind(

                    view = sceneWindowRootView,

                    viewModelFactory = windowRootViewModelFactory,

                    blurUtils = blurUtils,

                    choreographer = choreographer,

                    mainDispatcher = mainDispatcher,

                )

                sceneWindowRootView.init(

                    viewModelFactory = viewModelFactory,

                    containerConfig = containerConfigProvider.get(),