Merge "Implement a smaller "go to dream" button on mobile." into main (76b5b552) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/CommunalToDreamButtonSection.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import androidx.compose.ui.graphics.Outline
		import androidx.compose.ui.graphics.Path
		import androidx.compose.ui.graphics.Shape
		import androidx.compose.ui.input.pointer.pointerInput
		import androidx.compose.ui.res.dimensionResource
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.unit.Density
		import androidx.compose.ui.unit.Dp
		@@ -71,6 +72,8 @@ constructor(
		return
		}

		val buttonSize = dimensionResource(R.dimen.communal_to_dream_button_size)

		if (viewModel.shouldShowTooltip) {
		Column(
		modifier =
		@@ -96,7 +99,6 @@ constructor(
		}

		companion object {
		private val buttonSize = 64.dp
		private val tooltipMaxWidth = 350.dp
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -126,4 +126,6 @@
		<dimen name="controls_content_padding">24dp</dimen>
		<dimen name="control_list_vertical_spacing">8dp</dimen>
		<dimen name="control_list_horizontal_spacing">16dp</dimen>

		<dimen name="communal_to_dream_button_size">64dp</dimen>
		</resources>

+2 −0

Original line number	Diff line number	Diff line
		@@ -953,6 +953,8 @@
		<dimen name="communal_widget_picker_desired_width">360dp</dimen>
		<dimen name="communal_widget_picker_desired_height">240dp</dimen>

		<dimen name="communal_to_dream_button_size">48dp</dimen>

		<!-- The width/height of the unlock icon view on keyguard. -->
		<dimen name="keyguard_lock_height">42dp</dimen>
		<dimen name="keyguard_lock_padding">20dp</dimen>