update

software/android/app/src/main/res/layout/activity_main.xml

@@ -37,11 +37,13 @@
             app:layout_constraintTop_toBottomOf="@+id/hexapod_logo">
 
             <com.google.android.material.tabs.TabItem
+                android:id="@+id/wifi_tab"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="WiFi" />
 
             <com.google.android.material.tabs.TabItem
+                android:id="@+id/bluetooth_tab"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Bluetooth" />
@@ -92,19 +94,6 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <ListView
-            android:id="@+id/paired_devices"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:stackFromBottom="true"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/port_input_layout"
-            app:layout_constraintBottom_toTopOf="@id/selected"
-            android:visibility="visible"/>
-
         <include
             android:id="@+id/selected"
             android:visibility="visible"

software/android/app/src/main/res/layout/device_name.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="5dp"
-    android:textSize="18sp"
-    />

software/android/app/src/main/res/layout/selected_device.xml

@@ -6,7 +6,9 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp">
 
     <ImageView
         android:id="@+id/imageView"