Merge "[flexiglass] Fixes crashloop in LockscreenScene." into main (804f3ca0) · Commits · e / os / android_frameworks_base

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

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -102,17 +102,19 @@ private fun LockscreenScene(
	longPressViewModel: KeyguardLongPressViewModel,		longPressViewModel: KeyguardLongPressViewModel,
	modifier: Modifier = Modifier,		modifier: Modifier = Modifier,
	) {		) {
	var settingsMenu: View? = null		fun findSettingsMenu(): View {
			return viewProvider().requireViewById(R.id.keyguard_settings_button)
			}

	Box(		Box(
	modifier = modifier,		modifier = modifier,
	) {		) {
	LongPressSurface(		LongPressSurface(
	viewModel = longPressViewModel,		viewModel = longPressViewModel,
	isSettingsMenuVisible = { settingsMenu?.isVisible == true },		isSettingsMenuVisible = { findSettingsMenu().isVisible },
	settingsMenuBounds = {		settingsMenuBounds = {
	val bounds = android.graphics.Rect()		val bounds = android.graphics.Rect()
	settingsMenu?.getHitRect(bounds)		findSettingsMenu().getHitRect(bounds)
	bounds.toComposeRect()		bounds.toComposeRect()
	},		},
	modifier = Modifier.fillMaxSize(),		modifier = Modifier.fillMaxSize(),
	@@ -124,12 +126,8 @@ private fun LockscreenScene(
	// Remove the KeyguardRootView from any parent it might already have in legacy code		// Remove the KeyguardRootView from any parent it might already have in legacy code
	// just in case (a view can't have two parents).		// just in case (a view can't have two parents).
	(keyguardRootView.parent as? ViewGroup)?.removeView(keyguardRootView)		(keyguardRootView.parent as? ViewGroup)?.removeView(keyguardRootView)
	settingsMenu = keyguardRootView.requireViewById(R.id.keyguard_settings_button)
	keyguardRootView		keyguardRootView
	},		},
	update = { keyguardRootView ->
	keyguardRootView.requireViewById<View>(R.id.lock_icon_view)
	},
	modifier = Modifier.fillMaxSize(),		modifier = Modifier.fillMaxSize(),
	)		)
	}		}