Merge "[SB] Remove Disambiguation from StatusBarRoot." into main (a4b68164) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -25,9 +25,6 @@ object StatusBarRootModernization {
		/** Aconfig flag for removing the fragment */
		const val FLAG_NAME = Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION

		/** Shows a "compose->bar" text in the status bar for debug purposes */
		const val SHOW_DISAMBIGUATION = false

		/** A token used for dependency declaration */
		val token: FlagToken
		get() = FlagToken(FLAG_NAME, isEnabled)

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

+119 −152

Original line number	Diff line number	Diff line
		@@ -24,9 +24,7 @@ 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.widthIn
		import androidx.compose.foundation.layout.wrapContentSize
		@@ -35,7 +33,6 @@ import androidx.compose.runtime.Composable
		import androidx.compose.runtime.remember
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.draw.alpha
		import androidx.compose.ui.platform.ComposeView
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalLayoutDirection
		@@ -64,7 +61,6 @@ import com.android.systemui.statusbar.chips.ui.compose.OngoingActivityChips
		import com.android.systemui.statusbar.core.NewStatusBarIcons
		import com.android.systemui.statusbar.core.RudimentaryBattery
		import com.android.systemui.statusbar.core.StatusBarConnectedDisplays
		import com.android.systemui.statusbar.core.StatusBarRootModernization
		import com.android.systemui.statusbar.events.domain.interactor.SystemStatusEventAnimationInteractor
		import com.android.systemui.statusbar.featurepods.popups.StatusBarPopupChips
		import com.android.systemui.statusbar.featurepods.popups.ui.compose.StatusBarPopupChipsContainer
		@@ -85,7 +81,6 @@ import com.android.systemui.statusbar.pipeline.battery.ui.composable.UnifiedBatt
		import com.android.systemui.statusbar.pipeline.battery.ui.viewmodel.BatteryViewModel.Companion.STATUS_BAR_BATTERY_HEIGHT
		import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarIconBlockListBinder
		import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder
		import com.android.systemui.statusbar.pipeline.shared.ui.model.VisibilityModel
		import com.android.systemui.statusbar.pipeline.shared.ui.view.SystemStatusIconsLayoutHelper
		import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel
		import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.HomeStatusBarViewModelFactory
		@@ -185,13 +180,6 @@ fun StatusBarRoot(
		null
		}

		Box(modifier.fillMaxSize()) {
		// TODO(b/364360986): remove this before rolling the flag forward
		if (StatusBarRootModernization.SHOW_DISAMBIGUATION) {
		Disambiguation(viewModel = statusBarViewModel)
		}

		Row(Modifier.fillMaxSize()) {
		AndroidView(
		factory = { context ->
		val inflater = LayoutInflater.from(context)
		@@ -282,8 +270,7 @@ fun StatusBarRoot(
		chips = statusBarViewModel.popupChips,
		mediaHost = mediaHost,
		onMediaControlPopupVisibilityChanged = { popupShowing ->
		mediaHierarchyManager.isMediaControlPopupShowing =
		popupShowing
		mediaHierarchyManager.isMediaControlPopupShowing = popupShowing
		},
		)
		}
		@@ -303,10 +290,7 @@ fun StatusBarRoot(
		)
		}

		notificationIconsBinder.bindWhileAttached(
		notificationIconContainer,
		context.displayId,
		)
		notificationIconsBinder.bindWhileAttached(notificationIconContainer, context.displayId)

		if (StatusBarAlwaysUseRegionSampling.isAnyRegionSamplingEnabled) {
		bindRegionSamplingViewModel(
		@@ -327,11 +311,10 @@ fun StatusBarRoot(
		)
		onViewCreated(phoneStatusBarView)
		phoneStatusBarView
		}
		},
		modifier = modifier,
		)
		}
		}
		}

		/** Adds the composable chips shown on the start side of the status bar. */
		private fun addStartSideChipsComposable(
		@@ -525,22 +508,6 @@ private fun addSystemStatusIconsComposable(
		}
		}

		/**
		* This is our analog of the flexi "ribbon", which just shows some text so we know if the flag is on
		*/
		@Composable
		fun Disambiguation(viewModel: HomeStatusBarViewModel) {
		val clockVisibilityModel =
		viewModel.isClockVisible.collectAsStateWithLifecycle(
		initialValue = VisibilityModel(visibility = View.GONE, shouldAnimateChange = false)
		)
		if (clockVisibilityModel.value.visibility == View.VISIBLE) {
		Box(modifier = Modifier.fillMaxSize().alpha(0.5f), contentAlignment = Alignment.Center) {
		RetroText(text = "COMPOSE->BAR")
		}
		}
		}

		private fun bindRegionSamplingViewModel(
		displayId: Int,
		phoneStatusBarView: PhoneStatusBarView,