Merge "[SB] Remove fillMaxSize in StatusBarRoot's top-level Box." into main (c9960c04) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/StackedMobileIconBinder.kt

+1 −6

Original line number	Diff line number	Diff line
		@@ -19,9 +19,7 @@ package com.android.systemui.statusbar.pipeline.mobile.ui.binder
		import androidx.compose.material3.LocalContentColor
		import androidx.compose.runtime.CompositionLocalProvider
		import androidx.compose.runtime.getValue
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.layout.onSizeChanged
		import androidx.compose.ui.platform.ViewCompositionStrategy
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		@@ -81,10 +79,7 @@ object StackedMobileIconBinder {
		val tint by tintFlow.collectAsStateWithLifecycle()
		if (viewModel.isIconVisible) {
		CompositionLocalProvider(LocalContentColor provides Color(tint)) {
		StackedMobileIcon(
		viewModel,
		modifier = Modifier.onSizeChanged { view.requestLayout() },
		)
		StackedMobileIcon(viewModel)
		}
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import androidx.annotation.VisibleForTesting
		import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.widthIn
		@@ -250,7 +249,7 @@ fun StatusBarRoot(
		return
		}

		Box(modifier.fillMaxSize()) {
		Box { // TODO(b/433578931): Remove this Box once the full solution for b/433578931 is settled.
		AndroidView(
		factory = { context ->
		val inflater = LayoutInflater.from(context)