Merge "Update e2e test selectors for lock screen user switcher" into main (796ff3c6) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -450,7 +450,7 @@ private fun BesideUserSwitcherLayout(
	viewModel = viewModel,		viewModel = viewModel,
	pinButtonRowVerticalSpacing = 12.dp,		pinButtonRowVerticalSpacing = 12.dp,
	centerPatternDotsVertically = true,		centerPatternDotsVertically = true,
	modifier = Modifier.align(Alignment.BottomCenter).testTag("InputArea"),		modifier = Modifier.align(Alignment.BottomCenter),
	)		)
	}		}

	@@ -904,12 +904,9 @@ private fun UserSwitcherDropdownMenu(
	DropdownMenu(		DropdownMenu(
	expanded = isExpanded,		expanded = isExpanded,
	onDismissRequest = onDismissed,		onDismissRequest = onDismissed,
	offset =		offset = DpOffset(x = 0.dp, y = -UserSwitcherDropdownHeight),
	DpOffset(		modifier =
	x = 0.dp,		Modifier.width(UserSwitcherDropdownWidth).sysuiResTag("user_switcher_dropdown"),
	y = -UserSwitcherDropdownHeight,
	),
	modifier = Modifier.width(UserSwitcherDropdownWidth),
	) {		) {
	items.forEach { userSwitcherDropdownItem ->		items.forEach { userSwitcherDropdownItem ->
	DropdownMenuItem(		DropdownMenuItem(