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

Commit b06a5995 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L27500000962600793:N19100001397012006" into main 

* changes:
  Enable the Compose implementation of the QS footer actions
  Enable the Compose implementation of the PeopleSpaceActivity
  Hide Flexiglass Compose code behind a constant Boolean flag
parents 37324026 d1379f58

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+8 −2
Original line number Original line Diff line number Diff line
@@ -636,7 +636,13 @@ object Flags { 
    val CLIPBOARD_SHARED_TRANSITIONS =

    val CLIPBOARD_SHARED_TRANSITIONS =

            unreleasedFlag("clipboard_shared_transitions", teamfood = true)

            unreleasedFlag("clipboard_shared_transitions", teamfood = true)





    /**

     * Whether the scene container (Flexiglass) is enabled. Note that [SCENE_CONTAINER] should be

     * checked and toggled together with [SCENE_CONTAINER_ENABLED] so that ProGuard can remove

     * unused code from our APK at compile time.

     */

    // TODO(b/283300105): Tracking Bug

    // TODO(b/283300105): Tracking Bug

    @JvmField val SCENE_CONTAINER_ENABLED = false

    @JvmField val SCENE_CONTAINER = unreleasedFlag("scene_container")

    @JvmField val SCENE_CONTAINER = unreleasedFlag("scene_container")





    // 1900

    // 1900
@@ -764,11 +770,11 @@ object Flags { 




    /** Enable the Compose implementation of the PeopleSpaceActivity. */

    /** Enable the Compose implementation of the PeopleSpaceActivity. */

    @JvmField

    @JvmField

    val COMPOSE_PEOPLE_SPACE = unreleasedFlag("compose_people_space")

    val COMPOSE_PEOPLE_SPACE = releasedFlag("compose_people_space")





    /** Enable the Compose implementation of the Quick Settings footer actions. */

    /** Enable the Compose implementation of the Quick Settings footer actions. */

    @JvmField

    @JvmField

    val COMPOSE_QS_FOOTER_ACTIONS = unreleasedFlag("compose_qs_footer_actions")

    val COMPOSE_QS_FOOTER_ACTIONS = releasedFlag("compose_qs_footer_actions")





    /** Enable the share wifi button in Quick Settings internet dialog. */

    /** Enable the share wifi button in Quick Settings internet dialog. */

    @JvmField

    @JvmField

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,9 @@ abstract class ShadeViewProviderModule { 
            layoutInsetController: NotificationInsetsController,

            layoutInsetController: NotificationInsetsController,

        ): WindowRootView {

        ): WindowRootView {

            return if (

            return if (

                featureFlags.isEnabled(Flags.SCENE_CONTAINER) && ComposeFacade.isComposeAvailable()

                Flags.SCENE_CONTAINER_ENABLED &&

                    featureFlags.isEnabled(Flags.SCENE_CONTAINER) &&

                    ComposeFacade.isComposeAvailable()

            ) {

            ) {

                val sceneWindowRootView =

                val sceneWindowRootView =

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

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