Merge "Update the hint text for search box in app list" into main (92bd6300) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt

+7 −2

Original line number	Diff line number	Diff line
		@@ -51,12 +51,14 @@ import androidx.compose.ui.focus.focusRequester
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.input.nestedscroll.nestedScroll
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.semantics.clearAndSetSemantics
		import androidx.compose.ui.text.input.ImeAction
		import androidx.compose.ui.text.input.TextFieldValue
		import androidx.compose.ui.tooling.preview.Preview
		import androidx.compose.ui.unit.Dp
		import androidx.lifecycle.ViewModel
		import androidx.lifecycle.viewmodel.compose.viewModel
		import com.android.settingslib.spa.framework.compose.contentDescription
		import com.android.settingslib.spa.framework.compose.hideKeyboardAction
		import com.android.settingslib.spa.framework.compose.horizontalValues
		import com.android.settingslib.spa.framework.theme.SettingsOpacity
		@@ -175,12 +177,15 @@ private fun SearchBox(query: TextFieldValue, onQueryChange: (TextFieldValue) ->
		onValueChange = onQueryChange,
		modifier = Modifier
		.fillMaxWidth()
		.focusRequester(focusRequester),
		.focusRequester(focusRequester)
		.contentDescription(stringResource(R.string.abc_search_hint)),
		textStyle = textStyle,
		placeholder = {
		Text(
		text = stringResource(R.string.abc_search_hint),
		modifier = Modifier.alpha(SettingsOpacity.Hint),
		modifier = Modifier
		.alpha(SettingsOpacity.Hint)
		.clearAndSetSemantics {},
		style = textStyle,
		)
		},

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ class SearchScaffoldTest {
		).performClick()
		}

		private fun onSearchHint() = composeTestRule.onNodeWithText(
		private fun onSearchHint() = composeTestRule.onNodeWithContentDescription(
		context.getString(R.string.abc_search_hint)
		)