Merge "[flexiglass] remove separate flexi-notifs toggle" into main (1058f32d) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import com.android.systemui.statusbar.notification.stack.AmbientState
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController
		import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator
		import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled
		import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
		import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder
		import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder
		@@ -83,7 +82,7 @@ constructor(
		mainImmediateDispatcher = mainImmediateDispatcher,
		)

		if (sceneContainerFlags.flexiNotifsEnabled()) {
		if (sceneContainerFlags.isEnabled()) {
		NotificationStackAppearanceViewBinder.bind(
		context,
		sharedNotificationContainer,

+1 −13

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.remember
		import androidx.compose.runtime.snapshotFlow
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.draw.clip
		import androidx.compose.ui.draw.drawBehind
		@@ -355,18 +354,7 @@ private fun SceneScope.NotificationPlaceholder(
		)
		}
		) {
		content {
		if (viewModel.isPlaceholderTextVisible) {
		Box(Modifier.fillMaxSize()) {
		Text(
		text = "Notifications",
		style = MaterialTheme.typography.titleLarge,
		color = MaterialTheme.colorScheme.onSurface,
		modifier = Modifier.align(Alignment.Center),
		)
		}
		}
		}
		content {}
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import com.android.systemui.shade.NotificationPanelView
		import com.android.systemui.statusbar.notification.stack.AmbientState
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController
		import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator
		import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled
		import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
		import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder
		import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder
		@@ -115,7 +114,7 @@ constructor(
		)
		)

		if (sceneContainerFlags.flexiNotifsEnabled()) {
		if (sceneContainerFlags.isEnabled()) {
		disposableHandles.add(
		NotificationStackAppearanceViewBinder.bind(
		context,

+0 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import com.android.systemui.scene.shared.logger.SceneLogger
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.statusbar.NotificationShadeWindowController
		import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationInteractor
		import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled
		import com.android.systemui.statusbar.phone.CentralSurfaces
		import com.android.systemui.statusbar.policy.domain.interactor.DeviceProvisioningInteractor
		import com.android.systemui.util.asIndenting
		@@ -120,7 +119,6 @@ constructor(
		printSection("SceneContainerFlags") {
		println("isEnabled", flags.isEnabled())
		printSection("requirementDescription") { println(flags.requirementDescription()) }
		println("flexiNotifsEnabled", flags.flexiNotifsEnabled())
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import com.android.systemui.scene.shared.model.SceneDataSourceDelegator
		import com.android.systemui.scene.ui.composable.ComposableScene
		import com.android.systemui.scene.ui.composable.SceneContainer
		import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel
		import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled
		import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.SharingStarted
		@@ -116,7 +115,7 @@ object SceneWindowRootViewBinder {
		// the SceneContainerView. This SharedNotificationContainer should contain NSSL
		// due to the NotificationStackScrollLayoutSection (legacy) or
		// NotificationSection (scene container) moving it there.
		if (flags.flexiNotifsEnabled()) {
		if (flags.isEnabled()) {
		(sharedNotificationContainer.parent as? ViewGroup)?.removeView(
		sharedNotificationContainer
		)