From 9652dbc6e4a47f735ca43d58d1aade2ce3f4f9ba Mon Sep 17 00:00:00 2001 From: kari-ts <135075563+kari-ts@users.noreply.github.com> Date: Wed, 26 Mar 2025 11:38:32 -0700 Subject: [PATCH] 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 --- .../src/main/java/com/tailscale/ipn/ui/view/MainView.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt index 6a25e03..7125da7 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt @@ -540,13 +540,15 @@ fun PeerList( var isListFocussed by remember { mutableStateOf(false) } val expandedPeer = viewModel.expandedMenuPeer.collectAsState() val localClipboardManager = LocalClipboardManager.current - val enableSearch = !isAndroidTV() + // Restrict search to devices running API 33+ (see https://github.com/tailscale/corp/issues/27375) + val enableSearch = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU + Column(modifier = Modifier.fillMaxSize()) { - if (FeatureFlags.isEnabled("enable_new_search")) { + if (enableSearch && FeatureFlags.isEnabled("enable_new_search")) { Search(onSearchBarClick) } else { - if (enableSearch) { + if (!isAndroidTV()) { Box( modifier = Modifier.fillMaxWidth().background(color = MaterialTheme.colorScheme.surface)) {