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

Commit 7f2e8cff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[flexiglass] Implementation of the Shade scene UI." into udc-qpr-dev... 

Merge "[flexiglass] Implementation of the Shade scene UI." into udc-qpr-dev am: 026dfde8 am: b565a405

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



Change-Id: Ia09f4d1e1490df204f85ba29752f966065a16562
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9068f25 b565a405

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+23 −3
Original line number Diff line number Diff line
@@ -17,15 +17,19 @@ 


package com.android.systemui.notifications.ui.composable



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.defaultMinSize

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.clip

import androidx.compose.ui.unit.dp



@Composable
@@ -34,10 +38,26 @@ fun Notifications( 
) {

    // TODO(b/272779828): implement.

    Column(

        modifier = modifier.fillMaxWidth().defaultMinSize(minHeight = 300.dp).padding(4.dp),

        modifier =

            modifier

                .fillMaxWidth()

                .defaultMinSize(minHeight = 300.dp)

                .clip(RoundedCornerShape(32.dp))

                .background(MaterialTheme.colorScheme.surface)

                .padding(16.dp),

    ) {

        Text("Notifications", modifier = Modifier.align(Alignment.CenterHorizontally))

        Text(

            text = "Notifications",

            modifier = Modifier.align(Alignment.CenterHorizontally),

            style = MaterialTheme.typography.titleLarge,

            color = MaterialTheme.colorScheme.onSurface,

        )

        Spacer(modifier = Modifier.weight(1f))

        Text("Shelf", modifier = Modifier.align(Alignment.CenterHorizontally))

        Text(

            text = "Shelf",

            modifier = Modifier.align(Alignment.CenterHorizontally),

            style = MaterialTheme.typography.titleSmall,

            color = MaterialTheme.colorScheme.onSurface,

        )

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/QuickSettings.kt

+23 −3
Original line number Diff line number Diff line
@@ -17,15 +17,19 @@ 


package com.android.systemui.qs.footer.ui.compose



import androidx.compose.foundation.background

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.defaultMinSize

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.clip

import androidx.compose.ui.unit.dp



@Composable
@@ -34,10 +38,26 @@ fun QuickSettings( 
) {

    // TODO(b/272780058): implement.

    Column(

        modifier = modifier.fillMaxWidth().defaultMinSize(minHeight = 300.dp).padding(4.dp),

        modifier =

            modifier

                .fillMaxWidth()

                .defaultMinSize(minHeight = 300.dp)

                .clip(RoundedCornerShape(32.dp))

                .background(MaterialTheme.colorScheme.primary)

                .padding(16.dp),

    ) {

        Text("Quick settings", modifier = Modifier.align(Alignment.CenterHorizontally))

        Text(

            text = "Quick settings",

            modifier = Modifier.align(Alignment.CenterHorizontally),

            style = MaterialTheme.typography.titleLarge,

            color = MaterialTheme.colorScheme.onPrimary,

        )

        Spacer(modifier = Modifier.weight(1f))

        Text("QS footer actions", modifier = Modifier.align(Alignment.CenterHorizontally))

        Text(

            text = "QS footer actions",

            modifier = Modifier.align(Alignment.CenterHorizontally),

            style = MaterialTheme.typography.titleSmall,

            color = MaterialTheme.colorScheme.onPrimary,

        )

    }

}

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

+17 −29
Original line number Diff line number Diff line
@@ -16,18 +16,19 @@ 


package com.android.systemui.shade.ui.composable



import androidx.compose.foundation.clickable

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Row

import androidx.compose.material3.Button

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.notifications.ui.composable.Notifications

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

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

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

import com.android.systemui.scene.shared.model.SceneModel
@@ -62,12 +63,7 @@ class ShadeScene( 
    override fun Content(

        containerName: String,

        modifier: Modifier,

    ) {

        ShadeScene(

            viewModel = viewModel,

            modifier = modifier,

        )

    }

    ) = ShadeScene(viewModel, modifier)



    private fun destinationScenes(

        up: SceneKey,
@@ -84,23 +80,15 @@ private fun ShadeScene( 
    viewModel: ShadeSceneViewModel,

    modifier: Modifier = Modifier,

) {

    // TODO(b/280887022): implement the real UI.



    Box(modifier = modifier) {

    Column(

        horizontalAlignment = Alignment.CenterHorizontally,

            modifier = Modifier.align(Alignment.Center)

        ) {

            Text("Shade", style = MaterialTheme.typography.headlineMedium)

            Row(

                horizontalArrangement = Arrangement.spacedBy(8.dp),

        verticalArrangement = Arrangement.spacedBy(16.dp),

        modifier =

            Modifier.fillMaxSize()

                .clickable(onClick = { viewModel.onContentClicked() })

                .padding(horizontal = 16.dp, vertical = 48.dp)

    ) {

                Button(

                    onClick = { viewModel.onContentClicked() },

                ) {

                    Text("Open some content")

                }

            }

        }

        QuickSettings(modifier = modifier.height(160.dp))

        Notifications(modifier = modifier.weight(1f))

    }

}