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

Commit c3bab320 authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Re-implement ShadeHeader disable in flexiglass" into main

parents 97f29153 e311d992

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+10 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ fun SceneScope.CollapsedShadeHeader( 
    statusBarIconController: StatusBarIconController,

    modifier: Modifier = Modifier,

) {

    val isDisabled by viewModel.isDisabled.collectAsState()

    if (isDisabled) {

        return

    }



    val formatProgress =

        animateSceneFloatAsState(0f, ShadeHeader.Keys.transitionProgress)

            .unsafeCompositionState(initialValue = 0f)
@@ -251,6 +256,11 @@ fun SceneScope.ExpandedShadeHeader( 
    statusBarIconController: StatusBarIconController,

    modifier: Modifier = Modifier,

) {

    val isDisabled by viewModel.isDisabled.collectAsState()

    if (isDisabled) {

        return

    }



    val formatProgress =

        animateSceneFloatAsState(1f, ShadeHeader.Keys.transitionProgress)

            .unsafeCompositionState(initialValue = 1f)

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.res.R 
import com.android.systemui.scene.shared.model.Scenes

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

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

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

import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.notificationsPlaceholderViewModel

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository
@@ -97,6 +98,7 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { 
            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { 
            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeHeaderViewModelTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.plugins.activityStarter

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

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

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

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel
@@ -69,6 +70,7 @@ class ShadeHeaderViewModelTest : SysuiTestCase() { 
            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeSceneViewModelTest.kt

+12 −11
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class ShadeSceneViewModelTest : SysuiTestCase() { 
            ShadeHeaderViewModel(

                applicationScope = testScope.backgroundScope,

                context = context,

                shadeInteractor = kosmos.shadeInteractor,

                mobileIconsInteractor = mobileIconsInteractor,

                mobileIconsViewModel = mobileIconsViewModel,

                privacyChipInteractor = kosmos.privacyChipInteractor,
@@ -285,11 +286,11 @@ class ShadeSceneViewModelTest : SysuiTestCase() { 


            qsSceneAdapter.setCustomizing(true)

            assertThat(

                        destinationScenes!!

                                .keys

                                .filterIsInstance<Swipe>()

                                .filter { it.direction == SwipeDirection.Up }

                ).isEmpty()

                    destinationScenes!!.keys.filterIsInstance<Swipe>().filter {

                        it.direction == SwipeDirection.Up

                    }

                )

                .isEmpty()

        }



    @Test