Merge "Fixup a few flexiglass lockscreen layout issues" into main (0e1e27d7) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		package com.android.systemui.keyguard.ui.composable

		import com.android.systemui.keyguard.ui.composable.blueprint.CommunalBlueprintModule
		import com.android.systemui.keyguard.ui.composable.elements.OptionalElementModule
		import com.android.systemui.keyguard.ui.composable.elements.OEMElementProviderModule
		import dagger.Module

		@Module(includes = [CommunalBlueprintModule::class, OptionalElementModule::class])
		@Module(includes = [CommunalBlueprintModule::class, OEMElementProviderModule::class])
		interface LockscreenSceneBlueprintModule

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/ClockTransition.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.transitions.ClockSi
		import com.android.systemui.keyguard.ui.view.layout.sections.transitions.ClockSizeTransition.SmartspaceMoveTransition.Companion.STATUS_AREA_MOVE_UP_MILLIS

		object ClockTransition {
		// TODO(b/432451019): Rebuild to be dependent on new lockscreen clock element list.
		// TODO(b/438513876): Rebuild to be dependent on new lockscreen clock element list.
		// Possibly this makes sense to delegate fully to the clock plugins.
		val clockTransitions = transitions {}

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+3 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import androidx.compose.ui.Modifier
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.ContentScope
		import com.android.systemui.keyguard.ui.composable.LockscreenTouchHandling
		import com.android.systemui.keyguard.ui.composable.elements.AmbientIndicationElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.AodNotificationIconsElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.AodPromotedNotificationAreaElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.ClockRegionElementProvider
		@@ -35,6 +34,7 @@ import com.android.systemui.keyguard.ui.composable.elements.LockscreenLowerRegio
		import com.android.systemui.keyguard.ui.composable.elements.LockscreenUpperRegionElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.MediaElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.NotificationStackElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.OEMElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.SettingsMenuElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.ShortcutElementProvider
		import com.android.systemui.keyguard.ui.composable.elements.SmartspaceElementProvider
		@@ -46,7 +46,6 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel
		import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementContext
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys
		import java.util.Optional
		import javax.inject.Inject

		/** Renders the lockscreen scene when showing a standard phone or tablet layout */
		@@ -62,8 +61,7 @@ constructor(
		private val aodPromotedNotificationElementProvider: AodPromotedNotificationAreaElementProvider,
		private val lowerRegionElementProvider: LockscreenLowerRegionElementProvider,
		private val lockIconElementProvider: LockIconElementProvider,
		private val ambientIndicationElementProviderOptional:
		Optional<AmbientIndicationElementProvider>,
		private val oemElementProviders: Set<@JvmSuppressWildcards OEMElementProvider>,
		private val shortcutElementProvider: ShortcutElementProvider,
		private val indicationAreaElementProvider: IndicationAreaElementProvider,
		private val settingsMenuElementProvider: SettingsMenuElementProvider,
		@@ -95,7 +93,7 @@ constructor(
		aodPromotedNotificationElementProvider,
		currentClock?.smallClock?.layout,
		currentClock?.largeClock?.layout,
		ambientIndicationElementProviderOptional.get(),
		*oemElementProviders.toTypedArray(),
		)

		val burnIn = rememberBurnIn(keyguardClockViewModel)

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/ClockRegionElementProvider.kt

+8 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenEl
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.Clock
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.Smartspace
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementProvider
		import com.android.systemui.res.R
		import com.android.systemui.shade.ShadeDisplayAware
		import javax.inject.Inject
		import kotlin.collections.List
		@@ -80,7 +81,13 @@ constructor(
		verticalAlignment = Alignment.CenterVertically,
		modifier = paddingModifier,
		) {
		factory.lockscreenElement(Clock.Small, context)
		factory.lockscreenElement(
		Clock.Small,
		context,
		Modifier.padding(
		top = dimensionResource(R.dimen.keyguard_clock_top_margin)
		),
		)

		if (!shouldDateWeatherBeBelowSmallClock) {
		Column(

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/IndicationAreaElementProvider.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.systemui.keyguard.ui.composable.elements

		import android.content.Context
		import android.view.View
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		@@ -60,7 +60,7 @@ constructor(
		factory: LockscreenElementFactory,
		context: LockscreenElementContext,
		) {
		IndicationArea(modifier = Modifier.fillMaxWidth())
		IndicationArea()
		}
		}

		@@ -83,7 +83,7 @@ constructor(
		view
		},
		onRelease = { disposable?.dispose() },
		modifier = modifier.fillMaxWidth(),
		modifier = modifier.fillMaxSize(),
		)
		}
		}