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

Commit 22f01492 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35313368'] into 25Q4-release. 

Change-Id: I012890662cb1082a0d0f033603e1d7c53bad45ea
parents f66807f0 fd7fc4b5

packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.shade.data.repository.ShadeRepository 
import com.android.systemui.shade.domain.interactor.ShadeDisplayStateInteractor

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

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

import com.android.systemui.shade.transition.ScrimShadeTransitionController

import com.android.systemui.statusbar.NotificationShadeDepthController

import com.android.systemui.statusbar.PulseExpansionHandler

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController
@@ -61,6 +62,7 @@ constructor( 
    private val shadeInteractorProvider: Provider<ShadeInteractor>,

    private val shadeModeInteractorProvider: Provider<ShadeModeInteractor>,

    private val splitShadeStateController: SplitShadeStateController,

    private val scrimShadeTransitionController: ScrimShadeTransitionController,

    private val sceneInteractorProvider: Provider<SceneInteractor>,

    private val shadeExpansionStateManager: ShadeExpansionStateManager,

    private val pulseExpansionHandler: PulseExpansionHandler,
@@ -74,6 +76,7 @@ constructor( 
        hydrateFullWidth()

        hydrateShadeExpansionStateManager()

        logTouchesTo(touchLog)

        scrimShadeTransitionController.init()

        pulseExpansionHandler.setUp(nsslc)

    }

packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.shade.transition 


import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dump.DumpManager

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

import com.android.systemui.shade.PanelState

import com.android.systemui.shade.ShadeExpansionChangeEvent

import com.android.systemui.shade.ShadeExpansionStateManager
@@ -63,7 +64,9 @@ constructor( 
    private fun onStateChanged() {

        val expansionEvent = lastExpansionEvent ?: return

        val expansionFraction = expansionEvent.fraction

        if (!SceneContainerFlag.isEnabled) {

            scrimController.get().setRawPanelExpansionFraction(expansionFraction)

        }

        lastExpansionFraction = expansionFraction

    }

packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.shade.data.repository.shadeRepository 
import com.android.systemui.shade.domain.interactor.shadeDisplayStateInteractor

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

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

import com.android.systemui.shade.transition.ScrimShadeTransitionController

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

import com.android.systemui.statusbar.notificationShadeDepthController

import com.android.systemui.statusbar.policy.splitShadeStateController
@@ -50,6 +51,7 @@ val Kosmos.shadeStartable by Fixture { 
        shadeInteractorProvider = { shadeInteractor },

        shadeModeInteractorProvider = { shadeModeInteractor },

        splitShadeStateController = splitShadeStateController,

        scrimShadeTransitionController = mock<ScrimShadeTransitionController>(),

        sceneInteractorProvider = { sceneInteractor },

        shadeExpansionStateManager = shadeExpansionStateManager,

        pulseExpansionHandler = pulseExpansionHandler,