[Instant Hotspot] Add tether error message strings
Adds strings for QS tether host error messages.
A follow-up CL will wrap the error messages.
Screenshot (before text wrapping): https://screenshot.googleplex.com/AhsnN2Hanut8VAW.jpg
Screenshot (bluetooth turned off, text wrapped): https://screenshot.googleplex.com/AwSvJGAwnngtzGP.jpg
Screenshot (no hotspot found, text wrapped):
https://screenshot.googleplex.com/3W9uKdiYwUizmaL.jpg
Bug: b/305792226, b/305993123
Change-Id: I61f422626d83bcb9a523611114894b37c5ab66e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5033123
Reviewed-by: Chad Duffin <chadduffin@chromium.org>
Commit-Queue: Rudransh Dikshit <rudranshd@google.com>
Reviewed-by: Joe Antonetti <joeantonetti@google.com>
Auto-Submit: Rudransh Dikshit <rudranshd@google.com>
Cr-Commit-Position: refs/heads/main@{#1258636}
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index 3984d19..2066e61 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -3694,6 +3694,12 @@
<message name="IDS_ASH_STATUS_TRAY_NETWORK_MOBILE_DISABLING" desc="The message to display in the network list when mobile data is turning off (disabling).">
Mobile data is turning off...
</message>
+ <message name="IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND" desc="The message to display in the tether hosts network list when no tether devices are found.">
+ No available hotspot. Make sure your device is nearby and Bluetooth is turned on.
+ </message>
+ <message name="IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH" desc="The message to display in the tether hosts network list when Bluetooth is disabled.">
+ Turn on Bluetooth to discover available hotspots nearby
+ </message>
<message name="IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED" desc="The label used in system tray bubble to display vpn is disconnected.">
VPN disconnected
</message>
diff --git a/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND.png.sha1 b/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND.png.sha1
new file mode 100644
index 0000000..5fd93d6
--- /dev/null
+++ b/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND.png.sha1
@@ -0,0 +1 @@
+e49b59deb38f7b30e18f2f2dba24f9183a387ae7
\ No newline at end of file
diff --git a/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH.png.sha1 b/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH.png.sha1
new file mode 100644
index 0000000..c50edec
--- /dev/null
+++ b/ash/ash_strings_grd/IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH.png.sha1
@@ -0,0 +1 @@
+494f49716613706338ff40c0095b532e8697e677
\ No newline at end of file
diff --git a/ash/system/network/network_list_view_controller_impl.cc b/ash/system/network/network_list_view_controller_impl.cc
index 406f297..cc07f90 100644
--- a/ash/system/network/network_list_view_controller_impl.cc
+++ b/ash/system/network/network_list_view_controller_impl.cc
@@ -701,14 +701,14 @@
if (!IsBluetoothEnabledOrEnabling(bluetooth_system_state_)) {
CreateInfoLabelIfMissingAndUpdate(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED_TOOLTIP,
+ IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH,
&tether_hosts_status_message_);
return;
}
if (!has_tether_networks_) {
CreateInfoLabelIfMissingAndUpdate(
- IDS_ASH_STATUS_TRAY_NO_MOBILE_DEVICES_FOUND,
+ IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND,
&tether_hosts_status_message_);
return;
}
diff --git a/ash/system/network/network_list_view_controller_unittest.cc b/ash/system/network/network_list_view_controller_unittest.cc
index 769a42a..60edba8 100644
--- a/ash/system/network/network_list_view_controller_unittest.cc
+++ b/ash/system/network/network_list_view_controller_unittest.cc
@@ -1221,9 +1221,9 @@
} else {
ASSERT_THAT(GetTetherHostsStatusMessage(), NotNull());
ASSERT_THAT(GetTetherHostsSubHeader(), NotNull());
- EXPECT_EQ(
- l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NO_MOBILE_DEVICES_FOUND),
- GetTetherHostsStatusMessage()->label()->GetText());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND),
+ GetTetherHostsStatusMessage()->label()->GetText());
EXPECT_TRUE(network_list(NetworkType::kTether)->GetVisible());
}
@@ -1241,9 +1241,9 @@
} else {
EXPECT_TRUE(network_list(NetworkType::kTether)->GetVisible());
ASSERT_THAT(GetTetherHostsStatusMessage(), NotNull());
- EXPECT_EQ(
- l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NO_MOBILE_DEVICES_FOUND),
- GetTetherHostsStatusMessage()->label()->GetText());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_ASH_STATUS_TRAY_NETWORK_NO_TETHER_DEVICES_FOUND),
+ GetTetherHostsStatusMessage()->label()->GetText());
}
// Set Bluetooth device to disabling.
@@ -1259,7 +1259,7 @@
ASSERT_THAT(GetTetherHostsStatusMessage(), NotNull());
EXPECT_TRUE(network_list(NetworkType::kTether)->GetVisible());
EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED_TOOLTIP),
+ IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH),
GetTetherHostsStatusMessage()->label()->GetText());
}
@@ -1277,7 +1277,7 @@
ASSERT_THAT(GetTetherHostsStatusMessage(), NotNull());
EXPECT_TRUE(network_list(NetworkType::kTether)->GetVisible());
EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED_TOOLTIP),
+ IDS_ASH_STATUS_TRAY_NETWORK_TETHER_NO_BLUETOOTH),
GetTetherHostsStatusMessage()->label()->GetText());
}