Merge "[Dual Shade] Show the Android build info in the quick settings shade." into main (2d59833e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/toolbar/Toolbar.kt

+19 −2

Original line number	Diff line number	Diff line
		@@ -16,14 +16,20 @@

		package com.android.systemui.qs.panels.ui.compose.toolbar

		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.Spacer
		import androidx.compose.foundation.layout.wrapContentSize
		import androidx.compose.foundation.shape.CornerSize
		import androidx.compose.material3.MaterialTheme
		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.compose.modifiers.sysuiResTag
		import com.android.systemui.development.ui.compose.BuildNumber
		import com.android.systemui.qs.footer.ui.compose.IconButton
		import com.android.systemui.qs.panels.ui.viewmodel.toolbar.ToolbarViewModel
		import com.android.systemui.qs.ui.compose.borderOnFocus

		@Composable
		fun Toolbar(viewModel: ToolbarViewModel, modifier: Modifier = Modifier) {
		@@ -44,7 +50,18 @@ fun Toolbar(viewModel: ToolbarViewModel, modifier: Modifier = Modifier) {
		Modifier.sysuiResTag("settings_button_container"),
		)

		Spacer(modifier = Modifier.weight(1f))
		Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.Center) {
		BuildNumber(
		viewModelFactory = viewModel.buildNumberViewModelFactory,
		textColor = MaterialTheme.colorScheme.onSurface,
		modifier =
		Modifier.borderOnFocus(
		color = MaterialTheme.colorScheme.secondary,
		cornerSize = CornerSize(1.dp),
		)
		.wrapContentSize(),
		)
		}

		IconButton(
		{ viewModel.powerButtonViewModel },

packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/ToolbarViewModel.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import androidx.compose.runtime.setValue
		import com.android.systemui.animation.Expandable
		import com.android.systemui.classifier.domain.interactor.FalsingInteractor
		import com.android.systemui.classifier.domain.interactor.runIfNotFalseTap
		import com.android.systemui.development.ui.viewmodel.BuildNumberViewModel
		import com.android.systemui.globalactions.GlobalActionsDialogLite
		import com.android.systemui.lifecycle.ExclusiveActivatable
		import com.android.systemui.lifecycle.Hydrator
		@@ -46,6 +47,7 @@ class ToolbarViewModel
		@AssistedInject
		constructor(
		editModeButtonViewModelFactory: EditModeButtonViewModel.Factory,
		val buildNumberViewModelFactory: BuildNumberViewModel.Factory,
		private val footerActionsInteractor: FooterActionsInteractor,
		private val globalActionsDialogLiteProvider: Provider<GlobalActionsDialogLite>,
		private val falsingInteractor: FalsingInteractor,

packages/SystemUI/tests/utils/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/ToolbarViewModelKosmos.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.qs.panels.ui.viewmodel.toolbar

		import android.content.applicationContext
		import com.android.systemui.classifier.domain.interactor.falsingInteractor
		import com.android.systemui.development.ui.viewmodel.buildNumberViewModelFactory
		import com.android.systemui.globalactions.globalActionsDialogLite
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.qs.footerActionsInteractor
		@@ -29,6 +30,7 @@ val Kosmos.toolbarViewModelFactory by
		override fun create(): ToolbarViewModel {
		return ToolbarViewModel(
		editModeButtonViewModelFactory,
		buildNumberViewModelFactory,
		footerActionsInteractor,
		{ globalActionsDialogLite },
		falsingInteractor,