Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OboeTester: use AppCompatSpinner and AppCompatActivity #2019

Merged
merged 1 commit into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/OboeTester/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
19 changes: 19 additions & 0 deletions apps/OboeTester/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -103,4 +104,5 @@ protected void launchTestActivity(Class clazz) {
private void beginTestThatRequiresRecording() {
launchTestActivity(mTestClass);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.mobileer.oboetester;

import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
Expand All @@ -35,8 +34,6 @@

import com.mobileer.audio_device.CommunicationDeviceSpinner;

import java.util.Locale;

public class CommunicationDeviceView extends LinearLayout {

private AudioManager mAudioManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.mobileer.oboetester;

import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.mobileer.oboetester;

import android.content.Intent;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.mobileer.oboetester;

import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.mobileer.oboetester;

import android.content.Intent;
import android.media.AudioManager;
import android.os.Bundle;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading