Merge changes Ibf005251,I8a2d9cf9 into main (0c2c302a) · Commits · e / os / android_frameworks_base

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

+72 −42

Original line number	Diff line number	Diff line
		@@ -19,25 +19,33 @@ package com.android.systemui.keyguard.ui.composable.section
		import android.content.Context
		import android.util.DisplayMetrics
		import android.view.WindowManager
		import androidx.compose.foundation.background
		import androidx.compose.foundation.layout.Box
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.layout.layout
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.unit.Constraints
		import androidx.compose.ui.unit.IntOffset
		import androidx.compose.ui.unit.IntRect
		import androidx.compose.ui.viewinterop.AndroidView
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.SceneScope
		import com.android.keyguard.LockIconView
		import com.android.keyguard.LockIconViewController
		import com.android.systemui.Flags.keyguardBottomAreaRefactor
		import com.android.systemui.biometrics.AuthController
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.flags.FeatureFlagsClassic
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.ui.binder.DeviceEntryIconViewBinder
		import com.android.systemui.keyguard.ui.composable.blueprint.BlueprintAlignmentLines
		import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
		import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryBackgroundViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryForegroundViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryIconViewModel
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.VibratorHelper
		import dagger.Lazy
		import javax.inject.Inject

		class LockSection
		@@ -46,17 +54,47 @@ constructor(
		private val windowManager: WindowManager,
		private val authController: AuthController,
		private val featureFlags: FeatureFlagsClassic,
		private val lockIconViewController: Lazy<LockIconViewController>,
		private val deviceEntryIconViewModel: Lazy<DeviceEntryIconViewModel>,
		private val deviceEntryForegroundViewModel: Lazy<DeviceEntryForegroundViewModel>,
		private val deviceEntryBackgroundViewModel: Lazy<DeviceEntryBackgroundViewModel>,
		private val falsingManager: Lazy<FalsingManager>,
		private val vibratorHelper: Lazy<VibratorHelper>,
		) {
		@Composable
		fun SceneScope.LockIcon(modifier: Modifier = Modifier) {
		MovableElement(
		key = LockIconElementKey,
		modifier = modifier,
		) {
		if (!keyguardBottomAreaRefactor() && !DeviceEntryUdfpsRefactor.isEnabled) {
		return
		}

		val context = LocalContext.current
		Box(

		AndroidView(
		factory = { context ->
		val view =
		if (DeviceEntryUdfpsRefactor.isEnabled) {
		DeviceEntryIconView(context, null).apply {
		id = R.id.device_entry_icon_view
		DeviceEntryIconViewBinder.bind(
		this,
		deviceEntryIconViewModel.get(),
		deviceEntryForegroundViewModel.get(),
		deviceEntryBackgroundViewModel.get(),
		falsingManager.get(),
		vibratorHelper.get(),
		)
		}
		} else {
		// keyguardBottomAreaRefactor()
		LockIconView(context, null).apply {
		id = R.id.lock_icon_view
		lockIconViewController.get().setLockIconView(this)
		}
		}
		view
		},
		modifier =
		Modifier.background(Color.Red).layout { measurable, _ ->
		modifier.element(LockIconElementKey).layout { measurable, _ ->
		val lockIconBounds = lockIconBounds(context)
		val placeable =
		measurable.measure(
		@@ -73,22 +111,14 @@ constructor(
		BlueprintAlignmentLines.LockIcon.Left to lockIconBounds.left,
		BlueprintAlignmentLines.LockIcon.Top to lockIconBounds.top,
		BlueprintAlignmentLines.LockIcon.Right to lockIconBounds.right,
		BlueprintAlignmentLines.LockIcon.Bottom to
		lockIconBounds.bottom,
		BlueprintAlignmentLines.LockIcon.Bottom to lockIconBounds.bottom,
		),
		) {
		placeable.place(0, 0)
		}
		},
		) {
		Text(
		text = "TODO(b/316211368): Lock",
		color = Color.White,
		modifier = Modifier.align(Alignment.Center),
		)
		}
		}
		}

		/**
		* Returns the bounds of the lock icon, in window view coordinates.

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

+55 −15

Original line number	Diff line number	Diff line
		@@ -16,34 +16,74 @@

		package com.android.systemui.keyguard.ui.composable.section

		import androidx.compose.foundation.background
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.material3.Text
		import android.view.View
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Alignment
		import androidx.compose.runtime.LaunchedEffect
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.remember
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.layout.onPlaced
		import androidx.compose.ui.layout.positionInWindow
		import androidx.compose.ui.viewinterop.AndroidView
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.SceneScope
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
		import com.android.systemui.res.R
		import com.android.systemui.scene.shared.flag.SceneContainerFlags
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController
		import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator
		import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
		import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder
		import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineDispatcher

		class NotificationSection @Inject constructor() {
		class NotificationSection
		@Inject
		constructor(
		private val rootViewModel: KeyguardRootViewModel,
		private val sharedNotificationContainer: SharedNotificationContainer,
		private val sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,
		private val controller: NotificationStackScrollLayoutController,
		private val notificationStackSizeCalculator: NotificationStackSizeCalculator,
		@Main private val dispatcher: CoroutineDispatcher,
		private val sceneContainerFlags: SceneContainerFlags,
		) {
		@Composable
		fun SceneScope.Notifications(modifier: Modifier = Modifier) {
		MovableElement(
		key = NotificationsElementKey,
		modifier = modifier,
		) {
		Box(
		modifier = Modifier.fillMaxSize().background(Color.Yellow),
		) {
		Text(
		text = "TODO(b/316211368): Notifications",
		color = Color.White,
		modifier = Modifier.align(Alignment.Center),
		val (bounds, onBoundsChanged) = remember { mutableStateOf<Pair<Float, Float>?>(null) }
		LaunchedEffect(bounds) {
		bounds?.let {
		rootViewModel.onNotificationContainerBoundsChanged(bounds.first, bounds.second)
		}
		}

		AndroidView(
		factory = { context ->
		View(context, null).apply {
		id = R.id.nssl_placeholder
		SharedNotificationContainerBinder.bind(
		view = sharedNotificationContainer,
		viewModel = sharedNotificationContainerViewModel,
		sceneContainerFlags = sceneContainerFlags,
		controller = controller,
		notificationStackSizeCalculator = notificationStackSizeCalculator,
		mainImmediateDispatcher = dispatcher,
		)
		}
		},
		modifier =
		modifier.onPlaced {
		val positionInRoot = it.positionInWindow()
		val size = it.size
		onBoundsChanged(positionInRoot.y to positionInRoot.y + size.height)
		},
		)
		}
		}
		}