Merge "Add preference for WiFi MAC randomization."

res/values/arrays.xml

@@ -1081,6 +1081,11 @@
         <item>Treat as unmetered</item>
     </string-array>
 
+    <string-array name="wifi_privacy_entries">
+        <item>Default (use randomized MAC)</item>
+        <item>Trusted</item>
+    </string-array>
+
     <string-array name="wifi_hidden_entries">
         <item>No</item>
         <item>Yes</item>
@@ -1092,6 +1097,11 @@
         <item>2</item>
     </string-array>
 
+    <string-array name="wifi_privacy_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
     <!-- Titles for ui dark mode preference. -->
     <string-array name="dark_ui_mode_entries" >
         <item>Automatic (based on time of day)</item>

res/values/strings.xml

@@ -2052,6 +2052,8 @@
     <string name="wifi_ap_band_select_one">Choose at least one band for Wi\u2011Fi hotspot:</string>
     <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
     <string name="wifi_ip_settings">IP settings</string>
+    <!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->
+    <string name="wifi_privacy_settings">Privacy</string>
     <!-- Label for the check box to share a network with other users on the same device -->
     <string name="wifi_shared">Share with other device users</string>
     <!-- Hint for unchanged fields -->