Merge "[SB] Add Box wrapper to StatusBarRoot." into main (88cc3c3a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt

+124 −120

Original line number	Diff line number	Diff line
		@@ -24,7 +24,9 @@ import android.view.ViewGroup
		import android.widget.LinearLayout
		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
		@@ -223,6 +225,7 @@ fun StatusBarRoot(
		return
		}

		Box(modifier.fillMaxSize()) {
		AndroidView(
		factory = { context ->
		val inflater = LayoutInflater.from(context)
		@@ -367,6 +370,7 @@ fun StatusBarRoot(
		onRelease = { touchableExclusionRegionDisposableHandle.dispose() },
		)
		}
		}

		/** Adds the composable chips shown on the start side of the status bar. */
		private fun addStartSideComposable(