Merge changes from topic "revert-3323102-ZENOTQPEYR" into main
* changes:
Revert "Generalize our parameterized tests"
Revert "vm tool: rename --gki arg to more generic --os one"
Revert "Update kernel to builds 12570979"
Revert "Add microdroid_16k kernel"
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 245d2b9..af41c85 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -128,7 +128,9 @@
+ "&fontWeightBold="
+ (FontStyle.FONT_WEIGHT_BOLD + config.fontWeightAdjustment)
+ "&screenReaderMode="
- + mAccessibilityManager.isTouchExplorationEnabled();
+ + mAccessibilityManager.isTouchExplorationEnabled()
+ + "&titleFixed="
+ + getString(R.string.app_name);
try {
return new URL("https", VM_ADDR, TTYD_PORT, "/" + query);
diff --git a/android/TerminalApp/res/values/strings.xml b/android/TerminalApp/res/values/strings.xml
index f8350a0..070807c 100644
--- a/android/TerminalApp/res/values/strings.xml
+++ b/android/TerminalApp/res/values/strings.xml
@@ -24,8 +24,8 @@
<string name="installer_title_text">Install Linux terminal</string>
<!-- Installer activity description format [CHAR LIMIT=none] -->
<string name="installer_desc_text_format">To launch Linux terminal, you need to download roughly <xliff:g id="expected_size" example="350GB">%1$s</xliff:g> of data over network.\nWould you proceed?</string>
- <!-- Checkbox at the installer activity to wait for Wi-Fi on metered network to prevent from paying network traffic [CHAR LIMIT=none] -->
- <string name="installer_wait_for_wifi_checkbox_text">Wait for Wi-Fi on metered network</string>
+ <!-- Checkbox at the installer activity to download when Wi-Fi is available to prevent from paying network traffic [CHAR LIMIT=none] -->
+ <string name="installer_wait_for_wifi_checkbox_text">Download when Wi-Fi is available</string>
<!-- Button at the installer activity to confirm installation [CHAR LIMIT=16] -->
<string name="installer_install_button_enabled_text">Install</string>
<!-- Button at the installer activity to when installation is already in progress [CHAR LIMIT=16] -->