diff options
Diffstat (limited to 'android/WALT/app/src/main/res/layout')
13 files changed, 214 insertions, 87 deletions
diff --git a/android/WALT/app/src/main/res/layout/activity_main.xml b/android/WALT/app/src/main/res/layout/activity_main.xml index 57e7679..ad9a864 100644 --- a/android/WALT/app/src/main/res/layout/activity_main.xml +++ b/android/WALT/app/src/main/res/layout/activity_main.xml @@ -1,27 +1,20 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:orientation="vertical" tools:context=".MainActivity"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - - <include - android:id="@+id/toolbar_main" - layout="@layout/toolbar" /> - - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> + <include + android:id="@+id/toolbar_main" + layout="@layout/toolbar" /> + <FrameLayout + android:id="@+id/fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent"> - </FrameLayout> - </LinearLayout> + </FrameLayout> -</RelativeLayout> +</LinearLayout>
\ No newline at end of file diff --git a/android/WALT/app/src/main/res/layout/dialog_upload.xml b/android/WALT/app/src/main/res/layout/dialog_upload.xml index be990a2..88983d7 100644 --- a/android/WALT/app/src/main/res/layout/dialog_upload.xml +++ b/android/WALT/app/src/main/res/layout/dialog_upload.xml @@ -9,7 +9,8 @@ android:id="@+id/edit_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="Enter URL" + android:hint="@string/hint_url" + android:autofillHints="Enter URL" android:inputType="textUri" /> <ProgressBar diff --git a/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml b/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml new file mode 100644 index 0000000..693287f --- /dev/null +++ b/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml @@ -0,0 +1,80 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.chromium.latency.walt.TapLatencyFragment"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <View android:layout_height="match_parent" + android:layout_width="0dp" + android:layout_weight="1" /> + + <ImageButton + android:id="@+id/button_start" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:tint="@color/button_tint" + app:srcCompat="@drawable/ic_play_arrow_black_24dp" + android:contentDescription="@string/start" /> + + </LinearLayout> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/latency_chart_layout" + android:layout_width="match_parent" + android:visibility="gone" + android:layout_height="0dp" + android:layout_weight="1" + android:layout_margin="5dp" + android:background="@drawable/border"> + + <com.github.mikephil.charting.charts.ScatterChart + android:id="@+id/latency_chart" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="5dp" /> + + <Button + android:id="@+id/button_close_chart" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@id/latency_chart" + android:layout_alignEnd="@id/latency_chart" + android:tint="@color/button_tint" + android:layout_margin="5dp" + android:text="@string/close" /> + </RelativeLayout> + + <TextView + android:id="@+id/txt_log" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:background="#000000" + android:gravity="bottom" + android:textColor="#ffffff" + android:scrollbars="vertical" /> + + </LinearLayout> + </FrameLayout> + </LinearLayout> +</FrameLayout> diff --git a/android/WALT/app/src/main/res/layout/fragment_audio.xml b/android/WALT/app/src/main/res/layout/fragment_audio.xml index e11f157..190f658 100644 --- a/android/WALT/app/src/main/res/layout/fragment_audio.xml +++ b/android/WALT/app/src/main/res/layout/fragment_audio.xml @@ -19,24 +19,26 @@ android:id="@+id/button_stop_audio" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:tint="@color/button_tint" - android:src="@drawable/ic_stop_black_24dp" /> + walt:srcCompat="@drawable/ic_stop_black_24dp" + android:contentDescription="@string/stop" /> <ImageButton android:id="@+id/button_start_audio" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + walt:srcCompat="@drawable/ic_play_arrow_black_24dp" + android:contentDescription="@string/start" /> <Spinner android:id="@+id/spinner_audio_mode" android:layout_height="45dp" android:layout_width="fill_parent" - android:layout_toRightOf="@id/button_stop_audio" - android:layout_toLeftOf="@id/button_start_audio" + android:layout_toEndOf="@id/button_stop_audio" + android:layout_toStartOf="@id/button_start_audio" android:prompt="@string/audio_mode"/> </RelativeLayout> diff --git a/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml b/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml index 82a3cae..2950bac 100644 --- a/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml +++ b/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml @@ -1,4 +1,5 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -23,7 +24,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_usb_black_24dp" /> + app:srcCompat="@drawable/ic_usb_black_24dp" + android:contentDescription="@string/reconnect" /> <LinearLayout android:layout_width="match_parent" @@ -33,12 +35,12 @@ <TextView style="@style/MenuTextTop" - android:text="Reconnect" /> + android:text="@string/reconnect" /> <TextView android:visibility="gone" style="@style/MenuTextBottom" - android:text="TBD: Conn status" /> + android:text="@string/tbd_conn_status" /> </LinearLayout> @@ -54,7 +56,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_swap_horiz_black_24dp" /> + app:srcCompat="@drawable/ic_swap_horiz_black_24dp" + android:contentDescription="@string/ping" /> <LinearLayout android:layout_width="match_parent" @@ -64,11 +67,11 @@ <TextView style="@style/MenuTextTop" - android:text="Ping" /> + android:text="@string/ping" /> <TextView style="@style/MenuTextBottom" - android:text="Ping over USB with 1 byte" /> + android:text="@string/ping_over_usb_with_1_byte" /> </LinearLayout> @@ -84,7 +87,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_schedule_black_24dp" /> + app:srcCompat="@drawable/ic_schedule_black_24dp" + android:contentDescription="@string/re_sync_clocks" /> <LinearLayout android:layout_width="match_parent" @@ -94,7 +98,7 @@ <TextView style="@style/MenuTextTop" - android:text="Re-sync clocks" /> + android:text="@string/re_sync_clocks" /> </LinearLayout> </LinearLayout> @@ -109,7 +113,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_timelapse_black_24dp" /> + app:srcCompat="@drawable/ic_timelapse_black_24dp" + android:contentDescription="@string/check_clock_drift" /> <LinearLayout android:layout_width="match_parent" @@ -119,11 +124,11 @@ <TextView style="@style/MenuTextTop" - android:text="Check clock drift" /> + android:text="@string/check_clock_drift" /> <TextView style="@style/MenuTextBottom" - android:text="Check how much clocks diverged" /> + android:text="@string/check_how_much_clocks_diverged" /> </LinearLayout> @@ -139,7 +144,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_system_update_alt_black_24dp" /> + app:srcCompat="@drawable/ic_system_update_alt_black_24dp" + android:contentDescription="@string/update_walt_firmware" /> <LinearLayout android:layout_width="match_parent" @@ -149,11 +155,11 @@ <TextView style="@style/MenuTextTop" - android:text="Update WALT Firmware" /> + android:text="@string/update_walt_firmware" /> <TextView style="@style/MenuTextBottom" - android:text="Please press the button on the Teensy first" /> + android:text="@string/please_press_the_button_on_the_teensy_first" /> </LinearLayout> diff --git a/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml b/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml index f9b65d0..a5e36c6 100644 --- a/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml +++ b/android/WALT/app/src/main/res/layout/fragment_drag_latency.xml @@ -1,4 +1,5 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -19,21 +20,24 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_refresh_black_24dp" /> + app:srcCompat="@drawable/ic_refresh_black_24dp" + android:contentDescription="@string/restart" /> <ImageButton android:id="@+id/button_start_drag" android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_black_24dp" + android:contentDescription="@string/start" /> <ImageButton android:id="@+id/button_finish_drag" android:layout_width="wrap_content" android:layout_height="wrap_content" android:tint="@color/button_tint" - android:src="@drawable/ic_check_black_24dp" /> + app:srcCompat="@drawable/ic_check_black_24dp" + android:contentDescription="@string/finish" /> </LinearLayout> <FrameLayout @@ -49,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="#000000" - android:gravity="right" + android:gravity="end" android:orientation="horizontal"> <TextView @@ -92,11 +96,11 @@ android:id="@+id/button_close_chart" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" + android:layout_alignEnd="@id/latency_chart" + android:layout_alignTop="@id/latency_chart" android:tint="@color/button_tint" android:layout_margin="5dp" - android:text="Close" /> + android:text="@string/close" /> </RelativeLayout> <TextView diff --git a/android/WALT/app/src/main/res/layout/fragment_front_page.xml b/android/WALT/app/src/main/res/layout/fragment_front_page.xml index ec3a95a..43ef542 100644 --- a/android/WALT/app/src/main/res/layout/fragment_front_page.xml +++ b/android/WALT/app/src/main/res/layout/fragment_front_page.xml @@ -1,4 +1,5 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -16,7 +17,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_search_black_24dp" /> + app:srcCompat="@drawable/ic_search_black_24dp" + android:contentDescription="@string/diagnostics" /> <LinearLayout android:layout_width="match_parent" @@ -26,11 +28,11 @@ <TextView style="@style/MenuTextTop" - android:text="Diagnostics" /> + android:text="@string/diagnostics" /> <TextView style="@style/MenuTextBottom" - android:text="TBD: Connection/sync status" + android:text="@string/tbd_connection_sync_status" android:visibility="gone" /> @@ -47,7 +49,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_radio_button_checked_black_24dp" /> + app:srcCompat="@drawable/ic_radio_button_checked_black_24dp" + android:contentDescription="@string/tap_latency" /> <LinearLayout android:layout_width="match_parent" @@ -57,7 +60,7 @@ <TextView style="@style/MenuTextTop" - android:text="Tap latency" /> + android:text="@string/tap_latency" /> </LinearLayout> </LinearLayout> @@ -72,7 +75,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_swap_vert_black_24dp" /> + app:srcCompat="@drawable/ic_swap_vert_black_24dp" + android:contentDescription="@string/drag_latency" /> <LinearLayout android:layout_width="match_parent" @@ -82,7 +86,7 @@ <TextView style="@style/MenuTextTop" - android:text="Drag latency" /> + android:text="@string/drag_latency" /> </LinearLayout> </LinearLayout> @@ -97,7 +101,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_brightness_medium_black_24dp" /> + app:srcCompat="@drawable/ic_brightness_medium_black_24dp" + android:contentDescription="@string/screen_response" /> <LinearLayout android:layout_width="match_parent" @@ -107,7 +112,7 @@ <TextView style="@style/MenuTextTop" - android:text="Screen response" /> + android:text="@string/screen_response" /> </LinearLayout> </LinearLayout> @@ -122,7 +127,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_volume_up_black_24dp" /> + app:srcCompat="@drawable/ic_volume_up_black_24dp" + android:contentDescription="@string/audio_latency" /> <LinearLayout android:layout_width="match_parent" @@ -132,7 +138,7 @@ <TextView style="@style/MenuTextTop" - android:text="Audio latency" /> + android:text="@string/audio_latency" /> </LinearLayout> </LinearLayout> @@ -149,7 +155,8 @@ android:id="@+id/midi_image" style="@style/MenuIconStyle" android:tint="@color/ColorDisabled" - android:src="@drawable/ic_music_note_black_24dp" /> + app:srcCompat="@drawable/ic_music_note_black_24dp" + android:contentDescription="@string/midi_latency" /> <LinearLayout android:layout_width="match_parent" @@ -161,7 +168,7 @@ android:id="@+id/midi_text" style="@style/MenuTextTop" android:textColor="@color/ColorDisabled" - android:text="MIDI latency" /> + android:text="@string/midi_latency" /> </LinearLayout> </LinearLayout> @@ -176,7 +183,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_receipt_black_24dp" /> + app:srcCompat="@drawable/ic_receipt_black_24dp" + android:contentDescription="@string/view_log" /> <LinearLayout android:layout_width="match_parent" @@ -186,7 +194,7 @@ <TextView style="@style/MenuTextTop" - android:text="View log" /> + android:text="@string/view_log" /> </LinearLayout> </LinearLayout> @@ -194,6 +202,32 @@ <View style="@style/MenuDivider" /> + <!-- Accelerometer --> + <LinearLayout + style="@style/MenuItemStyle" + android:onClick="onClickAccelerometer"> + + <ImageView + style="@style/MenuIconStyle" + app:srcCompat="@drawable/ic_swap_horiz_black_24dp" + android:contentDescription="@string/accelerometer_latency" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical"> + + <TextView + style="@style/MenuTextTop" + android:text="@string/accelerometer_latency" /> + + </LinearLayout> + </LinearLayout> + <!-- End of Accelerometer --> + + <View style="@style/MenuDivider" /> + <!-- Settings --> <LinearLayout style="@style/MenuItemStyle" @@ -201,7 +235,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_settings_black_24dp" /> + app:srcCompat="@drawable/ic_settings_black_24dp" + android:contentDescription="@string/settings" /> <LinearLayout android:layout_width="match_parent" @@ -211,7 +246,7 @@ <TextView style="@style/MenuTextTop" - android:text="Settings" /> + android:text="@string/settings" /> </LinearLayout> @@ -227,7 +262,8 @@ <ImageView style="@style/MenuIconStyle" - android:src="@drawable/ic_help_outline_black_24dp" /> + app:srcCompat="@drawable/ic_help_outline_black_24dp" + android:contentDescription="@string/about" /> <LinearLayout android:layout_width="match_parent" @@ -237,7 +273,7 @@ <TextView style="@style/MenuTextTop" - android:text="About" /> + android:text="@string/about" /> </LinearLayout> </LinearLayout> diff --git a/android/WALT/app/src/main/res/layout/fragment_midi.xml b/android/WALT/app/src/main/res/layout/fragment_midi.xml index 70f9be5..fba287f 100644 --- a/android/WALT/app/src/main/res/layout/fragment_midi.xml +++ b/android/WALT/app/src/main/res/layout/fragment_midi.xml @@ -21,7 +21,8 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:tint="@color/button_tint" - android:src="@drawable/ic_input_black_24dp" /> + walt:srcCompat="@drawable/ic_input_black_24dp" + android:contentDescription="@string/start_midi_in" /> <ImageButton android:id="@+id/button_start_midi_out" @@ -29,7 +30,8 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:tint="@color/button_tint" - android:src="@drawable/ic_output_black_24dp" /> + walt:srcCompat="@drawable/ic_output_black_24dp" + android:contentDescription="@string/start_midi_out" /> </RelativeLayout> <org.chromium.latency.walt.HistogramChart diff --git a/android/WALT/app/src/main/res/layout/fragment_screen_response.xml b/android/WALT/app/src/main/res/layout/fragment_screen_response.xml index b789579..fc7c107 100644 --- a/android/WALT/app/src/main/res/layout/fragment_screen_response.xml +++ b/android/WALT/app/src/main/res/layout/fragment_screen_response.xml @@ -20,24 +20,26 @@ android:id="@+id/button_stop_screen_response" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:tint="@color/button_tint" - android:src="@drawable/ic_stop_black_24dp" /> + walt:srcCompat="@drawable/ic_stop_black_24dp" + android:contentDescription="@string/stop" /> <ImageButton android:id="@+id/button_start_screen_response" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + walt:srcCompat="@drawable/ic_play_arrow_black_24dp" + android:contentDescription="@string/start" /> <Spinner android:id="@+id/spinner_screen_response" android:layout_height="45dp" android:layout_width="fill_parent" - android:layout_toRightOf="@id/button_stop_screen_response" - android:layout_toLeftOf="@id/button_start_screen_response" + android:layout_toEndOf="@id/button_stop_screen_response" + android:layout_toStartOf="@id/button_start_screen_response" android:prompt="@string/screen_response_mode"/> </RelativeLayout> diff --git a/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml b/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml index 2c701d2..28f4327 100644 --- a/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml +++ b/android/WALT/app/src/main/res/layout/fragment_tap_latency.xml @@ -18,17 +18,19 @@ android:id="@+id/button_finish_tap" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:tint="@color/button_tint" - android:src="@drawable/ic_check_black_24dp" /> + walt:srcCompat="@drawable/ic_check_black_24dp" + android:contentDescription="@string/finish" /> <ImageButton android:id="@+id/button_restart_tap" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:tint="@color/button_tint" - android:src="@drawable/ic_play_arrow_black_24dp" /> + walt:srcCompat="@drawable/ic_play_arrow_black_24dp" + android:contentDescription="@string/restart" /> </RelativeLayout> <FrameLayout @@ -44,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="#000000" - android:gravity="right" + android:gravity="end" android:orientation="horizontal"> <TextView diff --git a/android/WALT/app/src/main/res/layout/histogram.xml b/android/WALT/app/src/main/res/layout/histogram.xml index ca6dc1e..bdbda12 100644 --- a/android/WALT/app/src/main/res/layout/histogram.xml +++ b/android/WALT/app/src/main/res/layout/histogram.xml @@ -15,9 +15,9 @@ android:id="@+id/button_close_bar_chart" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" + android:layout_alignTop="@id/bar_chart" + android:layout_alignEnd="@id/bar_chart" android:tint="@color/button_tint" android:layout_margin="5dp" - android:text="Close" /> + android:text="@string/close" /> </RelativeLayout> diff --git a/android/WALT/app/src/main/res/layout/line_chart.xml b/android/WALT/app/src/main/res/layout/line_chart.xml index 7de4cfb..a846a13 100644 --- a/android/WALT/app/src/main/res/layout/line_chart.xml +++ b/android/WALT/app/src/main/res/layout/line_chart.xml @@ -15,9 +15,9 @@ android:id="@+id/button_close_chart" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" + android:layout_alignTop="@id/chart" + android:layout_alignEnd="@id/chart" android:tint="@color/button_tint" android:layout_margin="5dp" - android:text="Close" /> + android:text="@string/close" /> </RelativeLayout> diff --git a/android/WALT/app/src/main/res/layout/toolbar.xml b/android/WALT/app/src/main/res/layout/toolbar.xml index d02028d..c932cdb 100644 --- a/android/WALT/app/src/main/res/layout/toolbar.xml +++ b/android/WALT/app/src/main/res/layout/toolbar.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/ColorPrimary" android:elevation="4dp"> -</android.support.v7.widget.Toolbar>
\ No newline at end of file +</androidx.appcompat.widget.Toolbar>
\ No newline at end of file |