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

Commit 99761d3f authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "[flexiglass] SceneContainer in System UI." into udc-qpr-dev am: a8a435e5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23624483



Change-Id: Iad786a58869e54010724539bb75fd964f35e9e46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b628017 a8a435e5

packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt

+11 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ import androidx.lifecycle.LifecycleOwner 
import com.android.systemui.multishade.ui.viewmodel.MultiShadeViewModel

import com.android.systemui.people.ui.viewmodel.PeopleViewModel

import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel

import com.android.systemui.scene.shared.model.Scene

import com.android.systemui.scene.shared.model.SceneKey

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

import com.android.systemui.util.time.SystemClock



/** The Compose facade, when Compose is *not* available. */
@@ -58,6 +61,14 @@ object ComposeFacade : BaseComposeFacade { 
        throwComposeUnavailableError()

    }



    override fun createSceneContainerView(

        context: Context,

        viewModel: SceneContainerViewModel,

        sceneByKey: Map<SceneKey, Scene>,

    ): View {

        throwComposeUnavailableError()

    }



    private fun throwComposeUnavailableError(): Nothing {

        error(

            "Compose is not available. Make sure to check isComposeAvailable() before calling any" +

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt

+23 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ import com.android.systemui.people.ui.compose.PeopleScreen 
import com.android.systemui.people.ui.viewmodel.PeopleViewModel

import com.android.systemui.qs.footer.ui.compose.FooterActions

import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel

import com.android.systemui.scene.shared.model.Scene

import com.android.systemui.scene.shared.model.SceneKey

import com.android.systemui.scene.ui.composable.ComposableScene

import com.android.systemui.scene.ui.composable.SceneContainer

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

import com.android.systemui.util.time.SystemClock



/** The Compose facade, when Compose is available. */
@@ -71,4 +76,22 @@ object ComposeFacade : BaseComposeFacade { 
            }

        }

    }



    override fun createSceneContainerView(

        context: Context,

        viewModel: SceneContainerViewModel,

        sceneByKey: Map<SceneKey, Scene>,

    ): View {

        return ComposeView(context).apply {

            setContent {

                PlatformTheme {

                    SceneContainer(

                        viewModel = viewModel,

                        sceneByKey =

                            sceneByKey.mapValues { (_, scene) -> scene as ComposableScene },

                    )

                }

            }

        }

    }

}

packages/SystemUI/src/com/android/systemui/compose/BaseComposeFacade.kt

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ import androidx.lifecycle.LifecycleOwner 
import com.android.systemui.multishade.ui.viewmodel.MultiShadeViewModel

import com.android.systemui.people.ui.viewmodel.PeopleViewModel

import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel

import com.android.systemui.scene.shared.model.Scene

import com.android.systemui.scene.shared.model.SceneKey

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

import com.android.systemui.util.time.SystemClock



/**
@@ -66,4 +69,11 @@ interface BaseComposeFacade { 
        viewModel: MultiShadeViewModel,

        clock: SystemClock,

    ): View



    /** Create a [View] to represent [viewModel] on screen. */

    fun createSceneContainerView(

        context: Context,

        viewModel: SceneContainerViewModel,

        sceneByKey: Map<SceneKey, Scene>,

    ): View

}

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.systemui.qs.tileimpl.QSFactoryImpl; 
import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.rotationlock.RotationLockModule;

import com.android.systemui.scene.SceneContainerFrameworkModule;

import com.android.systemui.screenshot.ReferenceScreenshotModule;

import com.android.systemui.settings.dagger.MultiUserUtilsModule;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;
@@ -104,7 +103,6 @@ import javax.inject.Named; 
        QSModule.class,

        ReferenceScreenshotModule.class,

        RotationLockModule.class,

        SceneContainerFrameworkModule.class,

        StatusBarEventsModule.class,

        StartCentralSurfacesModule.class,

        VolumeModule.class,

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.biometrics.FingerprintReEnrollNotification; 
import com.android.systemui.biometrics.UdfpsDisplayModeProvider;

import com.android.systemui.biometrics.dagger.BiometricsModule;

import com.android.systemui.biometrics.dagger.UdfpsModule;

import com.android.systemui.bouncer.ui.BouncerViewModule;

import com.android.systemui.classifier.FalsingModule;

import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule;

import com.android.systemui.common.ui.data.repository.CommonRepositoryModule;
@@ -52,7 +53,6 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.FlagsModule;

import com.android.systemui.keyboard.KeyboardModule;

import com.android.systemui.bouncer.ui.BouncerViewModule;

import com.android.systemui.log.dagger.LogModule;

import com.android.systemui.log.dagger.MonitorLog;

import com.android.systemui.log.table.TableLogBuffer;
@@ -73,6 +73,7 @@ import com.android.systemui.qs.QSFragmentStartableModule; 
import com.android.systemui.qs.footer.dagger.FooterActionsModule;

import com.android.systemui.recents.Recents;

import com.android.systemui.retail.dagger.RetailModeModule;

import com.android.systemui.scene.SceneContainerFrameworkModule;

import com.android.systemui.screenrecord.ScreenRecordModule;

import com.android.systemui.screenshot.dagger.ScreenshotModule;

import com.android.systemui.security.data.repository.SecurityRepositoryModule;
@@ -184,6 +185,7 @@ import javax.inject.Named; 
            QRCodeScannerModule.class,

            QSFragmentStartableModule.class,

            RetailModeModule.class,

            SceneContainerFrameworkModule.class,

            ScreenshotModule.class,

            SensorModule.class,

            SecurityRepositoryModule.class,