From 94adb773909b34086bfef12897e0c034c5116d99 Mon Sep 17 00:00:00 2001
From: Tai Kuo <taikuo@google.com>
Date: Fri, 12 Jun 2020 21:47:32 +0800
Subject: walt: app: fix Lint errors in AndroidManifest & resource files

Fix Lint errors in resource files and AndroidManifest.xml

Bug: 149721303
Test: ./gradlew build --stacktrace --warning-mode all
Signed-off-by: Tai Kuo <taikuo@google.com>
Change-Id: I2c2c84370c37da1ee07fa4cfa9880554d0f96242
---
 android/WALT/app/src/main/AndroidManifest.xml      |  6 ++-
 .../main/res/drawable/ic_music_note_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_settings_black_24dp.xml   |  2 +-
 .../drawable/ic_system_update_alt_black_24dp.xml   |  2 +-
 .../WALT/app/src/main/res/layout/activity_main.xml | 29 +++++-------
 .../WALT/app/src/main/res/layout/dialog_upload.xml |  3 +-
 .../src/main/res/layout/fragment_accelerometer.xml |  9 ++--
 .../app/src/main/res/layout/fragment_audio.xml     | 14 +++---
 .../src/main/res/layout/fragment_diagnostics.xml   | 33 ++++++++------
 .../src/main/res/layout/fragment_drag_latency.xml  | 17 ++++---
 .../src/main/res/layout/fragment_front_page.xml    | 52 +++++++++++++---------
 .../WALT/app/src/main/res/layout/fragment_midi.xml |  6 ++-
 .../main/res/layout/fragment_screen_response.xml   | 14 +++---
 .../src/main/res/layout/fragment_tap_latency.xml   | 12 ++---
 android/WALT/app/src/main/res/layout/histogram.xml |  6 +--
 .../WALT/app/src/main/res/layout/line_chart.xml    |  6 +--
 android/WALT/app/src/main/res/layout/toolbar.xml   |  1 -
 android/WALT/app/src/main/res/menu/menu_main.xml   |  6 +--
 android/WALT/app/src/main/res/values/dimens.xml    |  1 -
 android/WALT/app/src/main/res/values/strings.xml   | 32 ++++++++++++-
 android/WALT/app/src/main/res/values/styles.xml    |  1 -
 android/WALT/app/src/main/res/xml/backup_rules.xml |  4 ++
 22 files changed, 157 insertions(+), 101 deletions(-)
 create mode 100644 android/WALT/app/src/main/res/xml/backup_rules.xml

(limited to 'android')

diff --git a/android/WALT/app/src/main/AndroidManifest.xml b/android/WALT/app/src/main/AndroidManifest.xml
index 869b5e8..992d368 100644
--- a/android/WALT/app/src/main/AndroidManifest.xml
+++ b/android/WALT/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.chromium.latency.walt">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -9,9 +10,12 @@
 
     <application
         android:allowBackup="true"
+        android:supportsRtl="true"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="LockedOrientationActivity">
         <activity
             android:name="org.chromium.latency.walt.MainActivity"
             android:label="@string/app_name"
diff --git a/android/WALT/app/src/main/res/drawable/ic_music_note_black_24dp.xml b/android/WALT/app/src/main/res/drawable/ic_music_note_black_24dp.xml
index 2e5b3cc..fb95660 100644
--- a/android/WALT/app/src/main/res/drawable/ic_music_note_black_24dp.xml
+++ b/android/WALT/app/src/main/res/drawable/ic_music_note_black_24dp.xml
@@ -5,5 +5,5 @@ android:viewportWidth="24.0"
 android:viewportHeight="24.0">
 <path
     android:fillColor="#FF000000"
-    android:pathData="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"/>
+    android:pathData="M12 3v10.55c-0.59-0.34-1.27-0.55-2-0.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"/>
 </vector>
\ No newline at end of file
diff --git a/android/WALT/app/src/main/res/drawable/ic_settings_black_24dp.xml b/android/WALT/app/src/main/res/drawable/ic_settings_black_24dp.xml
index ace746c..896ea9d 100644
--- a/android/WALT/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/android/WALT/app/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
 </vector>
diff --git a/android/WALT/app/src/main/res/drawable/ic_system_update_alt_black_24dp.xml b/android/WALT/app/src/main/res/drawable/ic_system_update_alt_black_24dp.xml
index ec96a71..6ce20c7 100644
--- a/android/WALT/app/src/main/res/drawable/ic_system_update_alt_black_24dp.xml
+++ b/android/WALT/app/src/main/res/drawable/ic_system_update_alt_black_24dp.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12 16.5l4-4h-3v-9h-2v9H8l4 4zm9-13h-6v1.99h6v14.03H3V5.49h6V3.5H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2v-14c0-1.1-.9-2-2-2z"/>
+        android:pathData="M12 16.5l4-4h-3v-9h-2v9H8l4 4zm9-13h-6v1.99h6v14.03H3V5.49h6V3.5H3c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h18c1.1 0 2-0.9 2-2v-14c0-1.1-0.9-2-2-2z"/>
 </vector>
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
index 887fd6c..693287f 100644
--- a/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml
+++ b/android/WALT/app/src/main/res/layout/fragment_accelerometer.xml
@@ -24,7 +24,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:tint="@color/button_tint"
-                app:srcCompat="@drawable/ic_play_arrow_black_24dp" />
+                app:srcCompat="@drawable/ic_play_arrow_black_24dp"
+                android:contentDescription="@string/start" />
 
         </LinearLayout>
 
@@ -56,11 +57,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_alignTop="@id/latency_chart"
+                        android:layout_alignEnd="@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_audio.xml b/android/WALT/app/src/main/res/layout/fragment_audio.xml
index de2bdbb..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"
-                walt:srcCompat="@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"
-                walt:srcCompat="@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 262f616..2950bac 100644
--- a/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml
+++ b/android/WALT/app/src/main/res/layout/fragment_diagnostics.xml
@@ -24,7 +24,8 @@
 
                 <ImageView
                     style="@style/MenuIconStyle"
-                    app:srcCompat="@drawable/ic_usb_black_24dp" />
+                    app:srcCompat="@drawable/ic_usb_black_24dp"
+                    android:contentDescription="@string/reconnect" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -34,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>
@@ -55,7 +56,8 @@
 
                 <ImageView
                     style="@style/MenuIconStyle"
-                    app:srcCompat="@drawable/ic_swap_horiz_black_24dp" />
+                    app:srcCompat="@drawable/ic_swap_horiz_black_24dp"
+                    android:contentDescription="@string/ping" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -65,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>
@@ -85,7 +87,8 @@
 
                 <ImageView
                     style="@style/MenuIconStyle"
-                    app:srcCompat="@drawable/ic_schedule_black_24dp" />
+                    app:srcCompat="@drawable/ic_schedule_black_24dp"
+                    android:contentDescription="@string/re_sync_clocks" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -95,7 +98,7 @@
 
                     <TextView
                         style="@style/MenuTextTop"
-                        android:text="Re-sync clocks" />
+                        android:text="@string/re_sync_clocks" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -110,7 +113,8 @@
 
                 <ImageView
                     style="@style/MenuIconStyle"
-                    app:srcCompat="@drawable/ic_timelapse_black_24dp" />
+                    app:srcCompat="@drawable/ic_timelapse_black_24dp"
+                    android:contentDescription="@string/check_clock_drift" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -120,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>
@@ -140,7 +144,8 @@
 
                 <ImageView
                     style="@style/MenuIconStyle"
-                    app:srcCompat="@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"
@@ -150,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 9e77ff9..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
@@ -20,21 +20,24 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:tint="@color/button_tint"
-                app:srcCompat="@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"
-                app:srcCompat="@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"
-                app:srcCompat="@drawable/ic_check_black_24dp" />
+                app:srcCompat="@drawable/ic_check_black_24dp"
+                android:contentDescription="@string/finish" />
         </LinearLayout>
 
         <FrameLayout
@@ -50,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
@@ -93,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 a0bd5d3..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
@@ -17,7 +17,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@drawable/ic_search_black_24dp" />
+                app:srcCompat="@drawable/ic_search_black_24dp"
+                android:contentDescription="@string/diagnostics" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -27,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" />
 
 
@@ -48,7 +49,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@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"
@@ -58,7 +60,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="Tap latency" />
+                    android:text="@string/tap_latency" />
 
             </LinearLayout>
         </LinearLayout>
@@ -73,7 +75,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@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"
@@ -83,7 +86,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="Drag latency" />
+                    android:text="@string/drag_latency" />
 
             </LinearLayout>
         </LinearLayout>
@@ -98,7 +101,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@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"
@@ -108,7 +112,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="Screen response" />
+                    android:text="@string/screen_response" />
 
             </LinearLayout>
         </LinearLayout>
@@ -123,7 +127,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@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"
@@ -133,7 +138,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="Audio latency" />
+                    android:text="@string/audio_latency" />
 
             </LinearLayout>
         </LinearLayout>
@@ -150,7 +155,8 @@
                 android:id="@+id/midi_image"
                 style="@style/MenuIconStyle"
                 android:tint="@color/ColorDisabled"
-                app:srcCompat="@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"
@@ -162,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>
@@ -177,7 +183,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@drawable/ic_receipt_black_24dp" />
+                app:srcCompat="@drawable/ic_receipt_black_24dp"
+                android:contentDescription="@string/view_log" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -187,7 +194,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="View log" />
+                    android:text="@string/view_log" />
 
             </LinearLayout>
         </LinearLayout>
@@ -202,7 +209,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@drawable/ic_swap_horiz_black_24dp" />
+                app:srcCompat="@drawable/ic_swap_horiz_black_24dp"
+                android:contentDescription="@string/accelerometer_latency" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -212,7 +220,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="Accelerometer latency" />
+                    android:text="@string/accelerometer_latency" />
 
             </LinearLayout>
         </LinearLayout>
@@ -227,7 +235,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@drawable/ic_settings_black_24dp" />
+                app:srcCompat="@drawable/ic_settings_black_24dp"
+                android:contentDescription="@string/settings" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -237,7 +246,7 @@
 
                 <TextView
                     style="@style/MenuTextTop"
-                    android:text="Settings" />
+                    android:text="@string/settings" />
 
 
             </LinearLayout>
@@ -253,7 +262,8 @@
 
             <ImageView
                 style="@style/MenuIconStyle"
-                app:srcCompat="@drawable/ic_help_outline_black_24dp" />
+                app:srcCompat="@drawable/ic_help_outline_black_24dp"
+                android:contentDescription="@string/about" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -263,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 93beb58..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"
-                walt:srcCompat="@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"
-                walt:srcCompat="@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 fae3eee..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"
-                walt:srcCompat="@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"
-                walt:srcCompat="@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 ab2ff51..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"
-                walt:srcCompat="@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"
-                walt:srcCompat="@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 ef6aea8..c932cdb 100644
--- a/android/WALT/app/src/main/res/layout/toolbar.xml
+++ b/android/WALT/app/src/main/res/layout/toolbar.xml
@@ -2,7 +2,6 @@
 <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">
 
 </androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/android/WALT/app/src/main/res/menu/menu_main.xml b/android/WALT/app/src/main/res/menu/menu_main.xml
index 6333e6d..e34957b 100644
--- a/android/WALT/app/src/main/res/menu/menu_main.xml
+++ b/android/WALT/app/src/main/res/menu/menu_main.xml
@@ -7,21 +7,21 @@
     <item
         android:id="@+id/action_upload"
         android:orderInCategory="180"
-        android:title="Upload"
+        android:title="@string/upload"
         android:icon="@drawable/ic_file_upload_black_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_share"
         android:orderInCategory="190"
-        android:title="Share"
+        android:title="@string/share"
         android:icon="@drawable/ic_share_black_24dp"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_help"
         android:orderInCategory="200"
-        android:title="Help"
+        android:title="@string/help"
         android:icon="@drawable/ic_help_outline_black_24dp"
         app:showAsAction="ifRoom" />
 
diff --git a/android/WALT/app/src/main/res/values/dimens.xml b/android/WALT/app/src/main/res/values/dimens.xml
index 47c8224..5ee798a 100644
--- a/android/WALT/app/src/main/res/values/dimens.xml
+++ b/android/WALT/app/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>
diff --git a/android/WALT/app/src/main/res/values/strings.xml b/android/WALT/app/src/main/res/values/strings.xml
index 7204eaa..bc83273 100644
--- a/android/WALT/app/src/main/res/values/strings.xml
+++ b/android/WALT/app/src/main/res/values/strings.xml
@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">WALT</string>
 
-    <string name="action_settings">Settings</string>
     <string name="title_activity_crash_log">Crash Log</string>
     <string name="protocol_version_mismatch">WALT reports protocol version %1$s, which is not
         supported. Please program WALT to a firmware with protocol version %2$s. To do this
@@ -16,6 +15,7 @@
     <string name="disclaimer">DISCLAIMER: This is not an official Google product.</string>
     <string name="more_info">A WALT device is required to run the latency tests. For more information, visit github.com/google/walt</string>
     <string name="privacy_policy">Privacy policy:\ngithub.com/google/walt/blob/master/docs/PrivacyPolicy.md</string>
+    <string name="hint_url">Enter URL</string>
     <string name="preference_screen_blinks" translatable="false">pref_screen_blinks</string>
     <string name="preference_audio_in_reps" translatable="false">pref_audio_in_reps</string>
     <string name="preference_audio_in_threshold" translatable="false">pref_audio_in_threshold</string>
@@ -29,6 +29,36 @@
     <string name="preference_screen_fullscreen">pref_screen_fullscreen</string>
     <string name="preference_log_url">pref_log_url</string>
     <string name="preference_auto_upload_log">pref_auto_upload_log</string>
+    <string name="start">Start</string>
+    <string name="close">Close</string>
+    <string name="reconnect">Reconnect</string>
+    <string name="tbd_conn_status">TBD: Conn status</string>
+    <string name="tap_latency">Tap latency</string>
+    <string name="drag_latency">Drag latency</string>
+    <string name="screen_response">Screen response</string>
+    <string name="audio_latency">Audio latency</string>
+    <string name="midi_latency">MIDI latency</string>
+    <string name="view_log">View log</string>
+    <string name="accelerometer_latency">Accelerometer latency</string>
+    <string name="settings">Settings</string>
+    <string name="about">About</string>
+    <string name="diagnostics">Diagnostics</string>
+    <string name="tbd_connection_sync_status">TBD: Connection/sync status</string>
+    <string name="ping">Ping</string>
+    <string name="ping_over_usb_with_1_byte">Ping over USB with 1 byte</string>
+    <string name="re_sync_clocks">Re-sync clocks</string>
+    <string name="check_clock_drift">Check clock drift</string>
+    <string name="check_how_much_clocks_diverged">Check how much clocks diverged</string>
+    <string name="update_walt_firmware">Update WALT Firmware</string>
+    <string name="please_press_the_button_on_the_teensy_first">Please press the button on the Teensy first</string>
+    <string name="finish">Finish</string>
+    <string name="restart">Restart</string>
+    <string name="stop">Stop</string>
+    <string name="start_midi_in">Start MIDI in</string>
+    <string name="start_midi_out">Start MIDI out</string>
+    <string name="upload">Upload</string>
+    <string name="share">Share</string>
+    <string name="help">Help</string>
     <string-array name="audio_mode_array">
         <item>Continuous Playback Latency</item>
         <item>Continuous Recording Latency</item>
diff --git a/android/WALT/app/src/main/res/values/styles.xml b/android/WALT/app/src/main/res/values/styles.xml
index ac4619e..05e7a67 100644
--- a/android/WALT/app/src/main/res/values/styles.xml
+++ b/android/WALT/app/src/main/res/values/styles.xml
@@ -7,7 +7,6 @@
         <item name="colorAccent">@color/ColorAccent</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="imageButtonStyle">@style/ImageButtonStyle</item>
-        <item name="imageButtonStyle">@style/ImageButtonStyle</item>
         <!-- the homeAsUpIndicator doesn't work with either png or xml icons -->
         <!--<item name="android:homeAsUpIndicator">@drawable/ic_chevron_left_black_24dp</item> -->
 
diff --git a/android/WALT/app/src/main/res/xml/backup_rules.xml b/android/WALT/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000..0e782d2
--- /dev/null
+++ b/android/WALT/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+  <include domain="root" />
+</full-backup-content>
\ No newline at end of file
-- 
cgit v1.2.3