From a51def909ee461c6324e3535aedf1268f2d7266b Mon Sep 17 00:00:00 2001
From: Phil Burk <philburk@mobileer.com>
Date: Wed, 8 May 2024 16:17:47 -0700
Subject: [PATCH] OboeTester: use AppCompatSpinner and AppCompatActivity

For #2017
---
 apps/OboeTester/app/build.gradle              |  1 +
 .../app/src/main/AndroidManifest.xml          | 19 +++++++++++++++++++
 .../audio_device/AudioDeviceAdapter.java      |  1 +
 .../audio_device/AudioDeviceSpinner.java      | 15 +++++----------
 .../CommunicationDeviceSpinner.java           | 15 +++++----------
 .../mobileer/oboetester/AnalyzerActivity.java |  8 +-------
 .../oboetester/BaseOboeTesterActivity.java    |  6 ++++--
 .../mobileer/oboetester/BufferSizeView.java   |  4 +---
 .../oboetester/CommunicationDeviceView.java   |  3 ---
 .../oboetester/DeviceReportActivity.java      |  5 +++--
 .../com/mobileer/oboetester/EchoActivity.java |  1 -
 .../oboetester/ExternalTapToToneActivity.java |  8 +++-----
 .../oboetester/ExtraTestsActivity.java        |  2 --
 .../mobileer/oboetester/GlitchActivity.java   |  1 -
 .../oboetester/IntentBasedTestSupport.java    |  1 -
 .../com/mobileer/oboetester/MainActivity.java |  2 --
 .../oboetester/RoundTripLatencyActivity.java  |  2 +-
 .../oboetester/StreamConfiguration.java       |  2 --
 .../oboetester/StreamConfigurationView.java   |  4 ++--
 .../oboetester/TapToToneActivity.java         |  8 ++------
 .../oboetester/TestAudioActivity.java         |  5 +++--
 .../TestColdStartLatencyActivity.java         |  5 ++---
 .../oboetester/TestDataPathsActivity.java     |  4 ----
 .../oboetester/TestDisconnectActivity.java    |  1 -
 .../oboetester/TestErrorCallbackActivity.java |  5 +++--
 .../oboetester/TestInputActivity.java         |  1 +
 .../oboetester/TestOutputActivityBase.java    |  4 ----
 .../oboetester/TestPlugLatencyActivity.java   |  5 -----
 .../TestRouteDuringCallbackActivity.java      |  5 +++--
 .../com/mobileer/oboetester/WorkloadView.java |  1 -
 30 files changed, 60 insertions(+), 84 deletions(-)

diff --git a/apps/OboeTester/app/build.gradle b/apps/OboeTester/app/build.gradle
index 702d290b4..b56181ac0 100644
--- a/apps/OboeTester/app/build.gradle
+++ b/apps/OboeTester/app/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "androidx.core:core-ktx:1.9.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/apps/OboeTester/app/src/main/AndroidManifest.xml b/apps/OboeTester/app/src/main/AndroidManifest.xml
index fdfd8d95f..e6f6cd312 100644
--- a/apps/OboeTester/app/src/main/AndroidManifest.xml
+++ b/apps/OboeTester/app/src/main/AndroidManifest.xml
@@ -36,6 +36,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -47,77 +48,95 @@
         <activity
             android:name=".TestOutputActivity"
             android:label="@string/title_activity_test_output"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".TestInputActivity"
             android:label="@string/title_activity_test_input"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".TapToToneActivity"
             android:label="@string/title_activity_output_latency"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".RecorderActivity"
             android:label="@string/title_activity_recorder"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".EchoActivity"
             android:label="@string/title_activity_echo"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".RoundTripLatencyActivity"
             android:label="@string/title_activity_rt_latency"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ManualGlitchActivity"
             android:label="@string/title_activity_glitches"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".AutomatedGlitchActivity"
             android:label="@string/title_activity_auto_glitches"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".TestDisconnectActivity"
             android:label="@string/title_test_disconnect"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DeviceReportActivity"
             android:label="@string/title_report_devices"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".TestDataPathsActivity"
             android:label="@string/title_data_paths"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ExtraTestsActivity"
             android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:label="@string/title_extra_tests" />
 
         <activity
             android:name=".ExternalTapToToneActivity"
             android:label="@string/title_external_tap"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true" />
         <activity
             android:name=".TestPlugLatencyActivity"
             android:label="@string/title_plug_latency"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true" />
         <activity
             android:name=".TestErrorCallbackActivity"
             android:label="@string/title_error_callback"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true" />
         <activity
             android:name=".TestRouteDuringCallbackActivity"
             android:label="@string/title_route_during_callback"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true" />
 
         <activity
             android:name=".DynamicWorkloadActivity"
             android:label="@string/title_dynamic_load"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true" />
 
         <activity
             android:name=".TestColdStartLatencyActivity"
             android:label="@string/title_cold_start_latency"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true" />
 
         <service
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceAdapter.java b/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceAdapter.java
index 6444b2a7a..4542227bf 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceAdapter.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceAdapter.java
@@ -21,6 +21,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceSpinner.java b/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceSpinner.java
index 3c4390ae7..2e0333d7c 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceSpinner.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/AudioDeviceSpinner.java
@@ -22,13 +22,14 @@
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.util.AttributeSet;
-import android.widget.Spinner;
+
+import androidx.appcompat.widget.AppCompatSpinner;
 
 import com.mobileer.oboetester.R;
 
 import java.util.List;
 
-public class AudioDeviceSpinner extends Spinner {
+public class AudioDeviceSpinner extends AppCompatSpinner {
 
     private static final int AUTO_SELECT_DEVICE_ID = 0;
     private static final String TAG = AudioDeviceSpinner.class.getName();
@@ -63,14 +64,8 @@ public AudioDeviceSpinner(Context context, AttributeSet attrs, int defStyleAttr,
     }
 
     public AudioDeviceSpinner(Context context, AttributeSet attrs, int defStyleAttr,
-                              int defStyleRes, int mode){
-        super(context, attrs, defStyleAttr, defStyleRes, mode);
-        setup(context);
-    }
-
-    public AudioDeviceSpinner(Context context, AttributeSet attrs, int defStyleAttr,
-                              int defStyleRes, int mode, Theme popupTheme){
-        super(context, attrs, defStyleAttr, defStyleRes, mode, popupTheme);
+                                      int mode, Theme popupTheme){
+        super(context, attrs, defStyleAttr, mode, popupTheme);
         setup(context);
     }
 
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/CommunicationDeviceSpinner.java b/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/CommunicationDeviceSpinner.java
index 46a924f57..32ccda5d4 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/CommunicationDeviceSpinner.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/audio_device/CommunicationDeviceSpinner.java
@@ -22,13 +22,14 @@
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.util.AttributeSet;
-import android.widget.Spinner;
+
+import androidx.appcompat.widget.AppCompatSpinner;
 
 import com.mobileer.oboetester.R;
 
 import java.util.List;
 
-public class CommunicationDeviceSpinner extends Spinner {
+public class CommunicationDeviceSpinner extends AppCompatSpinner {
     private static final String TAG = CommunicationDeviceSpinner.class.getName();
     // menu positions
     public static final int POS_CLEAR = 0;
@@ -64,14 +65,8 @@ public CommunicationDeviceSpinner(Context context, AttributeSet attrs, int defSt
     }
 
     public CommunicationDeviceSpinner(Context context, AttributeSet attrs, int defStyleAttr,
-                                      int defStyleRes, int mode){
-        super(context, attrs, defStyleAttr, defStyleRes, mode);
-        setup(context);
-    }
-
-    public CommunicationDeviceSpinner(Context context, AttributeSet attrs, int defStyleAttr,
-                                      int defStyleRes, int mode, Theme popupTheme){
-        super(context, attrs, defStyleAttr, defStyleRes, mode, popupTheme);
+                                      int mode, Theme popupTheme){
+        super(context, attrs, defStyleAttr, mode, popupTheme);
         setup(context);
     }
 
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AnalyzerActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AnalyzerActivity.java
index 5e22c0bc0..69a8b829b 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AnalyzerActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AnalyzerActivity.java
@@ -16,21 +16,15 @@
 
 package com.mobileer.oboetester;
 
-import android.Manifest;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.util.Locale;
 
 /**
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BaseOboeTesterActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BaseOboeTesterActivity.java
index 4bf57496f..a82ff4ffa 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BaseOboeTesterActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BaseOboeTesterActivity.java
@@ -17,18 +17,19 @@
 package com.mobileer.oboetester;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
 /**
  * Support requesting RECORD_AUDIO permission.
  */
 
-public abstract class BaseOboeTesterActivity extends Activity
+public abstract class BaseOboeTesterActivity extends AppCompatActivity
         implements ActivityCompat.OnRequestPermissionsResultCallback {
 
     private static final int MY_PERMISSIONS_REQUEST_RECORD_AUDIO = 938355;
@@ -103,4 +104,5 @@ protected void launchTestActivity(Class clazz) {
     private void beginTestThatRequiresRecording() {
         launchTestActivity(mTestClass);
     }
+
 }
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BufferSizeView.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BufferSizeView.java
index 432e0ff36..da7e6a2f0 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BufferSizeView.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/BufferSizeView.java
@@ -19,14 +19,12 @@
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-
-
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import android.widget.LinearLayout;
 
 public class BufferSizeView extends LinearLayout {
     private OboeAudioStream mStream;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/CommunicationDeviceView.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/CommunicationDeviceView.java
index 3e4c96df4..870d5cd6a 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/CommunicationDeviceView.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/CommunicationDeviceView.java
@@ -16,7 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -35,8 +34,6 @@
 
 import com.mobileer.audio_device.CommunicationDeviceSpinner;
 
-import java.util.Locale;
-
 public class CommunicationDeviceView extends LinearLayout {
 
     private AudioManager mAudioManager;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java
index eb8dcbe27..9340b9032 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java
@@ -17,7 +17,6 @@
 package com.mobileer.oboetester;
 
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.usb.UsbDevice;
@@ -38,6 +37,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.mobileer.audio_device.AudioDeviceInfoConverter;
 
 import java.io.IOException;
@@ -50,7 +51,7 @@
 /**
  * Print a report of all the available audio devices.
  */
-public class DeviceReportActivity extends Activity {
+public class DeviceReportActivity extends AppCompatActivity {
 
     class MyAudioDeviceCallback extends AudioDeviceCallback {
         private HashMap<Integer, AudioDeviceInfo> mDevices
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/EchoActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/EchoActivity.java
index 9ce258a53..b78f2b96f 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/EchoActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/EchoActivity.java
@@ -16,7 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExternalTapToToneActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExternalTapToToneActivity.java
index c978da374..a08e5cefb 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExternalTapToToneActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExternalTapToToneActivity.java
@@ -1,21 +1,19 @@
 package com.mobileer.oboetester;
 
-import android.Manifest;
-import android.app.Activity;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.io.IOException;
 
 /**
  * Measure the tap-to-tone latency for other apps or devices.
  */
-public class ExternalTapToToneActivity extends Activity {
+public class ExternalTapToToneActivity extends AppCompatActivity {
     private static final String TAG = "OboeTester";
 
     protected TapToToneTester mTapToToneTester;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExtraTestsActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExtraTestsActivity.java
index c744329b5..7450e1a83 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExtraTestsActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/ExtraTestsActivity.java
@@ -1,7 +1,5 @@
 package com.mobileer.oboetester;
 
-import android.content.Intent;
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/GlitchActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/GlitchActivity.java
index 63abe5cf4..eddf8913d 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/GlitchActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/GlitchActivity.java
@@ -16,7 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/IntentBasedTestSupport.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/IntentBasedTestSupport.java
index 4746ec72f..3d54ade89 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/IntentBasedTestSupport.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/IntentBasedTestSupport.java
@@ -16,7 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.content.Intent;
 import android.media.AudioManager;
 import android.os.Bundle;
 
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
index 145dfbc0a..85cb4a607 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
@@ -16,10 +16,8 @@
 
 package com.mobileer.oboetester;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Point;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/RoundTripLatencyActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/RoundTripLatencyActivity.java
index 8f81f5584..36965bdc8 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/RoundTripLatencyActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/RoundTripLatencyActivity.java
@@ -21,10 +21,10 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 
 import java.io.File;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfiguration.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfiguration.java
index 5c1f32b75..5e8e88b21 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfiguration.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfiguration.java
@@ -16,8 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.content.res.Resources;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfigurationView.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfigurationView.java
index 9a6fd266b..820d249ee 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfigurationView.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfigurationView.java
@@ -23,18 +23,18 @@
 import android.media.audiofx.BassBoost;
 import android.media.audiofx.LoudnessEnhancer;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.TableRow;
 import android.widget.TextView;
-import android.widget.LinearLayout;
-import android.util.Log;
 
 import com.mobileer.audio_device.AudioDeviceListEntry;
 import com.mobileer.audio_device.AudioDeviceSpinner;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TapToToneActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TapToToneActivity.java
index ad2c3c976..26c7dc3ef 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TapToToneActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TapToToneActivity.java
@@ -16,7 +16,8 @@
 
 package com.mobileer.oboetester;
 
-import android.Manifest;
+import static com.mobileer.oboetester.MidiTapTester.NoteListener;
+
 import android.content.pm.PackageManager;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
@@ -28,12 +29,9 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.Toast;
 
@@ -46,8 +44,6 @@
 import java.io.IOException;
 import java.sql.Timestamp;
 
-import static com.mobileer.oboetester.MidiTapTester.NoteListener;
-
 public class TapToToneActivity extends TestOutputActivityBase {
     // Names from obsolete version of Oboetester.
     public static final String OLD_PRODUCT_NAME = "AudioLatencyTester";
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestAudioActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestAudioActivity.java
index 9043f28db..de239ca94 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestAudioActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestAudioActivity.java
@@ -16,7 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -36,7 +35,9 @@
 import android.widget.CheckBox;
 import android.widget.Spinner;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +47,7 @@
 /**
  * Base class for other Activities.
  */
-abstract class TestAudioActivity extends Activity {
+abstract class TestAudioActivity extends AppCompatActivity {
     public static final String TAG = "OboeTester";
 
     protected static final int FADER_PROGRESS_MAX = 1000;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java
index b88b611c8..b0202e8e7 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java
@@ -18,7 +18,6 @@
 
 import static com.mobileer.oboetester.TestAudioActivity.TAG;
 
-import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
 import android.os.Bundle;
@@ -31,12 +30,12 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import java.util.Random;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Test for getting the cold start latency
  */
-public class TestColdStartLatencyActivity extends Activity {
+public class TestColdStartLatencyActivity extends AppCompatActivity {
 
     private TextView mStatusView;
     private MyStreamSniffer mStreamSniffer;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDataPathsActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDataPathsActivity.java
index f0936ecad..7b05669cf 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDataPathsActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDataPathsActivity.java
@@ -20,13 +20,11 @@
 import static com.mobileer.oboetester.StreamConfiguration.UNSPECIFIED;
 import static com.mobileer.oboetester.StreamConfiguration.convertChannelMaskToText;
 
-import android.app.Instrumentation;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -38,8 +36,6 @@
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Locale;
 
 /**
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDisconnectActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDisconnectActivity.java
index b74c3b104..458a3ef0d 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDisconnectActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDisconnectActivity.java
@@ -22,7 +22,6 @@
 import android.content.IntentFilter;
 import android.hardware.usb.UsbConstants;
 import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestErrorCallbackActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestErrorCallbackActivity.java
index b3b4497da..d8545e387 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestErrorCallbackActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestErrorCallbackActivity.java
@@ -16,14 +16,15 @@
 
 package com.mobileer.oboetester;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
 import android.widget.TextView;
 
-public class TestErrorCallbackActivity extends Activity {
+import androidx.appcompat.app.AppCompatActivity;
+
+public class TestErrorCallbackActivity extends AppCompatActivity {
 
     private TextView mStatusDeleteCallback;
     // This must match the value in TestErrorCallback.h
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestInputActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestInputActivity.java
index a6c9bbd64..cfcde77e2 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestInputActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestInputActivity.java
@@ -24,6 +24,7 @@
 import android.os.Looper;
 import android.view.View;
 import android.widget.RadioButton;
+
 import androidx.annotation.NonNull;
 import androidx.core.content.FileProvider;
 
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestOutputActivityBase.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestOutputActivityBase.java
index 731351b9c..c74204567 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestOutputActivityBase.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestOutputActivityBase.java
@@ -16,10 +16,6 @@
 
 package com.mobileer.oboetester;
 
-import android.media.audiofx.Equalizer;
-import android.media.audiofx.PresetReverb;
-import android.util.Log;
-
 import java.io.IOException;
 
 abstract class TestOutputActivityBase extends TestAudioActivity {
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestPlugLatencyActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestPlugLatencyActivity.java
index b55fa127f..5f23cae04 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestPlugLatencyActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestPlugLatencyActivity.java
@@ -17,16 +17,11 @@
 package com.mobileer.oboetester;
 
 import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.mobileer.audio_device.AudioDeviceInfoConverter;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestRouteDuringCallbackActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestRouteDuringCallbackActivity.java
index 4dfce073a..0e43f37e0 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestRouteDuringCallbackActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestRouteDuringCallbackActivity.java
@@ -18,7 +18,6 @@
 
 import static com.mobileer.oboetester.TestAudioActivity.TAG;
 
-import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
 import android.os.Bundle;
@@ -29,6 +28,8 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.util.Random;
 
 /**
@@ -36,7 +37,7 @@
  * while playing audio. The buffer may get deleted while we are writing to it!
  * See b/274815060
  */
-public class TestRouteDuringCallbackActivity extends Activity {
+public class TestRouteDuringCallbackActivity extends AppCompatActivity {
 
     private TextView mStatusView;
     private MyStreamSniffer mStreamSniffer;
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/WorkloadView.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/WorkloadView.java
index 74027c2c0..87d3d1dfb 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/WorkloadView.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/WorkloadView.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;