Merge commit 'dec0d4ec4153bf9fc2b78ae6c2df45b6ea8dde7a' as 'external/sdl/SDL'

external/sdl/SDL/test/android/res/layout/arguments_layout.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:orientation="vertical" >
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:inputType="textImeMultiLine|textNoSuggestions"
+        android:text="@string/label_enter_arguments" />
+    <EditText
+        android:id="@+id/arguments_edit"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="top"
+        android:hint="@string/hint_enter_arguments_here" />
+    <Button
+        android:id="@+id/arguments_start_button"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:text="@string/button_start_app" />
+</LinearLayout>

external/sdl/SDL/test/android/res/mipmap-anydpi-v26/sdl-test.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/sdl-test_background"/>
+    <foreground android:drawable="@drawable/sdl-test_foreground"/>
+</adaptive-icon>

external/sdl/SDL/test/android/res/mipmap-anydpi-v26/sdl-test_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/sdl-test_background"/>
+    <foreground android:drawable="@drawable/sdl-test_foreground"/>
+</adaptive-icon>

external/sdl/SDL/test/android/res/values/arg_strings.xml

@@ -0,0 +1,7 @@
+<resources>
+    <string name="label_enter_arguments">Arguments</string>
+    <string name="hint_enter_arguments_here">One argument per line.\ne.g.\n--track-mem\n--windows\n3</string>
+    <string name="button_start_app">Start</string>
+    <string name="shortcutModifyArgumentsShortLabel">Modify arguments</string>
+    <string name="shortcutIntermediateActivityShortLabel">Pass through activity</string>
+</resources>

external/sdl/SDL/test/android/res/values/sdl-test_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="sdl-test_background">#FFFFFF</color>
+</resources>