Skip to content

OboeTester: Add watch support #2376

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.

Sign up for GitHub

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

Open
robertwu1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OboeTester: Add watch support #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions apps/OboeTester/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ android {
jniDebuggable true
}
}
flavorDimensions = ["device"]
productFlavors {
mobile {
dimension "device"
}
watch {
dimension "device"
}
}
externalNativeBuild {
cmake {
path "CMakeLists.txt"
Expand Down
70 changes: 25 additions & 45 deletions apps/OboeTester/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<uses-feature
android:name="android.software.leanback"
android:required="false" />
<uses-feature
android:name="android.hardware.type.watch"
android:required="false" />

<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
Expand All @@ -41,7 +44,6 @@
<activity
android:name=".MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -52,104 +54,82 @@
</activity>
<activity
android:name=".TestOutputActivity"
android:label="@string/title_activity_test_output"
android:screenOrientation="portrait" />
android:label="@string/title_activity_test_output" />
<activity
android:name=".TestInputActivity"
android:label="@string/title_activity_test_input"
android:screenOrientation="portrait" />
android:label="@string/title_activity_test_input" />
<activity
android:name=".TapToToneActivity"
android:label="@string/title_activity_output_latency"
android:screenOrientation="portrait" />
android:label="@string/title_activity_output_latency" />
<activity
android:name=".RecorderActivity"
android:label="@string/title_activity_recorder"
android:screenOrientation="portrait" />
android:label="@string/title_activity_recorder" />
<activity
android:name=".EchoActivity"
android:label="@string/title_activity_echo"
android:screenOrientation="portrait" />
android:label="@string/title_activity_echo" />
<activity
android:name=".RoundTripLatencyActivity"
android:label="@string/title_activity_rt_latency"
android:screenOrientation="portrait" />
android:label="@string/title_activity_rt_latency" />
<activity
android:name=".ManualGlitchActivity"
android:label="@string/title_activity_glitches"
android:screenOrientation="portrait" />
android:label="@string/title_activity_glitches" />
<activity
android:name=".AutomatedGlitchActivity"
android:label="@string/title_activity_auto_glitches"
android:screenOrientation="portrait" />
android:label="@string/title_activity_auto_glitches" />
<activity
android:name=".TestDisconnectActivity"
android:label="@string/title_test_disconnect"
android:screenOrientation="portrait" />
android:label="@string/title_test_disconnect" />
<activity
android:name=".DeviceReportActivity"
android:label="@string/title_report_devices"
android:screenOrientation="portrait" />
android:label="@string/title_report_devices" />
<activity
android:name=".TestDataPathsActivity"
android:label="@string/title_data_paths"
android:screenOrientation="portrait" />
android:label="@string/title_data_paths" />
<activity
android:name=".ExtraTestsActivity"
android:exported="true"
android:label="@string/title_extra_tests"
android:screenOrientation="portrait" />
android:label="@string/title_extra_tests" />

<activity
android:name=".ExternalTapToToneActivity"
android:label="@string/title_external_tap"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".TestPlugLatencyActivity"
android:label="@string/title_plug_latency"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".TestErrorCallbackActivity"
android:label="@string/title_error_callback"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".TestRouteDuringCallbackActivity"
android:label="@string/title_route_during_callback"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".DynamicWorkloadActivity"
android:label="@string/title_dynamic_load"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".TestColdStartLatencyActivity"
android:label="@string/title_cold_start_latency"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".TestRapidCycleActivity"
android:label="@string/title_rapid_cycle"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".AudioWorkloadTestActivity"
android:label="@string/title_audio_workload_test"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".AudioWorkloadTestRunnerActivity"
android:label="@string/title_audio_workload_test_runner"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />
<activity
android:name=".ReverseJniActivity"
android:label="@string/title_reverse_jni"
android:exported="true"
android:screenOrientation="portrait" />
android:exported="true" />

<service
android:name=".MidiTapTester"
Expand Down
20 changes: 14 additions & 6 deletions apps/OboeTester/app/src/main/res/layout/activity_audio_workload_test_runner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@

</LinearLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fillViewport="true">

<LinearLayout
android:id="@+id/buttonGrid"
android:layout_width="match_parent"
Expand Down Expand Up @@ -142,16 +148,17 @@
android:text="Hear Workload" />
</LinearLayout>

<LinearLayout
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:columnCount="@integer/action_buttons_columns">

<Button
android:id="@+id/button_start_test"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_gravity="fill"
android:backgroundTint="@xml/button_color_selector"
android:backgroundTintMode="src_atop"
android:onClick="startTest"
Expand All @@ -160,14 +167,14 @@
<Button
android:id="@+id/button_stop_test"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_gravity="fill"
android:backgroundTint="@xml/button_color_selector"
android:backgroundTintMode="src_atop"
android:onClick="stopTest"
android:text="@string/stopAudio" />

</LinearLayout>
</GridLayout>

<TextView
android:id="@+id/status_text_view"
Expand All @@ -188,4 +195,5 @@
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</ScrollView>
</LinearLayout>
33 changes: 21 additions & 12 deletions apps/OboeTester/app/src/main/res/layout/activity_cold_start_latency.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@

</LinearLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fillViewport="true">

<LinearLayout
android:id="@+id/buttonGrid"
android:layout_width="match_parent"
Expand Down Expand Up @@ -57,10 +63,10 @@
</RadioGroup>


<LinearLayout
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:columnCount="@integer/main_grid_columns">

<CheckBox
android:id="@+id/checkbox_mmap"
Expand All @@ -85,7 +91,7 @@
android:layout_marginRight="8sp"
android:text="EXCLUSIVE"
android:checked="true" />
</LinearLayout>
</GridLayout>

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -141,28 +147,30 @@

</LinearLayout>

<LinearLayout
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:columnCount="@integer/action_buttons_columns">

<Button
android:id="@+id/button_start_test"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_columnWeight="1"
android:layout_gravity="fill"
android:backgroundTint="@color/button_tint"
android:onClick="onStartColdStartLatencyTest"
android:text="Start Test" />
android:text="Start" />
<Button
android:id="@+id/button_stop_test"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_columnWeight="1"
android:layout_gravity="fill"
android:backgroundTint="@color/button_tint"
android:onClick="onStopColdStartLatencyTest"
android:text="Stop Test" />
</LinearLayout>
android:text="Stop" />
</GridLayout>

<ScrollView
android:id="@+id/text_log_scroller"
Expand All @@ -179,4 +187,5 @@
</ScrollView>

</LinearLayout>
</ScrollView>
</LinearLayout>
7 changes: 7 additions & 0 deletions apps/OboeTester/app/src/main/res/layout/activity_data_paths.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@

</LinearLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fillViewport="true">

<LinearLayout
android:id="@+id/buttonGrid"
android:layout_width="match_parent"
Expand Down Expand Up @@ -168,4 +174,5 @@
android:orientation="vertical" />

</LinearLayout>
</ScrollView>
</LinearLayout>
17 changes: 15 additions & 2 deletions apps/OboeTester/app/src/main/res/layout/activity_error_callback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,24 @@

</LinearLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fillViewport="true">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin">

<GridLayout
android:id="@+id/buttonGrid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="1"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
app:layout_constraintTop_toBottomOf="@+id/title_bar">

<Button
Expand All @@ -57,4 +68,6 @@
/>

</GridLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
7 changes: 7 additions & 0 deletions apps/OboeTester/app/src/main/res/layout/activity_external_tap_to_tone.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@

</LinearLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fillViewport="true">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -151,4 +157,5 @@
/>
</FrameLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
Loading
Loading