Merge "[QSDetailedView] Polish cast details view Ui" into main (25e66006) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -959,6 +959,8 @@
		<string name="quick_settings_cast_detail_empty_text">No devices available</string>
		<!-- QuickSettings: Cast unavailable, text when not connected to WiFi or ethernet[CHAR LIMIT=NONE] -->
		<string name="quick_settings_cast_no_network">No Wi\u2011Fi or Ethernet connection</string>
		<!-- QuickSettings: Cast details, text on the disconnect button, click to disconnect a device [CHAR LIMIT=NONE] -->
		<string name="quick_settings_cast_disconnect">Disconnect</string>
		<!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
		<string name="quick_settings_brightness_dialog_title">Brightness</string>
		<!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/CastDetailsContent.kt

+10 −7

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.heightIn
		import androidx.compose.foundation.layout.padding
		import androidx.compose.material3.Button
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		@@ -37,6 +38,8 @@ import androidx.compose.runtime.remember
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.testTag
		import androidx.compose.ui.res.dimensionResource
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.viewinterop.AndroidView
		import com.android.compose.ui.graphics.painter.rememberDrawablePainter
		@@ -45,6 +48,7 @@ import com.android.internal.app.MediaRouteChooserContentManager
		import com.android.internal.app.MediaRouteControllerContentManager
		import com.android.systemui.res.R as SystemUiR

		private val TILE_DETAILS_HORIZONTAL_PADDING = SystemUiR.dimen.tile_details_horizontal_padding
		private val MAX_CAST_LIST_HEIGHT = 5000.dp

		@Composable
		@@ -67,8 +71,7 @@ fun CastDetailsContent(castDetailsViewModel: CastDetailsViewModel) {
		) {
		Image(
		painter = rememberDrawablePainter(castDetailsViewModel.deviceIcon),
		// TODO(b/388321032): Replace this string with a string in a translatable xml file.
		contentDescription = "device icon",
		contentDescription = null,
		)
		CastControllerView(contentManager)
		CastControllerDisconnectButton(contentManager)
		@@ -154,10 +157,11 @@ fun CastControllerView(contentManager: MediaRouteControllerContentManager) {
		fun CastControllerDisconnectButton(contentManager: MediaRouteControllerContentManager) {
		Button(
		onClick = { contentManager.onDisconnectButtonClick() },
		modifier = Modifier.fillMaxWidth(),
		modifier =
		Modifier.fillMaxWidth()
		.padding(horizontal = dimensionResource(TILE_DETAILS_HORIZONTAL_PADDING)),
		) {
		// TODO(b/388321032): Replace this string with a string in a translatable xml file.
		Text(text = "Disconnect")
		Text(text = stringResource(id = SystemUiR.string.quick_settings_cast_disconnect))
		}
		}

		@@ -208,8 +212,7 @@ private fun customizeView(listView: ListView) {
		}

		private fun setPadding(context: Context, targetBackgroundView: LinearLayout) {
		val horizontalPadding =
		context.resources.getDimensionPixelSize(SystemUiR.dimen.tile_details_horizontal_padding)
		val horizontalPadding = context.resources.getDimensionPixelSize(TILE_DETAILS_HORIZONTAL_PADDING)
		targetBackgroundView.setPadding(
		horizontalPadding,
		targetBackgroundView.paddingTop,

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/CastDetailsContentTest.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.qs.tiles.dialog

		import androidx.compose.ui.test.assertIsDisplayed
		import androidx.compose.ui.test.junit4.createComposeRule
		import androidx.compose.ui.test.onNodeWithContentDescription
		import androidx.compose.ui.test.onNodeWithTag
		import androidx.compose.ui.test.onNodeWithText
		import androidx.compose.ui.test.performClick
		@@ -65,7 +64,6 @@ class CastDetailsContentTest : SysuiTestCase() {
		composeRule
		.onNodeWithTag(CastDetailsViewModel.CONTROLLER_VIEW_TEST_TAG)
		.assertDoesNotExist()
		composeRule.onNodeWithContentDescription("device icon").assertDoesNotExist()
		composeRule.onNodeWithText("Disconnect").assertDoesNotExist()

		verify(chooserContentManager).bindViews(any())
		@@ -80,7 +78,6 @@ class CastDetailsContentTest : SysuiTestCase() {
		composeRule.waitForIdle()

		composeRule.onNodeWithTag(CastDetailsViewModel.CONTROLLER_VIEW_TEST_TAG).assertExists()
		composeRule.onNodeWithContentDescription("device icon").assertExists()
		composeRule.onNodeWithText("Disconnect").assertExists()
		composeRule.onNodeWithTag(CastDetailsViewModel.CHOOSER_VIEW_TEST_TAG).assertDoesNotExist()