Skip to content

Commit 9652dbc

Browse files
authored
android: only use new search for API 33+ (#627)
disable search for Android TV running < API 33 Updates tailscale/corp#27375 Signed-off-by: kari-ts <[email protected]>
1 parent 6ac6a45 commit 9652dbc

File tree

1 file changed

+5
-3
lines changed
  • android/src/main/java/com/tailscale/ipn/ui/view

1 file changed

+5
-3
lines changed

android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,13 +540,15 @@ fun PeerList(
540540
var isListFocussed by remember { mutableStateOf(false) }
541541
val expandedPeer = viewModel.expandedMenuPeer.collectAsState()
542542
val localClipboardManager = LocalClipboardManager.current
543-
val enableSearch = !isAndroidTV()
543+
// Restrict search to devices running API 33+ (see https://github.com/tailscale/corp/issues/27375)
544+
val enableSearch = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
545+
544546

545547
Column(modifier = Modifier.fillMaxSize()) {
546-
if (FeatureFlags.isEnabled("enable_new_search")) {
548+
if (enableSearch && FeatureFlags.isEnabled("enable_new_search")) {
547549
Search(onSearchBarClick)
548550
} else {
549-
if (enableSearch) {
551+
if (!isAndroidTV()) {
550552
Box(
551553
modifier =
552554
Modifier.fillMaxWidth().background(color = MaterialTheme.colorScheme.surface)) {

0 commit comments

Comments
 (0)