OboeTester: consolidate CommDevice UI (#1811)

Move SCO dialog to CommDeviceView

To help debug b/282831177

6 files changed, 38 insertions, 32 deletions

diff --git a/apps/OboeTester/app/src/main/res/layout/activity_echo.xml b/apps/OboeTester/app/src/main/res/layout/activity_echo.xml
index 65cd6ea7..032494c8 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_echo.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_echo.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:fillViewport="true" >
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_main.xml b/apps/OboeTester/app/src/main/res/layout/activity_main.xml
index dc39b865..8f493608 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_main.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_main.xml
@@ -182,33 +182,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/textView" />
 
-    <LinearLayout
-        android:id="@+id/layoutBluetoothSco"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintStart_toStartOf="@+id/callbackSize"
-        app:layout_constraintTop_toBottomOf="@+id/callbackSize"
-        >
-        <CheckBox
-            android:id="@+id/setBluetoothScoOn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:checked="false"
-            android:onClick="onStartStopBluetoothSco"
-            android:text="start/stopBluetoothSco()"
-            />
-
-        <TextView
-            android:id="@+id/textBluetoothScoStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="12sp"
-            android:text="\?" />
-    </LinearLayout>
-
     <CheckBox
         android:id="@+id/boxEnableWorkarounds"
         android:layout_width="wrap_content"
@@ -216,8 +189,8 @@
         android:layout_marginTop="6dp"
         android:checked="false"
         android:text="enable Oboe workarounds"
-        app:layout_constraintStart_toStartOf="@+id/layoutBluetoothSco"
-        app:layout_constraintTop_toBottomOf="@+id/layoutBluetoothSco" />
+        app:layout_constraintStart_toStartOf="@+id/useCallback"
+        app:layout_constraintTop_toBottomOf="@+id/useCallback" />
 
     <CheckBox
         android:id="@+id/boxEnableBackground"
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml b/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml
index 09728da8..83c50ae4 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:fillViewport="true"
     tools:context="com.mobileer.oboetester.RoundTripLatencyActivity" >
+
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -92,6 +93,13 @@
             android:textSize="12sp" />
     </LinearLayout>
 
+    <com.mobileer.oboetester.CommunicationDeviceView
+        android:id="@+id/comm_device_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" />
+
     <TextView
         android:id="@+id/text_status"
         android:layout_width="match_parent"
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_tap_to_tone.xml b/apps/OboeTester/app/src/main/res/layout/activity_tap_to_tone.xml
index 6390e79d..da5d444c 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_tap_to_tone.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_tap_to_tone.xml
@@ -18,6 +18,13 @@
 
     <include layout="@layout/merge_audio_simple"/>
 
+    <com.mobileer.oboetester.CommunicationDeviceView
+        android:id="@+id/comm_device_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/apps/OboeTester/app/src/main/res/layout/comm_device_view.xml b/apps/OboeTester/app/src/main/res/layout/comm_device_view.xml
index 6144f8cd..bf4ed495 100644
--- a/apps/OboeTester/app/src/main/res/layout/comm_device_view.xml
+++ b/apps/OboeTester/app/src/main/res/layout/comm_device_view.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="#FFE8E0F0"
     android:orientation="vertical">
 
     <LinearLayout
@@ -14,16 +15,31 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="false"
-            android:text="setSpeakerphoneOn" />
+            android:text="SpkrPhone" />
 
         <TextView
-            android:id="@+id/isSpeakerphoneOn"
+            android:id="@+id/spkr_status_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" => ?" />
+            android:text="?" />
+
+        <CheckBox
+            android:id="@+id/setBluetoothScoOn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:text="BT_SCO"
+            />
+
+        <TextView
+            android:id="@+id/sco_status_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="?" />
 
     </LinearLayout>
 
+
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/apps/OboeTester/app/src/main/res/values/strings.xml b/apps/OboeTester/app/src/main/res/values/strings.xml
index b566a44d..120c0522 100644
--- a/apps/OboeTester/app/src/main/res/values/strings.xml
+++ b/apps/OboeTester/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="measure">Measure</string>
     <string name="cancel">Cancel</string>
     <string name="clear">Clear</string>
+    <string name="clear_comm">clearCommunicationDevice()</string>
     <string name="runTest">Run</string>
     <string name="cancelTest">Cancel</string>