diff options
| author | 2018-12-12 10:38:56 +0000 | |
|---|---|---|
| committer | 2018-12-12 10:38:56 +0000 | |
| commit | 754fbf92a11e54e3ee437469801265ed7beaa5db (patch) | |
| tree | 1d5d43af8e7de06a927c8a34691e7fdd1671473d | |
| parent | cc50ce302f4254d6a0f8bb27e88fb719cb5ac8e3 (diff) | |
| parent | 6eb1b3a9821471630bcdd1da0c46af22e4e2c862 (diff) | |
Merge "strings.xml: Resources to post notification for network suggestions"
| -rw-r--r-- | core/res/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 4 | ||||
| -rw-r--r-- | proto/src/system_messages.proto | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index a33f6b2fbf9c..165b06f159bc 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3323,6 +3323,15 @@ <!-- Notification action name for opening the wifi picker, showing the user all the nearby networks. --> <string name="wifi_available_action_all_networks">All networks</string> + <!-- Notification title for a connection to a app suggested wireless network.--> + <string name="wifi_suggestion_title">Connected to Wi\u2011Fi network proposed by <xliff:g id="name" example="App123">%s</xliff:g></string> + <!-- Notification content for a connection to a app suggested wireless network.--> + <string name="wifi_suggestion_content">Do you want to let <xliff:g id="name" example="App123">%s</xliff:g> propose networks for you?</string> + <!-- Notification action for allowing app specified in the notification body.--> + <string name="wifi_suggestion_action_allow_app">Yes</string> + <!-- Notification action for disallowing app specified in the notification body.--> + <string name="wifi_suggestion_action_disallow_app">No</string> + <!--Notification title for Wi-Fi Wake onboarding. This is displayed the first time a user disables Wi-Fi with the feature enabled. --> <string name="wifi_wakeup_onboarding_title">Wi\u2011Fi will turn on automatically</string> <!--Notification subtext for Wi-Fi Wake onboarding.--> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b24cdba5ec47..d573c09a6538 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1988,6 +1988,10 @@ <java-symbol type="string" name="wifi_available_content_failed_to_connect" /> <java-symbol type="string" name="wifi_available_action_connect" /> <java-symbol type="string" name="wifi_available_action_all_networks" /> + <java-symbol type="string" name="wifi_suggestion_title" /> + <java-symbol type="string" name="wifi_suggestion_content" /> + <java-symbol type="string" name="wifi_suggestion_action_allow_app" /> + <java-symbol type="string" name="wifi_suggestion_action_disallow_app" /> <java-symbol type="string" name="wifi_wakeup_onboarding_title" /> <java-symbol type="string" name="wifi_wakeup_onboarding_subtext" /> <java-symbol type="string" name="wifi_wakeup_onboarding_action_disable" /> diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index fba639c3fc4a..121267675329 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -216,6 +216,10 @@ message SystemMessage { // Package: android NOTE_SOFTAP_CONFIG_CHANGED = 50; + // Notify the user that connected to app suggested network. + // Package: android + NOTE_CONNECTED_TO_NETWORK_SUGGESTION = 51; + // ADD_NEW_IDS_ABOVE_THIS_LINE // Legacy IDs with arbitrary values appear below // Legacy IDs existed as stable non-conflicting constants prior to the O release |