Merge "[BiometricsV2] Fix intro overlap enrolling page"
diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml
index 3ce29d6..4736d22 100644
--- a/res-product/values/strings.xml
+++ b/res-product/values/strings.xml
@@ -738,4 +738,9 @@
<string name="daltonizer_feature_summary" product="default">Adjust how colors display on your phone</string>
<!-- The daltonizer feature summary display as a subtext as an item in a list. -->
<string name="daltonizer_feature_summary" product="tablet">Adjust how colors display on your tablet</string>
+
+ <!-- Warning text about the visibility of device name on phone. [CHAR LIMIT=NONE] -->
+ <string name="about_phone_device_name_warning" product="default">Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
+ <!-- Warning text about the visibility of device name on tablet. [CHAR LIMIT=NONE] -->
+ <string name="about_phone_device_name_warning" product="tablet">Your device name is visible to apps on your tablet. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 381a3ca..3ba3fb9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10627,9 +10627,6 @@
<!-- Title for detail page of wifi network [CHAR LIMIT=30] -->
<string name="pref_title_network_details">Network details</string>
- <!-- Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->
- <string name="about_phone_device_name_warning">Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
-
<!-- Title for Connected device shortcut [CHAR LIMIT=30] -->
<string name="devices_title">Devices</string>