diff options
Diffstat (limited to 'apps/OboeTester/app/src/main/res')
-rw-r--r-- | apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml | 65 | ||||
-rw-r--r-- | apps/OboeTester/app/src/main/res/values/strings.xml | 14 |
2 files changed, 55 insertions, 24 deletions
diff --git a/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml b/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml index 9e8fe6cc..a34d40c4 100644 --- a/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml +++ b/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <com.mobileer.oboetester.StreamConfigurationView android:id="@+id/streamConfiguration" @@ -31,75 +32,91 @@ <Button android:id="@+id/button_open" android:layout_width="0dp" - android:layout_weight="1" android:layout_height="wrap_content" + android:layout_weight="1" android:backgroundTint="@xml/button_color_selector" android:backgroundTintMode="src_atop" - android:textSize="12sp" android:onClick="openAudio" - android:text="@string/openAudio" /> + android:text="@string/openAudio" + android:textSize="12sp" /> <Button android:id="@+id/button_start" android:layout_width="0dp" - android:layout_weight="1" android:layout_height="wrap_content" + android:layout_weight="1" android:backgroundTint="@xml/button_color_selector" android:backgroundTintMode="src_atop" - android:textSize="12sp" android:onClick="startAudio" - android:text="@string/startAudio" /> + android:text="@string/startAudio" + android:textSize="12sp" /> <Button android:id="@+id/button_pause" android:layout_width="0dp" - android:layout_weight="1" android:layout_height="wrap_content" + android:layout_weight="1" android:backgroundTint="@xml/button_color_selector" android:backgroundTintMode="src_atop" - android:textSize="12sp" android:onClick="pauseAudio" - android:text="@string/pauseAudio" /> + android:text="@string/pauseAudio" + android:textSize="12sp" /> <Button android:id="@+id/button_stop" android:layout_width="0dp" - android:layout_weight="1" android:layout_height="wrap_content" + android:layout_weight="1" android:backgroundTint="@xml/button_color_selector" android:backgroundTintMode="src_atop" - android:textSize="12sp" android:onClick="stopAudio" - android:text="@string/stopAudio" /> + android:text="@string/stopAudio" + android:textSize="12sp" /> <Button android:id="@+id/button_release" android:layout_width="0dp" - android:layout_weight="1" android:layout_height="wrap_content" + android:layout_weight="1" android:backgroundTint="@xml/button_color_selector" android:backgroundTintMode="src_atop" - android:textSize="12sp" android:onClick="releaseAudio" - android:text="@string/releaseAudio" /> + android:text="@string/releaseAudio" + android:textSize="12sp" /> <Button android:id="@+id/button_close" android:layout_width="0dp" - android:layout_weight="1" android:layout_height="wrap_content" + android:layout_weight="1" android:backgroundTint="@xml/button_color_selector" android:backgroundTintMode="src_atop" - android:textSize="12sp" android:onClick="closeAudio" - android:text="@string/closeAudio" /> - + android:text="@string/closeAudio" + android:textSize="12sp" /> </LinearLayout> - <CheckBox - android:id="@+id/callbackReturnStop" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="callback returns STOP" /> + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/callbackReturnStop" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="callback returns STOP" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/hang_prompt" /> + + <Spinner + android:id="@+id/spinner_hang_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:entries="@array/hang_times" /> + + </LinearLayout> </merge> diff --git a/apps/OboeTester/app/src/main/res/values/strings.xml b/apps/OboeTester/app/src/main/res/values/strings.xml index ddfc689b..00872151 100644 --- a/apps/OboeTester/app/src/main/res/values/strings.xml +++ b/apps/OboeTester/app/src/main/res/values/strings.xml @@ -186,6 +186,20 @@ <item>White Noise</item> </string-array> + <string name="hang_prompt">, Hang(ms)</string> + <string-array name="hang_times"> + <item>0</item> + <item>4</item> + <item>10</item> + <item>20</item> + <item>30</item> + <item>100</item> + <item>300</item> + <item>1000</item> + <item>2000</item> + <item>5000</item> + </string-array> + <string name="synth_sender_text">Select Sender for Synth</string> <string name="error_port_busy">Selected port is in use or unavailable.</string> <string name="port_open_ok">Port opened OK.</string> |