Merge 2c7c03b667 into be50a28f72

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

@@ -18,10 +18,12 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -614,7 +616,8 @@ fun PeerList(
             Modifier.fillMaxWidth()
                 .weight(1f) // LazyColumn gets the remaining vertical space
                 .onFocusChanged { isListFocussed = it.isFocused }
-                .background(color = MaterialTheme.colorScheme.surface)) {
+                .background(color = MaterialTheme.colorScheme.surface)
+                .windowInsetsPadding(WindowInsets.navigationBars)) {
           // Handle case when no results are found
           if (showNoResults) {
             item {