diff options
2 files changed, 10 insertions, 17 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt index 6e25c8a5bc42..d2fff06ad746 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.layout.Layout import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntRect +import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.android.compose.animation.scene.ContentScope import com.android.compose.modifiers.padding @@ -117,12 +118,12 @@ constructor( ) Notifications( areNotificationsVisible = areNotificationsVisible, - isShadeLayoutWide = true, burnInParams = null, modifier = Modifier.fillMaxWidth(0.5f) .fillMaxHeight() - .align(alignment = Alignment.TopEnd), + .align(alignment = Alignment.TopEnd) + .padding(top = 12.dp), ) } } @@ -150,7 +151,6 @@ constructor( } Notifications( areNotificationsVisible = areNotificationsVisible, - isShadeLayoutWide = false, burnInParams = null, ) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt index f51049a10569..2b723634c11d 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt @@ -23,7 +23,6 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -31,11 +30,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource -import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.android.compose.animation.scene.ContentScope -import com.android.compose.modifiers.thenIf import com.android.systemui.common.ui.ConfigurationState import com.android.systemui.dagger.SysUISingleton import com.android.systemui.keyguard.ui.composable.blueprint.rememberBurnIn @@ -186,7 +183,6 @@ constructor( @Composable fun ContentScope.Notifications( areNotificationsVisible: Boolean, - isShadeLayoutWide: Boolean, burnInParams: BurnInParameters?, modifier: Modifier = Modifier, ) { @@ -198,16 +194,13 @@ constructor( stackScrollView = stackScrollView.get(), viewModel = rememberViewModel("Notifications") { viewModelFactory.create() }, modifier = - modifier - .fillMaxWidth() - .thenIf(isShadeLayoutWide) { Modifier.padding(top = 12.dp) } - .let { - if (burnInParams == null) { - it - } else { - it.burnInAware(viewModel = aodBurnInViewModel, params = burnInParams) - } - }, + modifier.fillMaxWidth().let { + if (burnInParams == null) { + it + } else { + it.burnInAware(viewModel = aodBurnInViewModel, params = burnInParams) + } + }, ) } } |