Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 754fbf92 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "strings.xml: Resources to post notification for network suggestions"

parents cc50ce30 6eb1b3a9

core/res/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -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.-->

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -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" />

proto/src/system_messages.proto

+4 −0
Original line number Diff line number Diff line
@@ -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