Merge "[flexiglass] Removes sideways modifier." into main (c6114cc1) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+4 −3

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.LifecycleOwner
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.compose.animation.Expandable
		import com.android.compose.animation.scene.SceneScope
		import com.android.compose.modifiers.background
		import com.android.compose.theme.LocalAndroidColorScheme
		import com.android.compose.theme.colorAttr
		@@ -77,16 +78,16 @@ import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsButtonViewModel
		import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsForegroundServicesButtonViewModel
		import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsSecurityButtonViewModel
		import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel
		import com.android.systemui.qs.ui.composable.QuickSettings
		import com.android.systemui.qs.ui.composable.QuickSettingsTheme
		import com.android.systemui.res.R
		import kotlinx.coroutines.launch

		@Composable
		fun FooterActionsWithAnimatedVisibility(
		fun SceneScope.FooterActionsWithAnimatedVisibility(
		viewModel: FooterActionsViewModel,
		isCustomizing: Boolean,
		lifecycleOwner: LifecycleOwner,
		footerActionsModifier: (Modifier) -> Modifier,
		modifier: Modifier = Modifier,
		) {
		AnimatedVisibility(visible = !isCustomizing, modifier = modifier.fillMaxWidth()) {
		@@ -96,7 +97,7 @@ fun FooterActionsWithAnimatedVisibility(
		FooterActions(
		viewModel = viewModel,
		qsVisibilityLifecycleOwner = lifecycleOwner,
		modifier = footerActionsModifier(Modifier),
		modifier = Modifier.element(QuickSettings.Elements.FooterActions),
		)
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import com.android.systemui.battery.BatteryMeterViewController
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.qs.footer.ui.compose.FooterActions
		import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel
		import com.android.systemui.res.R
		@@ -249,9 +248,6 @@ private fun SceneScope.QuickSettingsScene(
		viewModel = footerActionsViewModel,
		isCustomizing = isCustomizing,
		lifecycleOwner = lifecycleOwner,
		footerActionsModifier = { modifier ->
		modifier.element(QuickSettings.Elements.FooterActions)
		},
		modifier = Modifier.align(Alignment.CenterHorizontally),
		)
		}

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -347,9 +347,6 @@ private fun SceneScope.SplitShade(
		viewModel = footerActionsViewModel,
		isCustomizing = isCustomizing,
		lifecycleOwner = lifecycleOwner,
		footerActionsModifier = { modifier ->
		modifier.element(QuickSettings.Elements.FooterActions)
		},
		modifier = Modifier.align(Alignment.CenterHorizontally),
		)
		}