Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Strings for no randomized MAC support notification" into qt-qpr1-dev

Browse Source
This commit is contained in:
Oscar Shu
2019-12-10 22:28:29 +00:00
committed by Android (Google) Code Review
parent f345ab53bc 945035cac7
commit aabbd3c873
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/res/res/values/strings.xml
View File

@@ -3361,6 +3361,26 @@
<!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead. For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
<string name="ringtone_unknown">Unknown</string>
<!-- Start of string constants used to inform the user that the current network may be failing to connect due to not supporting randomized MAC-->
<!-- Notification title [CHAR_LIMIT=NONE]-->
<string name="wifi_cannot_connect_with_randomized_mac_title">Can\u2019t connect to <xliff:g id="ssid" example="SSID_1">%1$s</xliff:g></string>
<!-- Notification text [CHAR_LIMIT=NONE]-->
<string name="wifi_cannot_connect_with_randomized_mac_message">Tap to change privacy settings and retry</string>
<!-- Title of the dialog which pops up when the notification is tapped. [CHAR_LIMIT=NONE]-->
<string name="wifi_disable_mac_randomization_dialog_title">Change privacy setting?</string>
<!-- Dialog text [CHAR_LIMIT=NONE]-->
<string name="wifi_disable_mac_randomization_dialog_message"><xliff:g id="ssid" example="SSID_1">%1$s</xliff:g> may want to connect using your device MAC address, a unique identifier. This may allow your device\u2019s location to be tracked by nearby devices.
\n\nIf you continue, <xliff:g id="ssid" example="SSID_1">%1$s</xliff:g> will change your privacy setting and try to connect again.</string>
<!-- Text of the button that will disable MAC randomization for the network when tapped. [CHAR_LIMIT=NONE]-->
<string name="wifi_disable_mac_randomization_dialog_confirm_text">Change setting</string>
<!-- Toast message which shows up after MAC randomization for the network is disabled. [CHAR_LIMIT=NONE]-->
<string name="wifi_disable_mac_randomization_dialog_success">Setting updated. Try Connecting again.</string>
<!-- Toast message which shows up if the operation failed. [CHAR_LIMIT=NONE]-->
<string name="wifi_disable_mac_randomization_dialog_failure">Can\u2019t change privacy setting</string>
<!-- Toast message which shows up if the network no longer exists on the device. [CHAR_LIMIT=NONE]-->
<string name="wifi_disable_mac_randomization_dialog_network_not_found">Network not found</string>
<!-- End of string constants used to inform the user that the current network may be failing to connect due to not supporting randomized MAC-->
<!-- A notification is shown when there are open wireless networks nearby. This is the notification's title. -->
<plurals name="wifi_available">
<item quantity="one">Wi-Fi network available</item>

8
core/res/res/values/symbols.xml
View File

@@ -2059,6 +2059,14 @@
<java-symbol type="layout" name="safe_mode" />
<java-symbol type="layout" name="simple_list_item_2_single_choice" />
<java-symbol type="layout" name="app_error_dialog" />
<java-symbol type="string" name="wifi_cannot_connect_with_randomized_mac_title" />
<java-symbol type="string" name="wifi_cannot_connect_with_randomized_mac_message" />
<java-symbol type="string" name="wifi_disable_mac_randomization_dialog_title" />
<java-symbol type="string" name="wifi_disable_mac_randomization_dialog_message" />
<java-symbol type="string" name="wifi_disable_mac_randomization_dialog_confirm_text" />
<java-symbol type="string" name="wifi_disable_mac_randomization_dialog_success" />
<java-symbol type="string" name="wifi_disable_mac_randomization_dialog_failure" />
<java-symbol type="string" name="wifi_disable_mac_randomization_dialog_network_not_found" />
<java-symbol type="plurals" name="wifi_available" />
<java-symbol type="plurals" name="wifi_available_detailed" />
<java-symbol type="string" name="wifi_available_title" />